Ms Optimierung

This commit is contained in:
Developer01 2024-07-18 14:49:28 +02:00
parent eaf4cd773d
commit ce55066208
10 changed files with 103 additions and 85 deletions

View File

@ -243,11 +243,13 @@
<Generator>PublicResXFileCodeGenerator</Generator> <Generator>PublicResXFileCodeGenerator</Generator>
<LastGenOutput>Envelope.en.Designer.vb</LastGenOutput> <LastGenOutput>Envelope.en.Designer.vb</LastGenOutput>
<CustomToolNamespace>My.Resources</CustomToolNamespace> <CustomToolNamespace>My.Resources</CustomToolNamespace>
<SubType>Designer</SubType>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="Strings\Envelope.resx"> <EmbeddedResource Include="Strings\Envelope.resx">
<Generator>PublicResXFileCodeGenerator</Generator> <Generator>PublicResXFileCodeGenerator</Generator>
<LastGenOutput>Envelope1.Designer.vb</LastGenOutput> <LastGenOutput>Envelope1.Designer.vb</LastGenOutput>
<CustomToolNamespace>My.Resources</CustomToolNamespace> <CustomToolNamespace>My.Resources</CustomToolNamespace>
<SubType>Designer</SubType>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="Strings\Email.resx"> <EmbeddedResource Include="Strings\Email.resx">
<Generator>PublicResXFileCodeGenerator</Generator> <Generator>PublicResXFileCodeGenerator</Generator>

View File

