From 78ed65fb9fca14c011f1f9c81a46d49b69229ca0 Mon Sep 17 00:00:00 2001 From: pitzm Date: Mon, 4 Dec 2023 16:50:01 +0100 Subject: [PATCH] Status-Form verbessert --- .../Models/EnvelopeModel.vb | 4 +- EnvelopeGenerator.Form/frmMain.Designer.vb | 53 +++++++++++++- EnvelopeGenerator.Form/frmMain.resx | 69 +++++++++++++++++++ 3 files changed, 123 insertions(+), 3 deletions(-) diff --git a/EnvelopeGenerator.Common/Models/EnvelopeModel.vb b/EnvelopeGenerator.Common/Models/EnvelopeModel.vb index 9ac106f8..89f98997 100644 --- a/EnvelopeGenerator.Common/Models/EnvelopeModel.vb +++ b/EnvelopeGenerator.Common/Models/EnvelopeModel.vb @@ -71,7 +71,7 @@ Public Class EnvelopeModel Public Function List() As IEnumerable(Of Envelope) Try - Dim oSql = $"EXEC PRSIG_GET_ENVELOPES_FOR_USER {State.UserId}" + Dim oSql = $"EXEC [dbo].[PRSIG_GET_ENVELOPES_FOR_USER] {State.UserId}" Dim oTable = Database.GetDatatable(oSql) Return oTable?.Rows.Cast(Of DataRow). @@ -85,7 +85,7 @@ Public Class EnvelopeModel Public Function ListCompleted() As IEnumerable(Of Envelope) Try - Dim oSql = $"SELECT * FROM [dbo].[TBSIG_ENVELOPE] WHERE USER_ID = {State.UserId} AND STATUS = 4" + Dim oSql = $"EXEC [dbo].[PRSIG_GET_CLOSED_ENVELOPES_FOR_USER] {State.UserId}" Dim oTable = Database.GetDatatable(oSql) Return oTable?.Rows.Cast(Of DataRow). diff --git a/EnvelopeGenerator.Form/frmMain.Designer.vb b/EnvelopeGenerator.Form/frmMain.Designer.vb index 9e5f47e7..2a3622c9 100644 --- a/EnvelopeGenerator.Form/frmMain.Designer.vb +++ b/EnvelopeGenerator.Form/frmMain.Designer.vb @@ -22,6 +22,7 @@ Partial Class frmMain 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 GridLevelNode1 As DevExpress.XtraGrid.GridLevelNode = New DevExpress.XtraGrid.GridLevelNode() + Dim GridLevelNode2 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() @@ -46,6 +47,11 @@ Partial Class frmMain Me.RibbonStatusBar = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() Me.XtraTabPage2 = New DevExpress.XtraTab.XtraTabPage() Me.GridCompleted = New DevExpress.XtraGrid.GridControl() + Me.ViewReceiversCompleted = New DevExpress.XtraGrid.Views.Grid.GridView() + Me.ColStatusCompleted = New DevExpress.XtraGrid.Columns.GridColumn() + Me.ColNameCompleted = New DevExpress.XtraGrid.Columns.GridColumn() + Me.ColEmailCompleted = New DevExpress.XtraGrid.Columns.GridColumn() + Me.ColSignedDateCompleted = 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() @@ -66,6 +72,7 @@ Partial Class frmMain CType(Me.RibbonControl, System.ComponentModel.ISupportInitialize).BeginInit() Me.XtraTabPage2.SuspendLayout() CType(Me.GridCompleted, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.ViewReceiversCompleted, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.ViewCompleted, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' @@ -250,10 +257,48 @@ Partial Class frmMain 'GridCompleted ' resources.ApplyResources(Me.GridCompleted, "GridCompleted") + GridLevelNode2.LevelTemplate = Me.ViewReceiversCompleted + GridLevelNode2.RelationName = "Receivers" + Me.GridCompleted.LevelTree.Nodes.AddRange(New DevExpress.XtraGrid.GridLevelNode() {GridLevelNode2}) 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}) + Me.GridCompleted.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.ViewReceiversCompleted, 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.OptionsDetail.AllowZoomDetail = False + Me.ViewReceiversCompleted.OptionsView.ShowDetailButtons = False + Me.ViewReceiversCompleted.OptionsView.ShowGroupPanel = False + Me.ViewReceiversCompleted.OptionsView.ShowIndicator = False + resources.ApplyResources(Me.ViewReceiversCompleted, "ViewReceiversCompleted") + ' + 'ColStatusCompleted + ' + resources.ApplyResources(Me.ColStatusCompleted, "ColStatusCompleted") + Me.ColStatusCompleted.FieldName = "StatusTranslated" + Me.ColStatusCompleted.Name = "ColStatusCompleted" + ' + 'ColNameCompleted + ' + resources.ApplyResources(Me.ColNameCompleted, "ColNameCompleted") + Me.ColNameCompleted.FieldName = "Name" + Me.ColNameCompleted.Name = "ColNameCompleted" + ' + 'ColEmailCompleted + ' + resources.ApplyResources(Me.ColEmailCompleted, "ColEmailCompleted") + Me.ColEmailCompleted.FieldName = "Email" + Me.ColEmailCompleted.Name = "ColEmailCompleted" + ' + 'ColSignedDateCompleted + ' + resources.ApplyResources(Me.ColSignedDateCompleted, "ColSignedDateCompleted") + Me.ColSignedDateCompleted.FieldName = "SignedDateDisplayValue" + Me.ColSignedDateCompleted.Name = "ColSignedDateCompleted" ' 'ViewCompleted ' @@ -316,6 +361,7 @@ Partial Class frmMain CType(Me.RibbonControl, System.ComponentModel.ISupportInitialize).EndInit() Me.XtraTabPage2.ResumeLayout(False) CType(Me.GridCompleted, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.ViewReceiversCompleted, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.ViewCompleted, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() @@ -352,4 +398,9 @@ Partial Class frmMain Friend WithEvents GridColumn7 As DevExpress.XtraGrid.Columns.GridColumn Friend WithEvents ColName As DevExpress.XtraGrid.Columns.GridColumn Friend WithEvents ColSignedDate As DevExpress.XtraGrid.Columns.GridColumn + Friend WithEvents ViewReceiversCompleted As DevExpress.XtraGrid.Views.Grid.GridView + Friend WithEvents ColStatusCompleted As DevExpress.XtraGrid.Columns.GridColumn + Friend WithEvents ColNameCompleted As DevExpress.XtraGrid.Columns.GridColumn + Friend WithEvents ColEmailCompleted As DevExpress.XtraGrid.Columns.GridColumn + Friend WithEvents ColSignedDateCompleted As DevExpress.XtraGrid.Columns.GridColumn End Class diff --git a/EnvelopeGenerator.Form/frmMain.resx b/EnvelopeGenerator.Form/frmMain.resx index 0b737eca..33ad53ca 100644 --- a/EnvelopeGenerator.Form/frmMain.resx +++ b/EnvelopeGenerator.Form/frmMain.resx @@ -402,6 +402,45 @@ Fill + + Status + + + True + + + 0 + + + Name + + + True + + + 1 + + + Email + + + True + + + 2 + + + Unterschrieben wann + + + True + + + 3 + + + Empfänger + 0, 0 @@ -694,6 +733,36 @@ DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ViewReceiversCompleted + + + DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + ColStatusCompleted + + + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + ColNameCompleted + + + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + ColEmailCompleted + + + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + ColSignedDateCompleted + + + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ViewCompleted