diff --git a/EnvelopeGenerator.Form/frmMain.Designer.vb b/EnvelopeGenerator.Form/frmMain.Designer.vb
index e34689e9..445708e4 100644
--- a/EnvelopeGenerator.Form/frmMain.Designer.vb
+++ b/EnvelopeGenerator.Form/frmMain.Designer.vb
@@ -25,6 +25,7 @@ Partial Class frmMain
Dim GridLevelNode1 As DevExpress.XtraGrid.GridLevelNode = New DevExpress.XtraGrid.GridLevelNode()
Dim GridLevelNode2 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()
Me.SplitContainerControl1 = New DevExpress.XtraEditors.SplitContainerControl()
Me.XtraTabControl1 = New DevExpress.XtraTab.XtraTabControl()
Me.XtraTabPage1 = New DevExpress.XtraTab.XtraTabPage()
@@ -66,6 +67,10 @@ Partial Class frmMain
Me.ColNameCompleted = New DevExpress.XtraGrid.Columns.GridColumn()
Me.ColEmailCompleted = New DevExpress.XtraGrid.Columns.GridColumn()
Me.ColSignedDateCompleted = New DevExpress.XtraGrid.Columns.GridColumn()
+ Me.ViewHistoryCompleted = New DevExpress.XtraGrid.Views.Grid.GridView()
+ Me.ColHistoryStatusCompleted = New DevExpress.XtraGrid.Columns.GridColumn()
+ Me.ColHistoryUserReferenceCompleted = New DevExpress.XtraGrid.Columns.GridColumn()
+ Me.ColHistoryDateCompleted = New DevExpress.XtraGrid.Columns.GridColumn()
Me.ViewCompleted = New DevExpress.XtraGrid.Views.Grid.GridView()
Me.GridColumn3 = New DevExpress.XtraGrid.Columns.GridColumn()
Me.GridColumn4 = New DevExpress.XtraGrid.Columns.GridColumn()
@@ -89,6 +94,7 @@ Partial Class frmMain
Me.XtraTabPage2.SuspendLayout()
CType(Me.GridCompleted, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.ViewReceiversCompleted, System.ComponentModel.ISupportInitialize).BeginInit()
+ CType(Me.ViewHistoryCompleted, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.ViewCompleted, System.ComponentModel.ISupportInitialize).BeginInit()
Me.SuspendLayout()
'
@@ -224,6 +230,8 @@ Partial Class frmMain
Me.ViewEnvelopes.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colEnvelopeId, Me.colContractType, Me.colStatus, Me.colTitle, Me.colSubject, Me.colAddedWhen})
Me.ViewEnvelopes.GridControl = Me.GridEnvelopes
Me.ViewEnvelopes.Name = "ViewEnvelopes"
+ Me.ViewEnvelopes.OptionsBehavior.Editable = False
+ Me.ViewEnvelopes.OptionsBehavior.ReadOnly = True
'
'colEnvelopeId
'
@@ -370,18 +378,22 @@ Partial Class frmMain
resources.ApplyResources(Me.GridCompleted, "GridCompleted")
GridLevelNode3.LevelTemplate = Me.ViewReceiversCompleted
GridLevelNode3.RelationName = "Receivers"
- Me.GridCompleted.LevelTree.Nodes.AddRange(New DevExpress.XtraGrid.GridLevelNode() {GridLevelNode3})
+ GridLevelNode4.LevelTemplate = Me.ViewHistoryCompleted
+ GridLevelNode4.RelationName = "History"
+ Me.GridCompleted.LevelTree.Nodes.AddRange(New DevExpress.XtraGrid.GridLevelNode() {GridLevelNode3, GridLevelNode4})
Me.GridCompleted.MainView = Me.ViewCompleted
Me.GridCompleted.MenuManager = Me.RibbonControl
Me.GridCompleted.Name = "GridCompleted"
Me.GridCompleted.ShowOnlyPredefinedDetails = True
- Me.GridCompleted.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.ViewReceiversCompleted, Me.ViewCompleted})
+ Me.GridCompleted.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.ViewReceiversCompleted, Me.ViewHistoryCompleted, Me.ViewCompleted})
'
'ViewReceiversCompleted
'
Me.ViewReceiversCompleted.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.ColStatusCompleted, Me.ColNameCompleted, Me.ColEmailCompleted, Me.ColSignedDateCompleted})
Me.ViewReceiversCompleted.GridControl = Me.GridCompleted
Me.ViewReceiversCompleted.Name = "ViewReceiversCompleted"
+ Me.ViewReceiversCompleted.OptionsBehavior.Editable = False
+ Me.ViewReceiversCompleted.OptionsBehavior.ReadOnly = True
Me.ViewReceiversCompleted.OptionsDetail.AllowZoomDetail = False
Me.ViewReceiversCompleted.OptionsView.ShowDetailButtons = False
Me.ViewReceiversCompleted.OptionsView.ShowGroupPanel = False
@@ -412,11 +424,43 @@ Partial Class frmMain
Me.ColSignedDateCompleted.FieldName = "SignedDateDisplayValue"
Me.ColSignedDateCompleted.Name = "ColSignedDateCompleted"
'
+ 'ViewHistoryCompleted
+ '
+ Me.ViewHistoryCompleted.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.ColHistoryStatusCompleted, Me.ColHistoryUserReferenceCompleted, Me.ColHistoryDateCompleted})
+ Me.ViewHistoryCompleted.GridControl = Me.GridCompleted
+ Me.ViewHistoryCompleted.Name = "ViewHistoryCompleted"
+ Me.ViewHistoryCompleted.OptionsBehavior.Editable = False
+ Me.ViewHistoryCompleted.OptionsBehavior.ReadOnly = True
+ Me.ViewHistoryCompleted.OptionsDetail.AllowZoomDetail = False
+ Me.ViewHistoryCompleted.OptionsView.ShowDetailButtons = False
+ Me.ViewHistoryCompleted.OptionsView.ShowGroupPanel = False
+ Me.ViewHistoryCompleted.OptionsView.ShowIndicator = False
+ '
+ 'ColHistoryStatusCompleted
+ '
+ resources.ApplyResources(Me.ColHistoryStatusCompleted, "ColHistoryStatusCompleted")
+ Me.ColHistoryStatusCompleted.FieldName = "StatusTranslated"
+ Me.ColHistoryStatusCompleted.Name = "ColHistoryStatusCompleted"
+ '
+ 'ColHistoryUserReferenceCompleted
+ '
+ resources.ApplyResources(Me.ColHistoryUserReferenceCompleted, "ColHistoryUserReferenceCompleted")
+ Me.ColHistoryUserReferenceCompleted.FieldName = "UserReference"
+ Me.ColHistoryUserReferenceCompleted.Name = "ColHistoryUserReferenceCompleted"
+ '
+ 'ColHistoryDateCompleted
+ '
+ resources.ApplyResources(Me.ColHistoryDateCompleted, "ColHistoryDateCompleted")
+ Me.ColHistoryDateCompleted.FieldName = "ActionDate"
+ Me.ColHistoryDateCompleted.Name = "ColHistoryDateCompleted"
+ '
'ViewCompleted
'
Me.ViewCompleted.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.GridColumn3, Me.GridColumn4, Me.GridColumn5, Me.GridColumn6, Me.GridColumn7})
Me.ViewCompleted.GridControl = Me.GridCompleted
Me.ViewCompleted.Name = "ViewCompleted"
+ Me.ViewCompleted.OptionsBehavior.Editable = False
+ Me.ViewCompleted.OptionsBehavior.ReadOnly = True
Me.ViewCompleted.OptionsView.ShowIndicator = False
'
'GridColumn3
@@ -481,6 +525,7 @@ Partial Class frmMain
Me.XtraTabPage2.ResumeLayout(False)
CType(Me.GridCompleted, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.ViewReceiversCompleted, System.ComponentModel.ISupportInitialize).EndInit()
+ CType(Me.ViewHistoryCompleted, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.ViewCompleted, System.ComponentModel.ISupportInitialize).EndInit()
Me.ResumeLayout(False)
Me.PerformLayout()
@@ -535,4 +580,8 @@ Partial Class frmMain
Friend WithEvents btnContactReceiver As DevExpress.XtraBars.BarButtonItem
Friend WithEvents RibbonPageGroup2 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
Friend WithEvents colEnvelopeId As DevExpress.XtraGrid.Columns.GridColumn
+ Friend WithEvents ViewHistoryCompleted As DevExpress.XtraGrid.Views.Grid.GridView
+ Friend WithEvents ColHistoryStatusCompleted As DevExpress.XtraGrid.Columns.GridColumn
+ Friend WithEvents ColHistoryUserReferenceCompleted As DevExpress.XtraGrid.Columns.GridColumn
+ Friend WithEvents ColHistoryDateCompleted As DevExpress.XtraGrid.Columns.GridColumn
End Class
diff --git a/EnvelopeGenerator.Form/frmMain.resx b/EnvelopeGenerator.Form/frmMain.resx
index abffd8d5..e2a045d0 100644
--- a/EnvelopeGenerator.Form/frmMain.resx
+++ b/EnvelopeGenerator.Form/frmMain.resx
@@ -582,6 +582,33 @@
Empfänger
+
+ Status
+
+
+ True
+
+
+ 0
+
+
+ Benutzer
+
+
+ True
+
+
+ 1
+
+
+ Datum
+
+
+ True
+
+
+ 2
+
0, 0
@@ -979,6 +1006,30 @@
DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+
+ ViewHistoryCompleted
+
+
+ DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+
+
+ ColHistoryStatusCompleted
+
+
+ DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+
+
+ ColHistoryUserReferenceCompleted
+
+
+ DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+
+
+ ColHistoryDateCompleted
+
+
+ DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+
ViewCompleted
diff --git a/EnvelopeGenerator.Form/frmMain.vb b/EnvelopeGenerator.Form/frmMain.vb
index c3089183..b6f36214 100644
--- a/EnvelopeGenerator.Form/frmMain.vb
+++ b/EnvelopeGenerator.Form/frmMain.vb
@@ -250,6 +250,40 @@ Public Class frmMain
End If
End Sub
+ Private Sub ViewCompleted_CustomDrawCell(sender As Object, e As Views.Base.RowCellCustomDrawEventArgs) Handles ViewCompleted.CustomDrawCell
+ If e.RowHandle < 0 Then
+ Exit Sub
+ End If
+
+ Dim oEnvelope As Envelope = ViewCompleted.GetRow(e.RowHandle)
+ If oEnvelope.Status = Common.Constants.EnvelopeStatus.EnvelopeCompletelySigned Then
+ e.Appearance.BackColor = ColorTranslator.FromHtml(Common.Constants.GREEN_300)
+ End If
+
+ If oEnvelope.Status = Common.Constants.EnvelopeStatus.EnvelopeDeleted Then
+ e.Appearance.BackColor = ColorTranslator.FromHtml(Common.Constants.RED_300)
+ End If
+ End Sub
+
+ Private Sub ViewReceiversCompleted_CustomDrawCell(sender As Object, e As Views.Base.RowCellCustomDrawEventArgs) Handles ViewReceiversCompleted.CustomDrawCell
+ If e.RowHandle < 0 Then
+ Exit Sub
+ End If
+
+ Dim oView As GridView = DirectCast(sender, GridView)
+ Dim oReceiver As EnvelopeReceiver = oView.GetRow(e.RowHandle)
+
+ If (oReceiver Is Nothing) Then
+ Exit Sub
+ End If
+
+ If oReceiver.Status = Common.Constants.ReceiverStatus.Signed Then
+ e.Appearance.BackColor = ColorTranslator.FromHtml(Common.Constants.GREEN_300)
+ Else
+ e.Appearance.BackColor = ColorTranslator.FromHtml(Common.Constants.RED_300)
+ End If
+ 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()
@@ -286,4 +320,5 @@ Public Class frmMain
Logger.Error(ex)
End Try
End Sub
+
End Class
\ No newline at end of file