@ -10,7 +10,7 @@ Public Class HistoryModel
Private Function ToEnvelopeHistoryEntry(pRow As DataRow) As EnvelopeHistoryEntry Private Function ToEnvelopeHistoryEntry(pRow As DataRow) As EnvelopeHistoryEntry
Return New EnvelopeHistoryEntry() With { Return New EnvelopeHistoryEntry() With {
.ActionDate = pRow.Item("ACTION_DATE"), .ActionDate = pRow.ItemEx(Of Date)("ACTION_DATE", Nothing),
.EnvelopeId = pRow.Item("ENVELOPE_ID"), .EnvelopeId = pRow.Item("ENVELOPE_ID"),
.Status = pRow.Item("STATUS"), .Status = pRow.Item("STATUS"),
.UserReference = pRow.ItemEx("USER_REFERENCE", "") .UserReference = pRow.ItemEx("USER_REFERENCE", "")
@ -18,7 +18,7 @@ Public Class HistoryModel
End Function End Function
Public Function List(pEnvelopeId As Integer) As List(Of EnvelopeHistoryEntry) Public Function List(pEnvelopeId As Integer) As List(Of EnvelopeHistoryEntry)
Dim oSql = $"SELECT * FROM TBSIG_ENVELOPE_HISTORY WHERE ENVELOPE_ID = {pEnvelopeId} ORDER BY GUID DESC" Dim oSql = $"SELECT * FROM TBSIG_ENVELOPE_HISTORY WHERE ENVELOPE_ID = {pEnvelopeId} AND ACTION_DATE IS NOT NULL ORDER BY GUID DESC"
Dim oTable = Database.GetDatatable(oSql) Dim oTable = Database.GetDatatable(oSql)
Return oTable?.Rows. Return oTable?.Rows.
Cast(Of DataRow). Cast(Of DataRow).

View File

@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
' indem Sie "*" wie unten gezeigt eingeben: ' indem Sie "*" wie unten gezeigt eingeben:
' <Assembly: AssemblyVersion("1.0.*")> ' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("1.8.0.0")> <Assembly: AssemblyVersion("1.9.0.0")>
<Assembly: AssemblyFileVersion("1.8.0.0")> <Assembly: AssemblyFileVersion("1.9.0.0")>

View File

@ -154,7 +154,7 @@
<value>Envelope could not be sent!</value> <value>Envelope could not be sent!</value>
</data> </data>
<data name="Envelope Invitations Sent" xml:space="preserve"> <data name="Envelope Invitations Sent" xml:space="preserve">
<value>Envelope Invitations Sent</value> <value>The invitations have been scheduled for dispatch.s</value>
</data> </data>
<data name="Envelope Overview" xml:space="preserve"> <data name="Envelope Overview" xml:space="preserve">
<value>Overview</value> <value>Overview</value>

View File

@ -154,7 +154,7 @@
<value>Umschlag konnte nicht gesendet werden!</value> <value>Umschlag konnte nicht gesendet werden!</value>
</data> </data>
<data name="Envelope Invitations Sent" xml:space="preserve"> <data name="Envelope Invitations Sent" xml:space="preserve">
<value>Die Einladungen wurden versendet</value> <value>Die Einladungen zum Signieren wurden zum Versand eingereiht.</value>
</data> </data>
<data name="Envelope Overview" xml:space="preserve"> <data name="Envelope Overview" xml:space="preserve">
<value>Übersicht</value> <value>Übersicht</value>

View File

@ -182,7 +182,7 @@ Namespace My.Resources
End Property End Property
'''<summary> '''<summary>
''' Sucht eine lokalisierte Zeichenfolge, die Die Einladungen wurden versendet ähnelt. ''' Sucht eine lokalisierte Zeichenfolge, die Die Einladungen zum Signieren wurden zum Versand eingereiht. ähnelt.
'''</summary> '''</summary>
Public Shared ReadOnly Property Envelope_Invitations_Sent() As String Public Shared ReadOnly Property Envelope_Invitations_Sent() As String
Get Get

View File

@ -27,7 +27,7 @@ Partial Class frmMain
Dim GridLevelNode3 As DevExpress.XtraGrid.GridLevelNode = New DevExpress.XtraGrid.GridLevelNode() Dim GridLevelNode3 As DevExpress.XtraGrid.GridLevelNode = New DevExpress.XtraGrid.GridLevelNode()
Dim GridLevelNode4 As DevExpress.XtraGrid.GridLevelNode = New DevExpress.XtraGrid.GridLevelNode() Dim GridLevelNode4 As DevExpress.XtraGrid.GridLevelNode = New DevExpress.XtraGrid.GridLevelNode()
Me.SplitContainerControl1 = New DevExpress.XtraEditors.SplitContainerControl() Me.SplitContainerControl1 = New DevExpress.XtraEditors.SplitContainerControl()
Me.XtraTabControl1 = New DevExpress.XtraTab.XtraTabControl() Me.XtraTabControlMain = New DevExpress.XtraTab.XtraTabControl()
Me.XtraTabPage1 = New DevExpress.XtraTab.XtraTabPage() Me.XtraTabPage1 = New DevExpress.XtraTab.XtraTabPage()
Me.GridEnvelopes = New DevExpress.XtraGrid.GridControl() Me.GridEnvelopes = New DevExpress.XtraGrid.GridControl()
Me.ViewReceivers = New DevExpress.XtraGrid.Views.Grid.GridView() Me.ViewReceivers = New DevExpress.XtraGrid.Views.Grid.GridView()
@ -59,10 +59,12 @@ Partial Class frmMain
Me.btnOpenLogDirectory = New DevExpress.XtraBars.BarButtonItem() Me.btnOpenLogDirectory = New DevExpress.XtraBars.BarButtonItem()
Me.BarCheckItem1 = New DevExpress.XtraBars.BarCheckItem() Me.BarCheckItem1 = New DevExpress.XtraBars.BarCheckItem()
Me.bsitmInfo = New DevExpress.XtraBars.BarStaticItem() Me.bsitmInfo = New DevExpress.XtraBars.BarStaticItem()
Me.bbtnitmEB = New DevExpress.XtraBars.BarButtonItem()
Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage()
Me.RibbonPageEnvelopeActions = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageEnvelopeActions = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
Me.RibbonPageGroup4 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage()
Me.RibbonPageGroup3 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroup3 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
Me.RibbonStatusBar = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() Me.RibbonStatusBar = New DevExpress.XtraBars.Ribbon.RibbonStatusBar()
@ -84,15 +86,13 @@ Partial Class frmMain
Me.GridColumn7 = New DevExpress.XtraGrid.Columns.GridColumn() Me.GridColumn7 = New DevExpress.XtraGrid.Columns.GridColumn()
Me.RefreshTimer = New System.Windows.Forms.Timer(Me.components) Me.RefreshTimer = New System.Windows.Forms.Timer(Me.components)
Me.SaveFileDialog1 = New System.Windows.Forms.SaveFileDialog() Me.SaveFileDialog1 = New System.Windows.Forms.SaveFileDialog()
Me.RibbonPageGroup4 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
Me.bbtnitmEB = New DevExpress.XtraBars.BarButtonItem()
CType(Me.SplitContainerControl1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.SplitContainerControl1, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.SplitContainerControl1.Panel1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.SplitContainerControl1.Panel1, System.ComponentModel.ISupportInitialize).BeginInit()
Me.SplitContainerControl1.Panel1.SuspendLayout() Me.SplitContainerControl1.Panel1.SuspendLayout()
CType(Me.SplitContainerControl1.Panel2, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.SplitContainerControl1.Panel2, System.ComponentModel.ISupportInitialize).BeginInit()
Me.SplitContainerControl1.SuspendLayout() Me.SplitContainerControl1.SuspendLayout()
CType(Me.XtraTabControl1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.XtraTabControlMain, System.ComponentModel.ISupportInitialize).BeginInit()
Me.XtraTabControl1.SuspendLayout() Me.XtraTabControlMain.SuspendLayout()
Me.XtraTabPage1.SuspendLayout() Me.XtraTabPage1.SuspendLayout()
CType(Me.GridEnvelopes, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.GridEnvelopes, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.ViewReceivers, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.ViewReceivers, System.ComponentModel.ISupportInitialize).BeginInit()
@ -120,7 +120,7 @@ Partial Class frmMain
' '
'SplitContainerControl1.Panel1 'SplitContainerControl1.Panel1
' '
Me.SplitContainerControl1.Panel1.Controls.Add(Me.XtraTabControl1) Me.SplitContainerControl1.Panel1.Controls.Add(Me.XtraTabControlMain)
resources.ApplyResources(Me.SplitContainerControl1.Panel1, "SplitContainerControl1.Panel1") resources.ApplyResources(Me.SplitContainerControl1.Panel1, "SplitContainerControl1.Panel1")
' '
'SplitContainerControl1.Panel2 'SplitContainerControl1.Panel2
@ -128,12 +128,12 @@ Partial Class frmMain
resources.ApplyResources(Me.SplitContainerControl1.Panel2, "SplitContainerControl1.Panel2") resources.ApplyResources(Me.SplitContainerControl1.Panel2, "SplitContainerControl1.Panel2")
Me.SplitContainerControl1.SplitterPosition = 272 Me.SplitContainerControl1.SplitterPosition = 272
' '
'XtraTabControl1 'XtraTabControlMain
' '
resources.ApplyResources(Me.XtraTabControl1, "XtraTabControl1") resources.ApplyResources(Me.XtraTabControlMain, "XtraTabControlMain")
Me.XtraTabControl1.Name = "XtraTabControl1" Me.XtraTabControlMain.Name = "XtraTabControlMain"
Me.XtraTabControl1.SelectedTabPage = Me.XtraTabPage1 Me.XtraTabControlMain.SelectedTabPage = Me.XtraTabPage1
Me.XtraTabControl1.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.XtraTabPage1, Me.XtraTabPage2}) Me.XtraTabControlMain.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.XtraTabPage1, Me.XtraTabPage2})
' '
'XtraTabPage1 'XtraTabPage1
' '
@ -401,6 +401,14 @@ Partial Class frmMain
Me.bsitmInfo.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph Me.bsitmInfo.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph
Me.bsitmInfo.Visibility = DevExpress.XtraBars.BarItemVisibility.Never Me.bsitmInfo.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
' '
'bbtnitmEB
'
resources.ApplyResources(Me.bbtnitmEB, "bbtnitmEB")
Me.bbtnitmEB.Enabled = False
Me.bbtnitmEB.Id = 14
Me.bbtnitmEB.ImageOptions.SvgImage = CType(resources.GetObject("bbtnitmEB.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
Me.bbtnitmEB.Name = "bbtnitmEB"
'
'RibbonPage1 'RibbonPage1
' '
Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageEnvelopeActions, Me.RibbonPageGroup1, Me.RibbonPageGroup2, Me.RibbonPageGroup4}) Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageEnvelopeActions, Me.RibbonPageGroup1, Me.RibbonPageGroup2, Me.RibbonPageGroup4})
@ -430,6 +438,11 @@ Partial Class frmMain
Me.RibbonPageGroup2.Name = "RibbonPageGroup2" Me.RibbonPageGroup2.Name = "RibbonPageGroup2"
resources.ApplyResources(Me.RibbonPageGroup2, "RibbonPageGroup2") resources.ApplyResources(Me.RibbonPageGroup2, "RibbonPageGroup2")
' '
'RibbonPageGroup4
'
Me.RibbonPageGroup4.Name = "RibbonPageGroup4"
resources.ApplyResources(Me.RibbonPageGroup4, "RibbonPageGroup4")
'
'RibbonPage2 'RibbonPage2
' '
Me.RibbonPage2.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup3}) Me.RibbonPage2.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup3})
@ -589,19 +602,6 @@ Partial Class frmMain
' '
resources.ApplyResources(Me.SaveFileDialog1, "SaveFileDialog1") resources.ApplyResources(Me.SaveFileDialog1, "SaveFileDialog1")
' '
'RibbonPageGroup4
'
Me.RibbonPageGroup4.Name = "RibbonPageGroup4"
resources.ApplyResources(Me.RibbonPageGroup4, "RibbonPageGroup4")
'
'bbtnitmEB
'
resources.ApplyResources(Me.bbtnitmEB, "bbtnitmEB")
Me.bbtnitmEB.Enabled = False
Me.bbtnitmEB.Id = 14
Me.bbtnitmEB.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem2.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
Me.bbtnitmEB.Name = "bbtnitmEB"
'
'frmMain 'frmMain
' '
resources.ApplyResources(Me, "$this") resources.ApplyResources(Me, "$this")
@ -618,8 +618,8 @@ Partial Class frmMain
CType(Me.SplitContainerControl1.Panel2, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.SplitContainerControl1.Panel2, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.SplitContainerControl1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.SplitContainerControl1, System.ComponentModel.ISupportInitialize).EndInit()
Me.SplitContainerControl1.ResumeLayout(False) Me.SplitContainerControl1.ResumeLayout(False)
CType(Me.XtraTabControl1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.XtraTabControlMain, System.ComponentModel.ISupportInitialize).EndInit()
Me.XtraTabControl1.ResumeLayout(False) Me.XtraTabControlMain.ResumeLayout(False)
Me.XtraTabPage1.ResumeLayout(False) Me.XtraTabPage1.ResumeLayout(False)
CType(Me.GridEnvelopes, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.GridEnvelopes, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.ViewReceivers, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.ViewReceivers, System.ComponentModel.ISupportInitialize).EndInit()
@ -653,7 +653,7 @@ Partial Class frmMain
Friend WithEvents ColEmail As DevExpress.XtraGrid.Columns.GridColumn Friend WithEvents ColEmail As DevExpress.XtraGrid.Columns.GridColumn
Friend WithEvents ColReceiverStatus As DevExpress.XtraGrid.Columns.GridColumn Friend WithEvents ColReceiverStatus As DevExpress.XtraGrid.Columns.GridColumn
Friend WithEvents SplitContainerControl1 As DevExpress.XtraEditors.SplitContainerControl Friend WithEvents SplitContainerControl1 As DevExpress.XtraEditors.SplitContainerControl
Friend WithEvents XtraTabControl1 As DevExpress.XtraTab.XtraTabControl Friend WithEvents XtraTabControlMain As DevExpress.XtraTab.XtraTabControl
Friend WithEvents XtraTabPage1 As DevExpress.XtraTab.XtraTabPage Friend WithEvents XtraTabPage1 As DevExpress.XtraTab.XtraTabPage
Friend WithEvents XtraTabPage2 As DevExpress.XtraTab.XtraTabPage Friend WithEvents XtraTabPage2 As DevExpress.XtraTab.XtraTabPage
Friend WithEvents GridCompleted As DevExpress.XtraGrid.GridControl Friend WithEvents GridCompleted As DevExpress.XtraGrid.GridControl

