diff --git a/EnvelopeGenerator.Common/Constants.vb b/EnvelopeGenerator.Common/Constants.vb index bc9a8d11..f58aeedb 100644 --- a/EnvelopeGenerator.Common/Constants.vb +++ b/EnvelopeGenerator.Common/Constants.vb @@ -4,6 +4,8 @@ Created = 0 Saved = 1 Sent = 2 + PartSigned = 3 + CompleteSigned = 4 End Enum Public Enum ElementType diff --git a/EnvelopeGenerator.Common/Models/EnvelopeModel.vb b/EnvelopeGenerator.Common/Models/EnvelopeModel.vb index 45a62fa4..fc7d98d4 100644 --- a/EnvelopeGenerator.Common/Models/EnvelopeModel.vb +++ b/EnvelopeGenerator.Common/Models/EnvelopeModel.vb @@ -71,6 +71,20 @@ Public Class EnvelopeModel End Try End Function + Public Function ListCompleted() As IEnumerable(Of Envelope) + Try + Dim oSql = $"SELECT * FROM [dbo].[TBSIG_ENVELOPE] WHERE USER_ID = {State.UserId} AND STATUS = " + Dim oTable = Database.GetDatatable(oSql) + + Return oTable?.Rows.Cast(Of DataRow). + Select(AddressOf ToEnvelope). + ToList() + Catch ex As Exception + Logger.Error(ex) + Return Nothing + End Try + End Function + Public Function List(pReceiverId As Integer) As IEnumerable(Of Envelope) Try Dim oSql = $"SELECT T.* FROM [dbo].[TBSIG_ENVELOPE] T diff --git a/EnvelopeGenerator.Form/Controllers/EnvelopeListController.vb b/EnvelopeGenerator.Form/Controllers/EnvelopeListController.vb index 2181ed5b..e5801ecc 100644 --- a/EnvelopeGenerator.Form/Controllers/EnvelopeListController.vb +++ b/EnvelopeGenerator.Form/Controllers/EnvelopeListController.vb @@ -10,6 +10,9 @@ Public Class EnvelopeListController Public Function ListEnvelopes() As IEnumerable(Of Envelope) Return EnvelopeModel.List() End Function + Public Function ListCompleted() As Object + Return EnvelopeModel.ListCompleted() + End Function Public Overloads Function DeleteEnvelope(pEnvelope As Envelope) As Boolean Return MyBase.DeleteEnvelope(pEnvelope) diff --git a/EnvelopeGenerator.Form/frmMain.Designer.vb b/EnvelopeGenerator.Form/frmMain.Designer.vb index 1d54a049..ac2b0e49 100644 --- a/EnvelopeGenerator.Form/frmMain.Designer.vb +++ b/EnvelopeGenerator.Form/frmMain.Designer.vb @@ -21,11 +21,14 @@ Partial Class frmMain Private Sub InitializeComponent() Dim SplashScreenManager1 As DevExpress.XtraSplashScreen.SplashScreenManager = New DevExpress.XtraSplashScreen.SplashScreenManager(Me, Nothing, True, True) Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmMain)) - Dim GridLevelNode2 As DevExpress.XtraGrid.GridLevelNode = New DevExpress.XtraGrid.GridLevelNode() + Dim GridLevelNode1 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() + Me.GridEnvelopes = New DevExpress.XtraGrid.GridControl() Me.ViewReceivers = New DevExpress.XtraGrid.Views.Grid.GridView() Me.ColEmail = New DevExpress.XtraGrid.Columns.GridColumn() Me.ColReceiverStatus = New DevExpress.XtraGrid.Columns.GridColumn() - Me.GridEnvelopes = New DevExpress.XtraGrid.GridControl() Me.ViewEnvelopes = New DevExpress.XtraGrid.Views.Grid.GridView() Me.colContractType = New DevExpress.XtraGrid.Columns.GridColumn() Me.colStatus = New DevExpress.XtraGrid.Columns.GridColumn() @@ -39,16 +42,75 @@ Partial Class frmMain Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonStatusBar = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() - CType(Me.ViewReceivers, System.ComponentModel.ISupportInitialize).BeginInit() + Me.XtraTabPage2 = New DevExpress.XtraTab.XtraTabPage() + Me.GridCompleted = New DevExpress.XtraGrid.GridControl() + Me.ViewCompleted = New DevExpress.XtraGrid.Views.Grid.GridView() + Me.GridColumn3 = New DevExpress.XtraGrid.Columns.GridColumn() + Me.GridColumn4 = New DevExpress.XtraGrid.Columns.GridColumn() + Me.GridColumn5 = New DevExpress.XtraGrid.Columns.GridColumn() + Me.GridColumn6 = New DevExpress.XtraGrid.Columns.GridColumn() + Me.GridColumn7 = New DevExpress.XtraGrid.Columns.GridColumn() + CType(Me.SplitContainerControl1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.SplitContainerControl1.Panel1, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SplitContainerControl1.Panel1.SuspendLayout() + CType(Me.SplitContainerControl1.Panel2, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SplitContainerControl1.SuspendLayout() + CType(Me.XtraTabControl1, System.ComponentModel.ISupportInitialize).BeginInit() + Me.XtraTabControl1.SuspendLayout() + Me.XtraTabPage1.SuspendLayout() CType(Me.GridEnvelopes, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.ViewReceivers, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.ViewEnvelopes, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.RibbonControl, System.ComponentModel.ISupportInitialize).BeginInit() + Me.XtraTabPage2.SuspendLayout() + CType(Me.GridCompleted, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.ViewCompleted, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'SplashScreenManager1 ' SplashScreenManager1.ClosingDelay = 500 ' + 'SplitContainerControl1 + ' + resources.ApplyResources(Me.SplitContainerControl1, "SplitContainerControl1") + Me.SplitContainerControl1.Horizontal = False + Me.SplitContainerControl1.Name = "SplitContainerControl1" + ' + 'SplitContainerControl1.Panel1 + ' + Me.SplitContainerControl1.Panel1.Controls.Add(Me.XtraTabControl1) + resources.ApplyResources(Me.SplitContainerControl1.Panel1, "SplitContainerControl1.Panel1") + ' + 'SplitContainerControl1.Panel2 + ' + resources.ApplyResources(Me.SplitContainerControl1.Panel2, "SplitContainerControl1.Panel2") + Me.SplitContainerControl1.SplitterPosition = 438 + ' + 'XtraTabControl1 + ' + resources.ApplyResources(Me.XtraTabControl1, "XtraTabControl1") + Me.XtraTabControl1.Name = "XtraTabControl1" + Me.XtraTabControl1.SelectedTabPage = Me.XtraTabPage1 + Me.XtraTabControl1.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.XtraTabPage1, Me.XtraTabPage2}) + ' + 'XtraTabPage1 + ' + Me.XtraTabPage1.Controls.Add(Me.GridEnvelopes) + Me.XtraTabPage1.Name = "XtraTabPage1" + resources.ApplyResources(Me.XtraTabPage1, "XtraTabPage1") + ' + 'GridEnvelopes + ' + resources.ApplyResources(Me.GridEnvelopes, "GridEnvelopes") + GridLevelNode1.LevelTemplate = Me.ViewReceivers + GridLevelNode1.RelationName = "Receivers" + Me.GridEnvelopes.LevelTree.Nodes.AddRange(New DevExpress.XtraGrid.GridLevelNode() {GridLevelNode1}) + Me.GridEnvelopes.MainView = Me.ViewEnvelopes + Me.GridEnvelopes.MenuManager = Me.RibbonControl + Me.GridEnvelopes.Name = "GridEnvelopes" + Me.GridEnvelopes.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.ViewReceivers, Me.ViewEnvelopes}) + ' 'ViewReceivers ' Me.ViewReceivers.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.ColEmail, Me.ColReceiverStatus}) @@ -68,17 +130,6 @@ Partial Class frmMain Me.ColReceiverStatus.FieldName = "Status" Me.ColReceiverStatus.Name = "ColReceiverStatus" ' - 'GridEnvelopes - ' - resources.ApplyResources(Me.GridEnvelopes, "GridEnvelopes") - GridLevelNode2.LevelTemplate = Me.ViewReceivers - GridLevelNode2.RelationName = "Receivers" - Me.GridEnvelopes.LevelTree.Nodes.AddRange(New DevExpress.XtraGrid.GridLevelNode() {GridLevelNode2}) - Me.GridEnvelopes.MainView = Me.ViewEnvelopes - Me.GridEnvelopes.MenuManager = Me.RibbonControl - Me.GridEnvelopes.Name = "GridEnvelopes" - Me.GridEnvelopes.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.ViewEnvelopes, Me.ViewReceivers}) - ' 'ViewEnvelopes ' Me.ViewEnvelopes.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colContractType, Me.colStatus, Me.colTitle, Me.colSubject, Me.colAddedWhen}) @@ -167,21 +218,82 @@ Partial Class frmMain Me.RibbonStatusBar.Name = "RibbonStatusBar" Me.RibbonStatusBar.Ribbon = Me.RibbonControl ' + 'XtraTabPage2 + ' + Me.XtraTabPage2.Controls.Add(Me.GridCompleted) + Me.XtraTabPage2.Name = "XtraTabPage2" + resources.ApplyResources(Me.XtraTabPage2, "XtraTabPage2") + ' + 'GridCompleted + ' + resources.ApplyResources(Me.GridCompleted, "GridCompleted") + Me.GridCompleted.MainView = Me.ViewCompleted + Me.GridCompleted.MenuManager = Me.RibbonControl + Me.GridCompleted.Name = "GridCompleted" + Me.GridCompleted.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.ViewCompleted}) + ' + '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" + ' + 'GridColumn3 + ' + resources.ApplyResources(Me.GridColumn3, "GridColumn3") + Me.GridColumn3.FieldName = "ContractTypeTranslated" + Me.GridColumn3.Name = "GridColumn3" + ' + 'GridColumn4 + ' + resources.ApplyResources(Me.GridColumn4, "GridColumn4") + Me.GridColumn4.FieldName = "StatusTranslated" + Me.GridColumn4.Name = "GridColumn4" + ' + 'GridColumn5 + ' + resources.ApplyResources(Me.GridColumn5, "GridColumn5") + Me.GridColumn5.FieldName = "Title" + Me.GridColumn5.Name = "GridColumn5" + ' + 'GridColumn6 + ' + resources.ApplyResources(Me.GridColumn6, "GridColumn6") + Me.GridColumn6.FieldName = "Subject" + Me.GridColumn6.Name = "GridColumn6" + ' + 'GridColumn7 + ' + resources.ApplyResources(Me.GridColumn7, "GridColumn7") + Me.GridColumn7.FieldName = "AddedWhen" + Me.GridColumn7.Name = "GridColumn7" + ' 'frmMain ' resources.ApplyResources(Me, "$this") Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.Controls.Add(Me.GridEnvelopes) + Me.Controls.Add(Me.SplitContainerControl1) Me.Controls.Add(Me.RibbonStatusBar) Me.Controls.Add(Me.RibbonControl) Me.IconOptions.SvgImage = CType(resources.GetObject("frmMain.IconOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.Name = "frmMain" Me.Ribbon = Me.RibbonControl Me.StatusBar = Me.RibbonStatusBar - CType(Me.ViewReceivers, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.SplitContainerControl1.Panel1, System.ComponentModel.ISupportInitialize).EndInit() + Me.SplitContainerControl1.Panel1.ResumeLayout(False) + CType(Me.SplitContainerControl1.Panel2, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.SplitContainerControl1, System.ComponentModel.ISupportInitialize).EndInit() + Me.SplitContainerControl1.ResumeLayout(False) + CType(Me.XtraTabControl1, System.ComponentModel.ISupportInitialize).EndInit() + Me.XtraTabControl1.ResumeLayout(False) + Me.XtraTabPage1.ResumeLayout(False) CType(Me.GridEnvelopes, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.ViewReceivers, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.ViewEnvelopes, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.RibbonControl, System.ComponentModel.ISupportInitialize).EndInit() + Me.XtraTabPage2.ResumeLayout(False) + CType(Me.GridCompleted, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.ViewCompleted, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() @@ -204,4 +316,15 @@ Partial Class frmMain Friend WithEvents ViewReceivers As DevExpress.XtraGrid.Views.Grid.GridView Friend WithEvents ColEmail As DevExpress.XtraGrid.Columns.GridColumn Friend WithEvents ColReceiverStatus As DevExpress.XtraGrid.Columns.GridColumn + Friend WithEvents SplitContainerControl1 As DevExpress.XtraEditors.SplitContainerControl + Friend WithEvents XtraTabControl1 As DevExpress.XtraTab.XtraTabControl + Friend WithEvents XtraTabPage1 As DevExpress.XtraTab.XtraTabPage + Friend WithEvents XtraTabPage2 As DevExpress.XtraTab.XtraTabPage + Friend WithEvents GridCompleted As DevExpress.XtraGrid.GridControl + Friend WithEvents ViewCompleted As DevExpress.XtraGrid.Views.Grid.GridView + Friend WithEvents GridColumn3 As DevExpress.XtraGrid.Columns.GridColumn + Friend WithEvents GridColumn4 As DevExpress.XtraGrid.Columns.GridColumn + Friend WithEvents GridColumn5 As DevExpress.XtraGrid.Columns.GridColumn + Friend WithEvents GridColumn6 As DevExpress.XtraGrid.Columns.GridColumn + Friend WithEvents GridColumn7 As DevExpress.XtraGrid.Columns.GridColumn End Class diff --git a/EnvelopeGenerator.Form/frmMain.resx b/EnvelopeGenerator.Form/frmMain.resx index 3f205551..a0c46884 100644 --- a/EnvelopeGenerator.Form/frmMain.resx +++ b/EnvelopeGenerator.Form/frmMain.resx @@ -117,6 +117,23 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Fill + + + + 0, 158 + + + Fill + + + 0, 0 + + + Fill + Email @@ -136,13 +153,11 @@ 1 - - - Fill + + Empfänger - - 0, 158 + 0, 0 Typ @@ -273,6 +288,9 @@ 0, 0 + + Funktionen + Start @@ -280,10 +298,10 @@ 1088, 158 - 0, 659 + 0, 657 - 1088, 22 + 1088, 24 RibbonStatusBar @@ -310,7 +328,7 @@ 2 - 1088, 501 + 1086, 294 2 @@ -322,16 +340,196 @@ DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - $this + XtraTabPage1 0 - - Empfänger + + 1086, 294 - - Funktionen + + Offene Umschläge + + + XtraTabPage1 + + + DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + XtraTabControl1 + + + 0 + + + 1088, 438 + + + 3 + + + Fill + + + 0, 0 + + + Typ + + + True + + + 0 + + + 158 + + + Status + + + True + + + 1 + + + 115 + + + Titel + + + True + + + 2 + + + 338 + + + Betreff + + + True + + + 3 + + + 338 + + + Erstellt am + + + True + + + 4 + + + 112 + + + 1086, 413 + + + 3 + + + GridCompleted + + + DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + XtraTabPage2 + + + 0 + + + 1086, 413 + + + Abgeschlossene Umschläge + + + XtraTabPage2 + + + DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + XtraTabControl1 + + + 1 + + + XtraTabControl1 + + + DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + SplitContainerControl1.Panel1 + + + 0 + + + Panel1 + + + SplitContainerControl1.Panel1 + + + DevExpress.XtraEditors.SplitGroupPanel, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + SplitContainerControl1 + + + 0 + + + Panel2 + + + SplitContainerControl1.Panel2 + + + DevExpress.XtraEditors.SplitGroupPanel, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + SplitContainerControl1 + + + 1 + + + 1088, 499 + + + 5 + + + SplitContainerControl1 + + + DevExpress.XtraEditors.SplitContainerControl, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + $this + + + 0 True @@ -454,6 +652,42 @@ DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ViewCompleted + + + DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + GridColumn3 + + + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + GridColumn4 + + + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + GridColumn5 + + + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + GridColumn6 + + + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + GridColumn7 + + + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + frmMain diff --git a/EnvelopeGenerator.Form/frmMain.vb b/EnvelopeGenerator.Form/frmMain.vb index fd829e43..60767237 100644 --- a/EnvelopeGenerator.Form/frmMain.vb +++ b/EnvelopeGenerator.Form/frmMain.vb @@ -67,12 +67,13 @@ Public Class frmMain Controller = New EnvelopeListController(State) + LoadEnvelopes() + + GridBuilder = New GridBuilder(ViewEnvelopes) GridBuilder.SetDefaults(ViewEnvelopes) GridBuilder.SetReadOnlyOptions(ViewEnvelopes) - GridEnvelopes.DataSource = Controller.ListEnvelopes() - Catch ex As Exception Logger.Error(ex) @@ -80,6 +81,22 @@ Public Class frmMain End Sub + Private Sub LoadEnvelopes() + GridBuilder = New GridBuilder(ViewEnvelopes) + GridBuilder.SetDefaults(ViewEnvelopes) + GridBuilder.SetReadOnlyOptions(ViewEnvelopes) + + GridEnvelopes.DataSource = Controller.ListEnvelopes() + End Sub + + Private Sub LoadCompletedEnvelopes() + GridBuilder = New GridBuilder(ViewCompleted) + GridBuilder.SetDefaults(ViewCompleted) + GridBuilder.SetReadOnlyOptions(ViewCompleted) + + GridCompleted.DataSource = Controller.ListCompleted() + End Sub + Private Sub btnCreateEnvelope_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnCreateEnvelope.ItemClick Dim oHandle = SplashScreenManager.ShowOverlayForm(Me) Try @@ -140,4 +157,5 @@ Public Class frmMain ' Cleanup Methods TempFiles.CleanUp() End Sub + End Class \ No newline at end of file