diff --git a/EnvelopeGenerator.Form/frmMain.Designer.vb b/EnvelopeGenerator.Form/frmMain.Designer.vb index 4c318059..069fe655 100644 --- a/EnvelopeGenerator.Form/frmMain.Designer.vb +++ b/EnvelopeGenerator.Form/frmMain.Designer.vb @@ -54,6 +54,7 @@ Partial Class frmMain Me.txtRefreshLabel = New DevExpress.XtraBars.BarStaticItem() Me.btnShowDocument = New DevExpress.XtraBars.BarButtonItem() Me.btnContactReceiver = New DevExpress.XtraBars.BarButtonItem() + Me.txtEnvelopeIdLabel = New DevExpress.XtraBars.BarStaticItem() Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageEnvelopeActions = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() @@ -265,9 +266,9 @@ Partial Class frmMain 'RibbonControl ' Me.RibbonControl.ExpandCollapseItem.Id = 0 - Me.RibbonControl.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl.ExpandCollapseItem, Me.RibbonControl.SearchEditItem, Me.btnCreateEnvelope, Me.btnEditEnvelope, Me.btnDeleteEnvelope, Me.BarButtonItem1, Me.txtRefreshLabel, Me.btnShowDocument, Me.btnContactReceiver}) + Me.RibbonControl.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl.ExpandCollapseItem, Me.RibbonControl.SearchEditItem, Me.btnCreateEnvelope, Me.btnEditEnvelope, Me.btnDeleteEnvelope, Me.BarButtonItem1, Me.txtRefreshLabel, Me.btnShowDocument, Me.btnContactReceiver, Me.txtEnvelopeIdLabel}) resources.ApplyResources(Me.RibbonControl, "RibbonControl") - Me.RibbonControl.MaxItemId = 9 + Me.RibbonControl.MaxItemId = 10 Me.RibbonControl.Name = "RibbonControl" Me.RibbonControl.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) Me.RibbonControl.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] @@ -327,6 +328,15 @@ Partial Class frmMain Me.btnContactReceiver.ImageOptions.SvgImage = CType(resources.GetObject("btnContactReceiver.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.btnContactReceiver.Name = "btnContactReceiver" ' + 'txtEnvelopeIdLabel + ' + resources.ApplyResources(Me.txtEnvelopeIdLabel, "txtEnvelopeIdLabel") + Me.txtEnvelopeIdLabel.Id = 9 + Me.txtEnvelopeIdLabel.ImageOptions.SvgImage = CType(resources.GetObject("txtEnvelopeIdLabel.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.txtEnvelopeIdLabel.Name = "txtEnvelopeIdLabel" + Me.txtEnvelopeIdLabel.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph + Me.txtEnvelopeIdLabel.Tag = "Umschlag-ID: {0}" + ' 'RibbonPage1 ' Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageEnvelopeActions, Me.RibbonPageGroup1, Me.RibbonPageGroup2}) @@ -358,6 +368,7 @@ Partial Class frmMain 'RibbonStatusBar ' Me.RibbonStatusBar.ItemLinks.Add(Me.txtRefreshLabel) + Me.RibbonStatusBar.ItemLinks.Add(Me.txtEnvelopeIdLabel) resources.ApplyResources(Me.RibbonStatusBar, "RibbonStatusBar") Me.RibbonStatusBar.Name = "RibbonStatusBar" Me.RibbonStatusBar.Ribbon = Me.RibbonControl @@ -579,4 +590,5 @@ Partial Class frmMain Friend WithEvents ColHistoryStatusCompleted As DevExpress.XtraGrid.Columns.GridColumn Friend WithEvents ColHistoryUserReferenceCompleted As DevExpress.XtraGrid.Columns.GridColumn Friend WithEvents ColHistoryDateCompleted As DevExpress.XtraGrid.Columns.GridColumn + Friend WithEvents txtEnvelopeIdLabel As DevExpress.XtraBars.BarStaticItem End Class diff --git a/EnvelopeGenerator.Form/frmMain.resx b/EnvelopeGenerator.Form/frmMain.resx index e343d9b0..7695e14b 100644 --- a/EnvelopeGenerator.Form/frmMain.resx +++ b/EnvelopeGenerator.Form/frmMain.resx @@ -436,6 +436,28 @@ c3M9IlllbGxvdyIgLz4NCiAgICA8cG9seWdvbiBwb2ludHM9IjI4LDEwIDI0LDEwIDI0LDYgMjIsNiAy MiwxMCAxOCwxMCAxOCwxMiAyMiwxMiAyMiwxNiAyNCwxNiAyNCwxMiAyOCwxMiAgIiBjbGFzcz0iR3Jl ZW4iIC8+DQogIDwvZz4NCjwvc3ZnPgs= + + + + Umschlag-ID: {0} + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAKUCAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z + ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5CbGFja3tmaWxsOiM3MjcyNzI7fQoJLkdyZWVue2ZpbGw6IzAz + OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9Cgkuc3Qwe29wYWNpdHk6MC43NTt9Cgkuc3Qxe29wYWNp + dHk6MC41O30KPC9zdHlsZT4NCiAgPGcgaWQ9IkVudmVsb3BlQ2xvc2UiPg0KICAgIDxwYXRoIGQ9Ik0x + NiwxNmwxMi02LjlWOWMwLTAuNS0wLjUtMS0xLTFINUM0LjUsOCw0LDguNSw0LDl2MC4xTDE2LDE2eiIg + Y2xhc3M9IlllbGxvdyIgLz4NCiAgICA8cGF0aCBkPSJNMTYsMTguM0w0LDExLjRWMjNjMCwwLjUsMC41 + LDEsMSwxaDIyYzAuNSwwLDEtMC41LDEtMVYxMS40TDE2LDE4LjN6IiBjbGFzcz0iWWVsbG93IiAvPg0K + ICA8L2c+DQo8L3N2Zz4L @@ -771,7 +793,7 @@ iVBORw0KGgoAAAANSUhEUgAAAgAAAAIACAYAAAD0eNT6AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL - EQAACxEBf2RfkQAAOB1JREFUeF7t3Qe0ZFWZ9vEmJxEkKQiIoowBTKCCiIgiIqAgCOMYRxHU0RkZM0ZQ + DwAACw8BkvkDpQAAOB1JREFUeF7t3Qe0ZFWZ9vEmJxEkKQiIoowBTKCCiIgiIqAgCOMYRxHU0RkZM0ZQ RxlHRxBFHQxEExj5UAwkUTHMpyISDARJkgRFAYnf97wN3dD007fr3lvhfff+/9f6rTXjbW7XqT5Ve9ep c/aZQ2NvRXmE7CivlnfLx+QLcqKcIefJpXLNnW6W/4fuzPv3v0p+Iz+S4+Rweb+8Up4pD5flhIiIErSa bCP/JofKj+UKcW/0wGzdKjFJOEbeJbvI/YSIiEbYsrKFvE6+IpeIe5MGxu18OUpeJRsKERHNoqVkc9lf @@ -1163,6 +1185,12 @@ DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + txtEnvelopeIdLabel + + + DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + RibbonPage1 diff --git a/EnvelopeGenerator.Form/frmMain.vb b/EnvelopeGenerator.Form/frmMain.vb index d01daaed..c70e17bc 100644 --- a/EnvelopeGenerator.Form/frmMain.vb +++ b/EnvelopeGenerator.Form/frmMain.vb @@ -98,13 +98,17 @@ Public Class frmMain End Sub Private Sub LoadEnvelopeData() - RefreshHelper.SaveViewInfo() - LoadEnvelopes() - LoadCompletedEnvelopes() - RefreshHelper.LoadViewInfo() + Try + RefreshHelper.SaveViewInfo() + LoadEnvelopes() + LoadCompletedEnvelopes() + RefreshHelper.LoadViewInfo() - 'LoadCharts() - txtRefreshLabel.Caption = String.Format(txtRefreshLabel.Tag, Now) + 'LoadCharts() + txtRefreshLabel.Caption = String.Format(txtRefreshLabel.Tag, Now) + Catch ex As Exception + Logger.Error(ex) + End Try End Sub Private Sub LoadEnvelopes() @@ -232,6 +236,8 @@ Public Class frmMain Dim oEnvelope As Envelope = ViewEnvelopes.GetRow(ViewEnvelopes.FocusedRowHandle) + txtEnvelopeIdLabel.Caption = String.Format(txtEnvelopeIdLabel.Tag, oEnvelope.Id) + If oEnvelope.IsAlreadySent Then btnEditEnvelope.Enabled = False Else @@ -308,9 +314,14 @@ Public Class frmMain End Sub Private Sub RefreshTimer_Tick(sender As Object, e As EventArgs) Handles RefreshTimer.Tick - If Application.OpenForms.OfType(Of frmEnvelopeEditor).Any = False Then - LoadEnvelopeData() - End If + Try + + If Application.OpenForms.OfType(Of frmEnvelopeEditor).Any = False Then + LoadEnvelopeData() + End If + Catch ex As Exception + Logger.Error(ex) + End Try End Sub Private Sub btnContactReceiver_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnContactReceiver.ItemClick @@ -344,4 +355,13 @@ Public Class frmMain End Try End Sub + Private Sub ViewCompleted_FocusedRowChanged(sender As Object, e As Views.Base.FocusedRowChangedEventArgs) Handles ViewCompleted.FocusedRowChanged + If ViewCompleted.FocusedRowHandle < 0 Then + Exit Sub + End If + + Dim oEnvelope As Envelope = ViewCompleted.GetRow(ViewCompleted.FocusedRowHandle) + + txtEnvelopeIdLabel.Caption = String.Format(txtEnvelopeIdLabel.Tag, oEnvelope.Id) + End Sub End Class \ No newline at end of file