View File

@ -125,10 +125,10 @@
<data name="SplitContainerControl1.Location" type="System.Drawing.Point, System.Drawing"> <data name="SplitContainerControl1.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 162</value> <value>0, 162</value>
</data> </data>
<data name="XtraTabControl1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms"> <data name="XtraTabControlMain.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value> <value>Fill</value>
</data> </data>
<data name="XtraTabControl1.Location" type="System.Drawing.Point, System.Drawing"> <data name="XtraTabControlMain.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value> <value>0, 0</value>
</data> </data>
<data name="GridEnvelopes.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms"> <data name="GridEnvelopes.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
@ -684,7 +684,7 @@
<data name="bbtnitmEB.Caption" xml:space="preserve"> <data name="bbtnitmEB.Caption" xml:space="preserve">
<value>Ergebnisbericht anzeigen</value> <value>Ergebnisbericht anzeigen</value>
</data> </data>
<data name="BarButtonItem2.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="bbtnitmEB.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
@ -799,15 +799,15 @@
<value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value> <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data> </data>
<data name="&gt;&gt;XtraTabPage1.Parent" xml:space="preserve"> <data name="&gt;&gt;XtraTabPage1.Parent" xml:space="preserve">
<value>XtraTabControl1</value> <value>XtraTabControlMain</value>
</data> </data>
<data name="&gt;&gt;XtraTabPage1.ZOrder" xml:space="preserve"> <data name="&gt;&gt;XtraTabPage1.ZOrder" xml:space="preserve">
<value>0</value> <value>0</value>
</data> </data>
<data name="XtraTabControl1.Size" type="System.Drawing.Size, System.Drawing"> <data name="XtraTabControlMain.Size" type="System.Drawing.Size, System.Drawing">
<value>1090, 484</value> <value>1090, 484</value>
</data> </data>
<data name="XtraTabControl1.TabIndex" type="System.Int32, mscorlib"> <data name="XtraTabControlMain.TabIndex" type="System.Int32, mscorlib">
<value>3</value> <value>3</value>
</data> </data>
<data name="GridCompleted.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms"> <data name="GridCompleted.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
@ -979,21 +979,21 @@
<value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value> <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data> </data>
<data name="&gt;&gt;XtraTabPage2.Parent" xml:space="preserve"> <data name="&gt;&gt;XtraTabPage2.Parent" xml:space="preserve">
<value>XtraTabControl1</value> <value>XtraTabControlMain</value>
</data> </data>
<data name="&gt;&gt;XtraTabPage2.ZOrder" xml:space="preserve"> <data name="&gt;&gt;XtraTabPage2.ZOrder" xml:space="preserve">
<value>1</value> <value>1</value>
</data> </data>
<data name="&gt;&gt;XtraTabControl1.Name" xml:space="preserve"> <data name="&gt;&gt;XtraTabControlMain.Name" xml:space="preserve">
<value>XtraTabControl1</value> <value>XtraTabControlMain</value>
</data> </data>
<data name="&gt;&gt;XtraTabControl1.Type" xml:space="preserve"> <data name="&gt;&gt;XtraTabControlMain.Type" xml:space="preserve">
<value>DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value> <value>DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data> </data>
<data name="&gt;&gt;XtraTabControl1.Parent" xml:space="preserve"> <data name="&gt;&gt;XtraTabControlMain.Parent" xml:space="preserve">
<value>SplitContainerControl1.Panel1</value> <value>SplitContainerControl1.Panel1</value>
</data> </data>
<data name="&gt;&gt;XtraTabControl1.ZOrder" xml:space="preserve"> <data name="&gt;&gt;XtraTabControlMain.ZOrder" xml:space="preserve">
<value>0</value> <value>0</value>
</data> </data>
<data name="SplitContainerControl1.Panel1.Text" xml:space="preserve"> <data name="SplitContainerControl1.Panel1.Text" xml:space="preserve">
@ -1322,6 +1322,12 @@
<data name="&gt;&gt;bsitmInfo.Type" xml:space="preserve"> <data name="&gt;&gt;bsitmInfo.Type" xml:space="preserve">
<value>DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value> <value>DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data> </data>
<data name="&gt;&gt;bbtnitmEB.Name" xml:space="preserve">
<value>bbtnitmEB</value>
</data>
<data name="&gt;&gt;bbtnitmEB.Type" xml:space="preserve">
<value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="&gt;&gt;RibbonPage1.Name" xml:space="preserve"> <data name="&gt;&gt;RibbonPage1.Name" xml:space="preserve">
<value>RibbonPage1</value> <value>RibbonPage1</value>
</data> </data>
@ -1346,6 +1352,12 @@
<data name="&gt;&gt;RibbonPageGroup2.Type" xml:space="preserve"> <data name="&gt;&gt;RibbonPageGroup2.Type" xml:space="preserve">
<value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value> <value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data> </data>
<data name="&gt;&gt;RibbonPageGroup4.Name" xml:space="preserve">
<value>RibbonPageGroup4</value>
</data>
<data name="&gt;&gt;RibbonPageGroup4.Type" xml:space="preserve">
<value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="&gt;&gt;RibbonPage2.Name" xml:space="preserve"> <data name="&gt;&gt;RibbonPage2.Name" xml:space="preserve">
<value>RibbonPage2</value> <value>RibbonPage2</value>
</data> </data>
@ -1454,18 +1466,6 @@
<data name="&gt;&gt;SaveFileDialog1.Type" xml:space="preserve"> <data name="&gt;&gt;SaveFileDialog1.Type" xml:space="preserve">
<value>System.Windows.Forms.SaveFileDialog, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Windows.Forms.SaveFileDialog, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data> </data>
<data name="&gt;&gt;RibbonPageGroup4.Name" xml:space="preserve">
<value>RibbonPageGroup4</value>
</data>
<data name="&gt;&gt;RibbonPageGroup4.Type" xml:space="preserve">
<value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="&gt;&gt;bbtnitmEB.Name" xml:space="preserve">
<value>bbtnitmEB</value>
</data>
<data name="&gt;&gt;bbtnitmEB.Type" xml:space="preserve">
<value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="&gt;&gt;$this.Name" xml:space="preserve"> <data name="&gt;&gt;$this.Name" xml:space="preserve">
<value>frmMain</value> <value>frmMain</value>
</data> </data>

View File

@ -55,8 +55,12 @@ Public Class frmMain
Private Sub LoadEnvelopeData() Private Sub LoadEnvelopeData()
Try Try
RefreshHelper.SaveViewInfo() RefreshHelper.SaveViewInfo()
LoadEnvelopes() If XtraTabControlMain.SelectedTabPageIndex = 0 Then
LoadCompletedEnvelopes() LoadEnvelopes()
ElseIf XtraTabControlMain.SelectedTabPageIndex = 1 Then
LoadCompletedEnvelopes()
End If
RefreshHelper.LoadViewInfo() RefreshHelper.LoadViewInfo()
'LoadCharts() 'LoadCharts()
@ -183,20 +187,22 @@ Public Class frmMain
TempFiles.CleanUp() TempFiles.CleanUp()
End Sub End Sub
Private Sub XtraTabControl1_SelectedPageChanged(sender As Object, e As DevExpress.XtraTab.TabPageChangedEventArgs) Handles XtraTabControl1.SelectedPageChanged Private Sub XtraTabControl1_SelectedPageChanged(sender As Object, e As DevExpress.XtraTab.TabPageChangedEventArgs) Handles XtraTabControlMain.SelectedPageChanged
Select Case XtraTabControl1.SelectedTabPageIndex Select Case XtraTabControlMain.SelectedTabPageIndex
Case 1 Case 1
btnEditEnvelope.Enabled = False btnEditEnvelope.Enabled = False
btnDeleteEnvelope.Enabled = False btnDeleteEnvelope.Enabled = False
btnContactReceiver.Enabled = False btnContactReceiver.Enabled = False
btnShowDocument.Enabled = False btnShowDocument.Enabled = False
bbtnitmEB.Enabled = True bbtnitmEB.Enabled = True
LoadEnvelopeData()
Case 0 Case 0
btnEditEnvelope.Enabled = True btnEditEnvelope.Enabled = True
btnDeleteEnvelope.Enabled = True btnDeleteEnvelope.Enabled = True
btnContactReceiver.Enabled = True btnContactReceiver.Enabled = True
btnShowDocument.Enabled = True btnShowDocument.Enabled = True
bbtnitmEB.Enabled = False bbtnitmEB.Enabled = False
LoadEnvelopeData()
End Select End Select
End Sub End Sub
@ -220,30 +226,43 @@ Public Class frmMain
End If End If
End Sub End Sub
Private Sub bbtnitmEB_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles bbtnitmEB.ItemClick Private Sub bbtnitmEB_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles bbtnitmEB.ItemClick
If ViewEnvelopes.FocusedRowHandle < 0 Then Try
Exit Sub If ViewEnvelopes.FocusedRowHandle < 0 Then
End If
Me.Cursor = Cursors.WaitCursor
Dim oEnvelope As Envelope = ViewCompleted.GetRow(ViewCompleted.FocusedRowHandle)
GetResRepFileStreamByte(oEnvelope.Id)
Dim oTempFolder = TempFiles.TempPath
Dim oTempFilename = String.Concat(oTempFolder, "\", $"ViewEnvResReport_{oEnvelope.Id}.pdf")
If File.Exists(oTempFilename) Then
Try
File.OpenWrite(oTempFilename)
Catch ex As Exception
MsgBox("File might already be open?", MsgBoxStyle.Exclamation)
Exit Sub Exit Sub
End Try End If
Me.Cursor = Cursors.WaitCursor
Dim oEnvelope As Envelope = ViewCompleted.GetRow(ViewCompleted.FocusedRowHandle)
GetResRepFileStreamByte(oEnvelope.Id)
Dim oTempFolder = TempFiles.TempPath
Dim oFilename = "ViewEnvResReport"
Dim oVersion As Integer = 0
Dim oTempFilename = String.Concat(oTempFolder, "\", $"{oFilename}_{oEnvelope.Id}.pdf")
Do While File.Exists(oTempFilename)
oVersion += 1
oTempFilename = String.Concat(oTempFolder, "\", $"{oFilename}_{oEnvelope.Id}_", oVersion.ToString, ".pdf")
Loop
'If File.Exists(oTempFilename) Then
' oVersion += 1
' oTempFilename = String.Concat(oTempFolder, "\", $"ViewEnvResReport_{oEnvelope.Id}_", oVersion.ToString, ".pdf")
' Try
' File.OpenWrite(oTempFilename)
' Catch ex As Exception
' MsgBox("File might already be open?", MsgBoxStyle.Exclamation)
' Exit Sub
' End Try
File.Delete(oTempFilename) ' File.Delete(oTempFilename)
End If 'End If
downloadResFile(oTempFilename) downloadResFile(oTempFilename)
Catch ex As Exception
MsgBox(ex.Message, MsgBoxStyle.Exclamation)
End Try
Me.Cursor = Cursors.Default Me.Cursor = Cursors.Default
End Sub End Sub
Private Sub ViewEnvelopes_CustomDrawCell(sender As Object, e As DevExpress.XtraGrid.Views.Base.RowCellCustomDrawEventArgs) Handles ViewEnvelopes.CustomDrawCell Private Sub ViewEnvelopes_CustomDrawCell(sender As Object, e As DevExpress.XtraGrid.Views.Base.RowCellCustomDrawEventArgs) Handles ViewEnvelopes.CustomDrawCell
If e.RowHandle < 0 Or XtraTabControl1.SelectedTabPageIndex = 1 Then If e.RowHandle < 0 Or XtraTabControlMain.SelectedTabPageIndex = 1 Then
Exit Sub Exit Sub
End If End If
@ -421,9 +440,6 @@ Public Class frmMain
End Try End Try
End Sub End Sub
Private Sub downloadResFile(ByVal sFileName As String) Private Sub downloadResFile(ByVal sFileName As String)
Dim strSql As String
'For Document
Try Try
If Not myResFileData Is Nothing Then If Not myResFileData Is Nothing Then
'Read image data into a file stream 'Read image data into a file stream

View File

@ -31,8 +31,8 @@ Global
{089D5634-FB6B-42D0-B912-7AA7457044E7}.Debug|Any CPU.Build.0 = Debug|Any CPU {089D5634-FB6B-42D0-B912-7AA7457044E7}.Debug|Any CPU.Build.0 = Debug|Any CPU
{089D5634-FB6B-42D0-B912-7AA7457044E7}.Release|Any CPU.ActiveCfg = Release|Any CPU {089D5634-FB6B-42D0-B912-7AA7457044E7}.Release|Any CPU.ActiveCfg = Release|Any CPU
{089D5634-FB6B-42D0-B912-7AA7457044E7}.Release|Any CPU.Build.0 = Release|Any CPU {089D5634-FB6B-42D0-B912-7AA7457044E7}.Release|Any CPU.Build.0 = Release|Any CPU
{6D56C01F-D6CB-4D8A-BD3D-4FD34326998C}.Debug|Any CPU.ActiveCfg = Release|Any CPU {6D56C01F-D6CB-4D8A-BD3D-4FD34326998C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6D56C01F-D6CB-4D8A-BD3D-4FD34326998C}.Debug|Any CPU.Build.0 = Release|Any CPU {6D56C01F-D6CB-4D8A-BD3D-4FD34326998C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6D56C01F-D6CB-4D8A-BD3D-4FD34326998C}.Release|Any CPU.ActiveCfg = Release|Any CPU {6D56C01F-D6CB-4D8A-BD3D-4FD34326998C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6D56C01F-D6CB-4D8A-BD3D-4FD34326998C}.Release|Any CPU.Build.0 = Release|Any CPU {6D56C01F-D6CB-4D8A-BD3D-4FD34326998C}.Release|Any CPU.Build.0 = Release|Any CPU
{6EA0C51F-C2B1-4462-8198-3DE0B32B74F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {6EA0C51F-C2B1-4462-8198-3DE0B32B74F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU