diff --git a/EnvelopeGenerator.Common/Entities/Envelope.vb b/EnvelopeGenerator.Common/Entities/Envelope.vb index b9cc17d5..64f0286b 100644 --- a/EnvelopeGenerator.Common/Entities/Envelope.vb +++ b/EnvelopeGenerator.Common/Entities/Envelope.vb @@ -14,6 +14,13 @@ Public Property Documents As New List(Of EnvelopeDocument) Public Property Receivers As New List(Of EnvelopeReceiver) + Public Property History As New List(Of EnvelopeHistoryEntry) + + Public ReadOnly Property IsAlreadySent As Boolean + Get + Return Status > Constants.EnvelopeStatus.EnvelopeSaved + End Get + End Property Public ReadOnly Property StatusTranslated As String Get diff --git a/EnvelopeGenerator.Common/Entities/EnvelopeHistoryEntry.vb b/EnvelopeGenerator.Common/Entities/EnvelopeHistoryEntry.vb index b6c66580..f144d5a0 100644 --- a/EnvelopeGenerator.Common/Entities/EnvelopeHistoryEntry.vb +++ b/EnvelopeGenerator.Common/Entities/EnvelopeHistoryEntry.vb @@ -1,6 +1,12 @@ Public Class EnvelopeHistoryEntry - Public EnvelopeId As Integer - Public UserReference As String - Public Status As Constants.EnvelopeStatus - Public ActionDate As Date = Now() + Public Property EnvelopeId As Integer + Public Property UserReference As String + Public Property Status As Constants.EnvelopeStatus + Public ReadOnly Property StatusTranslated As String + Get + Dim oStatus = Status.ToString() + Return My.Resources.Model.ResourceManager.GetString(oStatus) + End Get + End Property + Public Property ActionDate As Date = Now() End Class diff --git a/EnvelopeGenerator.Common/Jobs/CertificateDocumentJob.vb b/EnvelopeGenerator.Common/Jobs/CertificateDocumentJob.vb index 9636c522..96e36d09 100644 --- a/EnvelopeGenerator.Common/Jobs/CertificateDocumentJob.vb +++ b/EnvelopeGenerator.Common/Jobs/CertificateDocumentJob.vb @@ -82,7 +82,7 @@ Namespace Jobs GenerateFinalPDF(oEnvelopeData) Dim oReport As Byte() = Await GenerateReportPdf(oId) - MergeDocuments() + 'MergeDocuments() Next diff --git a/EnvelopeGenerator.Common/Models/EnvelopeModel.vb b/EnvelopeGenerator.Common/Models/EnvelopeModel.vb index 89f98997..d9b982e6 100644 --- a/EnvelopeGenerator.Common/Models/EnvelopeModel.vb +++ b/EnvelopeGenerator.Common/Models/EnvelopeModel.vb @@ -8,14 +8,17 @@ Public Class EnvelopeModel Private ReadOnly UserModel As UserModel Private ReadOnly ReceiverModel As ReceiverModel + Private ReadOnly HistoryModel As HistoryModel Private ReadOnly DocumentModel As DocumentModel + Public Sub New(pState As State) MyBase.New(pState) UserModel = New UserModel(pState) ReceiverModel = New ReceiverModel(pState) DocumentModel = New DocumentModel(pState) + HistoryModel = New HistoryModel(pState) End Sub Private Function ToEnvelope(pRow As DataRow) As Envelope @@ -35,6 +38,7 @@ Public Class EnvelopeModel oEnvelope.User = UserModel.SelectUser(oEnvelope.UserId) oEnvelope.Receivers = ReceiverModel.ListEnvelopeReceivers(oEnvelope.Id) oEnvelope.Documents = DocumentModel.List(oEnvelope.Id) + oEnvelope.History = HistoryModel.List(oEnvelope.Id) Return oEnvelope End Function diff --git a/EnvelopeGenerator.Common/Models/HistoryModel.vb b/EnvelopeGenerator.Common/Models/HistoryModel.vb index ec8d2f94..87e37ebc 100644 --- a/EnvelopeGenerator.Common/Models/HistoryModel.vb +++ b/EnvelopeGenerator.Common/Models/HistoryModel.vb @@ -1,4 +1,5 @@ Imports System.Data.SqlClient +Imports DigitalData.Modules.Base Public Class HistoryModel Inherits BaseModel @@ -7,6 +8,24 @@ Public Class HistoryModel MyBase.New(pState) End Sub + Private Function ToEnvelopeHistoryEntry(pRow As DataRow) As EnvelopeHistoryEntry + Return New EnvelopeHistoryEntry() With { + .ActionDate = pRow.Item("ACTION_DATE"), + .EnvelopeId = pRow.Item("ENVELOPE_ID"), + .Status = pRow.Item("STATUS"), + .UserReference = pRow.ItemEx("USER_REFERENCE", "") + } + End Function + + Public Function List(pEnvelopeId As Integer) As List(Of EnvelopeHistoryEntry) + Dim oSql = $"SELECT * FROM TBSIG_ENVELOPE_HISTORY WHERE ENVELOPE_ID = {pEnvelopeId} AND STATUS < 3000 ORDER BY ADDED_WHEN DESC" + Dim oTable = Database.GetDatatable(oSql) + Return oTable?.Rows. + Cast(Of DataRow). + Select(AddressOf ToEnvelopeHistoryEntry). + ToList() + End Function + Public Function Insert(pHistory As EnvelopeHistoryEntry) As Boolean Try Dim oSql = "INSERT INTO [dbo].[TBSIG_ENVELOPE_HISTORY] " diff --git a/EnvelopeGenerator.Form/Controllers/BaseController.vb b/EnvelopeGenerator.Form/Controllers/BaseController.vb index 007e9047..2aa8e6a7 100644 --- a/EnvelopeGenerator.Form/Controllers/BaseController.vb +++ b/EnvelopeGenerator.Form/Controllers/BaseController.vb @@ -44,11 +44,16 @@ Public MustInherit Class BaseController Return True End If - Return ActionService.DeleteEnvelope(pEnvelope) + If pEnvelope.IsAlreadySent Then + Return ActionService.DeleteEnvelope(pEnvelope) + Else + Return DeleteEnvelopeFromDisk(pEnvelope) + End If + End Function - Public Function DeleteEnvelope_Old(pEnvelope As Envelope) As Boolean + Public Function DeleteEnvelopeFromDisk(pEnvelope As Envelope) As Boolean If pEnvelope Is Nothing Then Return True End If diff --git a/EnvelopeGenerator.Form/frmEnvelopeEditor.Designer.vb b/EnvelopeGenerator.Form/frmEnvelopeEditor.Designer.vb index 4e4f18a8..71e118f8 100644 --- a/EnvelopeGenerator.Form/frmEnvelopeEditor.Designer.vb +++ b/EnvelopeGenerator.Form/frmEnvelopeEditor.Designer.vb @@ -221,6 +221,8 @@ Partial Public Class frmEnvelopeEditor Me.RibbonControl1.MaxItemId = 10 Me.RibbonControl1.Name = "RibbonControl1" Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) + Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] + Me.RibbonControl1.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.Hide ' 'btnSave ' @@ -325,7 +327,7 @@ Partial Public Class frmEnvelopeEditor Me.LayoutControlGroup4.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlGroup5}) Me.LayoutControlGroup4.Name = "LayoutControlGroup4" Me.LayoutControlGroup4.Padding = New DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0) - Me.LayoutControlGroup4.Size = New System.Drawing.Size(251, 526) + Me.LayoutControlGroup4.Size = New System.Drawing.Size(251, 552) Me.LayoutControlGroup4.TextVisible = False ' 'LayoutControlGroup5 @@ -333,7 +335,7 @@ Partial Public Class frmEnvelopeEditor Me.LayoutControlGroup5.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem5}) Me.LayoutControlGroup5.Location = New System.Drawing.Point(0, 0) Me.LayoutControlGroup5.Name = "LayoutControlGroup5" - Me.LayoutControlGroup5.Size = New System.Drawing.Size(251, 526) + Me.LayoutControlGroup5.Size = New System.Drawing.Size(251, 552) resources.ApplyResources(Me.LayoutControlGroup5, "LayoutControlGroup5") ' 'LayoutControlItem5 @@ -341,7 +343,7 @@ Partial Public Class frmEnvelopeEditor Me.LayoutControlItem5.Control = Me.GridDocuments Me.LayoutControlItem5.Location = New System.Drawing.Point(0, 0) Me.LayoutControlItem5.Name = "LayoutControlItem5" - Me.LayoutControlItem5.Size = New System.Drawing.Size(227, 481) + Me.LayoutControlItem5.Size = New System.Drawing.Size(227, 507) Me.LayoutControlItem5.TextSize = New System.Drawing.Size(0, 0) Me.LayoutControlItem5.TextVisible = False ' @@ -530,7 +532,7 @@ Partial Public Class frmEnvelopeEditor Me.Root.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlGroup1}) Me.Root.Name = "Root" Me.Root.Padding = New DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0) - Me.Root.Size = New System.Drawing.Size(899, 259) + Me.Root.Size = New System.Drawing.Size(899, 285) Me.Root.TextVisible = False ' 'LayoutControlGroup1 @@ -539,7 +541,7 @@ Partial Public Class frmEnvelopeEditor Me.LayoutControlGroup1.Location = New System.Drawing.Point(0, 0) Me.LayoutControlGroup1.Name = "LayoutControlGroup1" Me.LayoutControlGroup1.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlGroup1.Size = New System.Drawing.Size(899, 259) + Me.LayoutControlGroup1.Size = New System.Drawing.Size(899, 285) resources.ApplyResources(Me.LayoutControlGroup1, "LayoutControlGroup1") ' 'LayoutControlItem1 @@ -559,7 +561,7 @@ Partial Public Class frmEnvelopeEditor Me.LayoutControlItem3.Location = New System.Drawing.Point(0, 56) Me.LayoutControlItem3.Name = "LayoutControlItem3" Me.LayoutControlItem3.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem3.Size = New System.Drawing.Size(873, 156) + Me.LayoutControlItem3.Size = New System.Drawing.Size(873, 182) resources.ApplyResources(Me.LayoutControlItem3, "LayoutControlItem3") Me.LayoutControlItem3.TextLocation = DevExpress.Utils.Locations.Top Me.LayoutControlItem3.TextSize = New System.Drawing.Size(45, 13) diff --git a/EnvelopeGenerator.Form/frmEnvelopeEditor.resx b/EnvelopeGenerator.Form/frmEnvelopeEditor.resx index 04c3200b..19d5a20c 100644 --- a/EnvelopeGenerator.Form/frmEnvelopeEditor.resx +++ b/EnvelopeGenerator.Form/frmEnvelopeEditor.resx @@ -123,7 +123,7 @@ - 0, 158 + 0, 132 14, 35 @@ -363,7 +363,7 @@ Start - 1164, 158 + 1164, 132 RibbonControl1 @@ -378,7 +378,7 @@ 1 - 223, 477 + 223, 503 0 @@ -405,7 +405,7 @@ Ihre Dokumente - 251, 526 + 251, 552 1 @@ -640,7 +640,7 @@ 23, 116 - 853, 120 + 853, 146 2 @@ -673,7 +673,7 @@ Ihre Nachricht - 899, 259 + 899, 285 0 @@ -703,7 +703,7 @@ 0, 0, 0, 0 - 903, 263 + 903, 289 1 @@ -736,7 +736,7 @@ 1 - 903, 526 + 903, 552 0 @@ -769,7 +769,7 @@ 1 - 1164, 526 + 1164, 552 1 diff --git a/EnvelopeGenerator.Form/frmEnvelopeEditor.vb b/EnvelopeGenerator.Form/frmEnvelopeEditor.vb index e918bccd..e4aa8a91 100644 --- a/EnvelopeGenerator.Form/frmEnvelopeEditor.vb +++ b/EnvelopeGenerator.Form/frmEnvelopeEditor.vb @@ -1,11 +1,10 @@ Imports System.ComponentModel Imports DevExpress.Utils.Drawing -Imports DevExpress.Utils.Svg Imports DevExpress.XtraEditors Imports DevExpress.XtraGrid Imports DevExpress.XtraGrid.Views.Grid -Imports DevExpress.XtraPrinting.Native Imports DevExpress.XtraSplashScreen +Imports DigitalData.Modules.Base Imports DigitalData.Modules.Logging Imports EnvelopeGenerator.Common Imports EnvelopeGenerator.Common.Constants @@ -386,7 +385,7 @@ Partial Public Class frmEnvelopeEditor Private Sub SetFormTitle(pTitle As String) Dim oFormTitle As String = State.DbConfig.ExternalProgramName + " - Umschlag-Editor" If String.IsNullOrEmpty(pTitle) = False Then - oFormTitle += " - " + Controller.Envelope.Title.Substring(0, 30) + oFormTitle += " - " + Controller.Envelope.Title.Truncate(30) End If Me.Text = oFormTitle diff --git a/EnvelopeGenerator.Form/frmFieldEditor.Designer.vb b/EnvelopeGenerator.Form/frmFieldEditor.Designer.vb index 17e9befc..dc508f23 100644 --- a/EnvelopeGenerator.Form/frmFieldEditor.Designer.vb +++ b/EnvelopeGenerator.Form/frmFieldEditor.Designer.vb @@ -26,6 +26,9 @@ Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmFieldEditor)) + Me.SplitContainerControl1 = New DevExpress.XtraEditors.SplitContainerControl() + Me.ThumbnailEx2 = New GdPicture14.ThumbnailEx() + Me.DocumentViewer1 = New DigitalData.Controls.DocumentViewer.DocumentViewer() Me.ribbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl() Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem() Me.btnSave = New DevExpress.XtraBars.BarButtonItem() @@ -40,7 +43,6 @@ Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RepositoryItemComboBox1 = New DevExpress.XtraEditors.Repository.RepositoryItemComboBox() Me.RepositoryItemLookUpEdit1 = New DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit() - Me.DocumentViewer1 = New DigitalData.Controls.DocumentViewer.DocumentViewer() Me.OpenFileDialog1 = New System.Windows.Forms.OpenFileDialog() Me.BarManager1 = New DevExpress.XtraBars.BarManager(Me.components) Me.barDockControlTop = New DevExpress.XtraBars.BarDockControl() @@ -48,22 +50,79 @@ Me.barDockControlLeft = New DevExpress.XtraBars.BarDockControl() Me.barDockControlRight = New DevExpress.XtraBars.BarDockControl() Me.SvgImageCollection1 = New DevExpress.Utils.SvgImageCollection(Me.components) - Me.SplitContainerControl1 = New DevExpress.XtraEditors.SplitContainerControl() - Me.ThumbnailEx2 = New GdPicture14.ThumbnailEx() - CType(Me.ribbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.PopupMenu1, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.RepositoryItemComboBox1, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.RepositoryItemLookUpEdit1, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.BarManager1, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.SvgImageCollection1, System.ComponentModel.ISupportInitialize).BeginInit() 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.Panel2.SuspendLayout() Me.SplitContainerControl1.SuspendLayout() + CType(Me.ribbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.PopupMenu1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.RepositoryItemComboBox1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.RepositoryItemLookUpEdit1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.BarManager1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.SvgImageCollection1, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' + 'SplitContainerControl1 + ' + Me.SplitContainerControl1.CollapsePanel = DevExpress.XtraEditors.SplitCollapsePanel.Panel1 + resources.ApplyResources(Me.SplitContainerControl1, "SplitContainerControl1") + Me.SplitContainerControl1.Name = "SplitContainerControl1" + ' + 'SplitContainerControl1.Panel1 + ' + Me.SplitContainerControl1.Panel1.Controls.Add(Me.ThumbnailEx2) + resources.ApplyResources(Me.SplitContainerControl1.Panel1, "SplitContainerControl1.Panel1") + ' + 'SplitContainerControl1.Panel2 + ' + Me.SplitContainerControl1.Panel2.Controls.Add(Me.DocumentViewer1) + resources.ApplyResources(Me.SplitContainerControl1.Panel2, "SplitContainerControl1.Panel2") + Me.SplitContainerControl1.SplitterPosition = 199 + ' + 'ThumbnailEx2 + ' + Me.ThumbnailEx2.AllowDropFiles = False + Me.ThumbnailEx2.AllowMoveItems = False + Me.ThumbnailEx2.BackColor = System.Drawing.SystemColors.Control + Me.ThumbnailEx2.CheckBoxes = False + Me.ThumbnailEx2.CheckBoxesMarginLeft = 0 + Me.ThumbnailEx2.CheckBoxesMarginTop = 0 + Me.ThumbnailEx2.DefaultItemCheckState = False + Me.ThumbnailEx2.DefaultItemTextPrefix = "" + Me.ThumbnailEx2.DisplayAnnotations = True + resources.ApplyResources(Me.ThumbnailEx2, "ThumbnailEx2") + Me.ThumbnailEx2.EnableDropShadow = True + Me.ThumbnailEx2.HorizontalTextAlignment = GdPicture14.TextAlignment.TextAlignmentCenter + Me.ThumbnailEx2.HotTracking = False + Me.ThumbnailEx2.LockGdViewerEvents = False + Me.ThumbnailEx2.MultiSelect = False + Me.ThumbnailEx2.Name = "ThumbnailEx2" + Me.ThumbnailEx2.OwnDrop = False + Me.ThumbnailEx2.PauseThumbsLoading = False + Me.ThumbnailEx2.PdfIncreaseTextContrast = False + Me.ThumbnailEx2.PreloadAllItems = True + Me.ThumbnailEx2.RotateExif = True + Me.ThumbnailEx2.SelectedThumbnailBackColor = System.Drawing.Color.FromArgb(CType(CType(38, Byte), Integer), CType(CType(160, Byte), Integer), CType(CType(218, Byte), Integer)) + Me.ThumbnailEx2.SelectedThumbnailBackColorAlpha = 100 + Me.ThumbnailEx2.ShowText = True + Me.ThumbnailEx2.TextMarginLeft = 0 + Me.ThumbnailEx2.TextMarginTop = 0 + Me.ThumbnailEx2.ThumbnailAlignment = GdPicture14.ThumbnailAlignment.ThumbnailAlignmentVertical + Me.ThumbnailEx2.ThumbnailBackColor = System.Drawing.Color.Transparent + Me.ThumbnailEx2.ThumbnailBorder = False + Me.ThumbnailEx2.ThumbnailForeColor = System.Drawing.Color.Black + Me.ThumbnailEx2.ThumbnailSize = New System.Drawing.Size(128, 128) + Me.ThumbnailEx2.ThumbnailSpacing = New System.Drawing.Size(0, 0) + Me.ThumbnailEx2.VerticalTextAlignment = GdPicture14.TextAlignment.TextAlignmentCenter + ' + 'DocumentViewer1 + ' + resources.ApplyResources(Me.DocumentViewer1, "DocumentViewer1") + Me.DocumentViewer1.FileLoaded = False + Me.DocumentViewer1.Name = "DocumentViewer1" + ' 'ribbonControl1 ' Me.ribbonControl1.ExpandCollapseItem.Id = 0 @@ -73,6 +132,8 @@ Me.ribbonControl1.Name = "ribbonControl1" Me.ribbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.ribbonPage1}) Me.ribbonControl1.RepositoryItems.AddRange(New DevExpress.XtraEditors.Repository.RepositoryItem() {Me.RepositoryItemComboBox1, Me.RepositoryItemLookUpEdit1}) + Me.ribbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] + Me.ribbonControl1.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.Hide ' 'BarButtonItem1 ' @@ -160,12 +221,6 @@ Me.RepositoryItemLookUpEdit1.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(CType(resources.GetObject("RepositoryItemLookUpEdit1.Buttons"), DevExpress.XtraEditors.Controls.ButtonPredefines))}) Me.RepositoryItemLookUpEdit1.Name = "RepositoryItemLookUpEdit1" ' - 'DocumentViewer1 - ' - resources.ApplyResources(Me.DocumentViewer1, "DocumentViewer1") - Me.DocumentViewer1.FileLoaded = False - Me.DocumentViewer1.Name = "DocumentViewer1" - ' 'OpenFileDialog1 ' Me.OpenFileDialog1.FileName = "OpenFileDialog1" @@ -208,59 +263,6 @@ Me.SvgImageCollection1.ImageColorizationMode = DevExpress.Utils.SvgImageColorizationMode.None Me.SvgImageCollection1.Add("appointmentnightclock", "image://svgimages/scheduling/appointmentnightclock.svg") ' - 'SplitContainerControl1 - ' - Me.SplitContainerControl1.CollapsePanel = DevExpress.XtraEditors.SplitCollapsePanel.Panel1 - resources.ApplyResources(Me.SplitContainerControl1, "SplitContainerControl1") - Me.SplitContainerControl1.Name = "SplitContainerControl1" - ' - 'SplitContainerControl1.Panel1 - ' - Me.SplitContainerControl1.Panel1.Controls.Add(Me.ThumbnailEx2) - resources.ApplyResources(Me.SplitContainerControl1.Panel1, "SplitContainerControl1.Panel1") - ' - 'SplitContainerControl1.Panel2 - ' - Me.SplitContainerControl1.Panel2.Controls.Add(Me.DocumentViewer1) - resources.ApplyResources(Me.SplitContainerControl1.Panel2, "SplitContainerControl1.Panel2") - Me.SplitContainerControl1.SplitterPosition = 199 - ' - 'ThumbnailEx2 - ' - Me.ThumbnailEx2.AllowDropFiles = False - Me.ThumbnailEx2.AllowMoveItems = False - Me.ThumbnailEx2.BackColor = System.Drawing.SystemColors.Control - Me.ThumbnailEx2.CheckBoxes = False - Me.ThumbnailEx2.CheckBoxesMarginLeft = 0 - Me.ThumbnailEx2.CheckBoxesMarginTop = 0 - Me.ThumbnailEx2.DefaultItemCheckState = False - Me.ThumbnailEx2.DefaultItemTextPrefix = "" - Me.ThumbnailEx2.DisplayAnnotations = True - resources.ApplyResources(Me.ThumbnailEx2, "ThumbnailEx2") - Me.ThumbnailEx2.EnableDropShadow = True - Me.ThumbnailEx2.HorizontalTextAlignment = GdPicture14.TextAlignment.TextAlignmentCenter - Me.ThumbnailEx2.HotTracking = False - Me.ThumbnailEx2.LockGdViewerEvents = False - Me.ThumbnailEx2.MultiSelect = False - Me.ThumbnailEx2.Name = "ThumbnailEx2" - Me.ThumbnailEx2.OwnDrop = False - Me.ThumbnailEx2.PauseThumbsLoading = False - Me.ThumbnailEx2.PdfIncreaseTextContrast = False - Me.ThumbnailEx2.PreloadAllItems = True - Me.ThumbnailEx2.RotateExif = True - Me.ThumbnailEx2.SelectedThumbnailBackColor = System.Drawing.Color.FromArgb(CType(CType(38, Byte), Integer), CType(CType(160, Byte), Integer), CType(CType(218, Byte), Integer)) - Me.ThumbnailEx2.SelectedThumbnailBackColorAlpha = 100 - Me.ThumbnailEx2.ShowText = True - Me.ThumbnailEx2.TextMarginLeft = 0 - Me.ThumbnailEx2.TextMarginTop = 0 - Me.ThumbnailEx2.ThumbnailAlignment = GdPicture14.ThumbnailAlignment.ThumbnailAlignmentVertical - Me.ThumbnailEx2.ThumbnailBackColor = System.Drawing.Color.Transparent - Me.ThumbnailEx2.ThumbnailBorder = False - Me.ThumbnailEx2.ThumbnailForeColor = System.Drawing.Color.Black - Me.ThumbnailEx2.ThumbnailSize = New System.Drawing.Size(128, 128) - Me.ThumbnailEx2.ThumbnailSpacing = New System.Drawing.Size(0, 0) - Me.ThumbnailEx2.VerticalTextAlignment = GdPicture14.TextAlignment.TextAlignmentCenter - ' 'frmFieldEditor ' resources.ApplyResources(Me, "$this") @@ -273,18 +275,18 @@ Me.Controls.Add(Me.barDockControlTop) Me.Name = "frmFieldEditor" Me.Ribbon = Me.ribbonControl1 - CType(Me.ribbonControl1, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.PopupMenu1, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.RepositoryItemComboBox1, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.RepositoryItemLookUpEdit1, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.BarManager1, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.SvgImageCollection1, 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() Me.SplitContainerControl1.Panel2.ResumeLayout(False) CType(Me.SplitContainerControl1, System.ComponentModel.ISupportInitialize).EndInit() Me.SplitContainerControl1.ResumeLayout(False) + CType(Me.ribbonControl1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.PopupMenu1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.RepositoryItemComboBox1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.RepositoryItemLookUpEdit1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.BarManager1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.SvgImageCollection1, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() diff --git a/EnvelopeGenerator.Form/frmFieldEditor.resx b/EnvelopeGenerator.Form/frmFieldEditor.resx index 8b09bb5e..d3c29d02 100644 --- a/EnvelopeGenerator.Form/frmFieldEditor.resx +++ b/EnvelopeGenerator.Form/frmFieldEditor.resx @@ -117,6 +117,111 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Fill + + + + 0, 132 + + + Fill + + + 0, 0 + + + 199, 526 + + + + 0 + + + ThumbnailEx2 + + + GdPicture14.ThumbnailEx, GdPicture.NET.14, Version=14.1.0.152, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb + + + SplitContainerControl1.Panel1 + + + 0 + + + Panel1 + + + SplitContainerControl1.Panel1 + + + DevExpress.XtraEditors.SplitGroupPanel, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + SplitContainerControl1 + + + 0 + + + Fill + + + 0, 0 + + + 916, 526 + + + 3 + + + DocumentViewer1 + + + DigitalData.Controls.DocumentViewer.DocumentViewer, DigitalData.Controls.DocumentViewer, Version=1.9.2.0, Culture=neutral, PublicKeyToken=null + + + SplitContainerControl1.Panel2 + + + 0 + + + Panel2 + + + SplitContainerControl1.Panel2 + + + DevExpress.XtraEditors.SplitGroupPanel, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + SplitContainerControl1 + + + 1 + + + 1125, 526 + + + 15 + + + SplitContainerControl1 + + + DevExpress.XtraEditors.SplitContainerControl, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + $this + + + 0 + Signatur hinzufügen @@ -221,7 +326,6 @@ Kein Empfänger ausgewählt - 0, 0 @@ -237,7 +341,6 @@ Start - False @@ -252,7 +355,7 @@ Combo - 1125, 158 + 1125, 132 ribbonControl1 @@ -266,31 +369,6 @@ 1 - - - Fill - - - 0, 0 - - - 916, 500 - - - 3 - - - DocumentViewer1 - - - DigitalData.Controls.DocumentViewer.DocumentViewer, DigitalData.Controls.DocumentViewer, Version=1.9.2.0, Culture=neutral, PublicKeyToken=null - - - SplitContainerControl1.Panel2 - - - 0 - 17, 17 @@ -393,84 +471,6 @@ 1125, 658 - - Fill - - - 0, 158 - - - Fill - - - 0, 0 - - - 199, 500 - - - 0 - - - ThumbnailEx2 - - - GdPicture14.ThumbnailEx, GdPicture.NET.14, Version=14.1.0.152, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb - - - 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 - - - 1125, 500 - - - 15 - - - SplitContainerControl1 - - - DevExpress.XtraEditors.SplitContainerControl, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - $this - - - 0 - Sign Flow - Signatur-Editor @@ -579,22 +579,4 @@ 409, 17 - - Fill - - - 0, 0 - - - 212, 381 - - - 0 - - - ThumbnailEx1 - - - GdPicture14.ThumbnailEx, GdPicture.NET.14, Version=14.1.0.152, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb - \ No newline at end of file diff --git a/EnvelopeGenerator.Form/frmMain.Designer.vb b/EnvelopeGenerator.Form/frmMain.Designer.vb index 928b907a..3714c90b 100644 --- a/EnvelopeGenerator.Form/frmMain.Designer.vb +++ b/EnvelopeGenerator.Form/frmMain.Designer.vb @@ -23,6 +23,7 @@ Partial Class frmMain 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() + Dim GridLevelNode3 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() @@ -32,6 +33,11 @@ Partial Class frmMain Me.ColName = New DevExpress.XtraGrid.Columns.GridColumn() Me.ColEmail = New DevExpress.XtraGrid.Columns.GridColumn() Me.ColSignedDate = New DevExpress.XtraGrid.Columns.GridColumn() + Me.ColStatusReceiver = New DevExpress.XtraGrid.Columns.GridColumn() + Me.ViewHistory = New DevExpress.XtraGrid.Views.Grid.GridView() + Me.ColHistoryStatus = New DevExpress.XtraGrid.Columns.GridColumn() + Me.ColHistoryUserReference = New DevExpress.XtraGrid.Columns.GridColumn() + Me.ColHistoryDate = New DevExpress.XtraGrid.Columns.GridColumn() Me.ViewEnvelopes = New DevExpress.XtraGrid.Views.Grid.GridView() Me.colContractType = New DevExpress.XtraGrid.Columns.GridColumn() Me.colStatus = New DevExpress.XtraGrid.Columns.GridColumn() @@ -42,8 +48,10 @@ Partial Class frmMain Me.btnCreateEnvelope = New DevExpress.XtraBars.BarButtonItem() Me.btnEditEnvelope = New DevExpress.XtraBars.BarButtonItem() Me.btnDeleteEnvelope = New DevExpress.XtraBars.BarButtonItem() + Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem() Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageEnvelopeActions = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonStatusBar = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() Me.XtraTabPage2 = New DevExpress.XtraTab.XtraTabPage() Me.GridCompleted = New DevExpress.XtraGrid.GridControl() @@ -68,6 +76,7 @@ Partial Class frmMain Me.XtraTabPage1.SuspendLayout() CType(Me.GridEnvelopes, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.ViewReceivers, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.ViewHistory, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.ViewEnvelopes, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.RibbonControl, System.ComponentModel.ISupportInitialize).BeginInit() Me.XtraTabPage2.SuspendLayout() @@ -82,6 +91,8 @@ Partial Class frmMain ' 'SplitContainerControl1 ' + Me.SplitContainerControl1.Collapsed = True + Me.SplitContainerControl1.CollapsePanel = DevExpress.XtraEditors.SplitCollapsePanel.Panel2 resources.ApplyResources(Me.SplitContainerControl1, "SplitContainerControl1") Me.SplitContainerControl1.Horizontal = False Me.SplitContainerControl1.Name = "SplitContainerControl1" @@ -114,18 +125,22 @@ Partial Class frmMain resources.ApplyResources(Me.GridEnvelopes, "GridEnvelopes") GridLevelNode1.LevelTemplate = Me.ViewReceivers GridLevelNode1.RelationName = "Receivers" - Me.GridEnvelopes.LevelTree.Nodes.AddRange(New DevExpress.XtraGrid.GridLevelNode() {GridLevelNode1}) + GridLevelNode2.LevelTemplate = Me.ViewHistory + GridLevelNode2.RelationName = "History" + Me.GridEnvelopes.LevelTree.Nodes.AddRange(New DevExpress.XtraGrid.GridLevelNode() {GridLevelNode1, GridLevelNode2}) Me.GridEnvelopes.MainView = Me.ViewEnvelopes Me.GridEnvelopes.MenuManager = Me.RibbonControl Me.GridEnvelopes.Name = "GridEnvelopes" Me.GridEnvelopes.ShowOnlyPredefinedDetails = True - Me.GridEnvelopes.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.ViewReceivers, Me.ViewEnvelopes}) + Me.GridEnvelopes.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.ViewReceivers, Me.ViewHistory, Me.ViewEnvelopes}) ' 'ViewReceivers ' - Me.ViewReceivers.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.ColReceiverStatus, Me.ColName, Me.ColEmail, Me.ColSignedDate}) + Me.ViewReceivers.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.ColReceiverStatus, Me.ColName, Me.ColEmail, Me.ColSignedDate, Me.ColStatusReceiver}) Me.ViewReceivers.GridControl = Me.GridEnvelopes Me.ViewReceivers.Name = "ViewReceivers" + Me.ViewReceivers.OptionsBehavior.Editable = False + Me.ViewReceivers.OptionsBehavior.ReadOnly = True Me.ViewReceivers.OptionsDetail.AllowZoomDetail = False Me.ViewReceivers.OptionsView.ShowDetailButtons = False Me.ViewReceivers.OptionsView.ShowGroupPanel = False @@ -160,6 +175,43 @@ Partial Class frmMain Me.ColSignedDate.Name = "ColSignedDate" Me.ColSignedDate.OptionsColumn.AllowEdit = False ' + 'ColStatusReceiver + ' + resources.ApplyResources(Me.ColStatusReceiver, "ColStatusReceiver") + Me.ColStatusReceiver.FieldName = "Status" + Me.ColStatusReceiver.Name = "ColStatusReceiver" + ' + 'ViewHistory + ' + Me.ViewHistory.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.ColHistoryStatus, Me.ColHistoryUserReference, Me.ColHistoryDate}) + Me.ViewHistory.GridControl = Me.GridEnvelopes + Me.ViewHistory.Name = "ViewHistory" + Me.ViewHistory.OptionsBehavior.Editable = False + Me.ViewHistory.OptionsBehavior.ReadOnly = True + Me.ViewHistory.OptionsView.ShowDetailButtons = False + Me.ViewHistory.OptionsView.ShowGroupPanel = False + Me.ViewHistory.OptionsView.ShowIndicator = False + ' + 'ColHistoryStatus + ' + resources.ApplyResources(Me.ColHistoryStatus, "ColHistoryStatus") + Me.ColHistoryStatus.FieldName = "StatusTranslated" + Me.ColHistoryStatus.Name = "ColHistoryStatus" + ' + 'ColHistoryUserReference + ' + resources.ApplyResources(Me.ColHistoryUserReference, "ColHistoryUserReference") + Me.ColHistoryUserReference.FieldName = "UserReference" + Me.ColHistoryUserReference.Name = "ColHistoryUserReference" + ' + 'ColHistoryDate + ' + resources.ApplyResources(Me.ColHistoryDate, "ColHistoryDate") + Me.ColHistoryDate.DisplayFormat.FormatString = "G" + Me.ColHistoryDate.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime + Me.ColHistoryDate.FieldName = "ActionDate" + Me.ColHistoryDate.Name = "ColHistoryDate" + ' 'ViewEnvelopes ' Me.ViewEnvelopes.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colContractType, Me.colStatus, Me.colTitle, Me.colSubject, Me.colAddedWhen}) @@ -199,12 +251,13 @@ 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.RibbonControl.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl.ExpandCollapseItem, Me.RibbonControl.SearchEditItem, Me.btnCreateEnvelope, Me.btnEditEnvelope, Me.btnDeleteEnvelope, Me.BarButtonItem1}) resources.ApplyResources(Me.RibbonControl, "RibbonControl") - Me.RibbonControl.MaxItemId = 5 + Me.RibbonControl.MaxItemId = 6 Me.RibbonControl.Name = "RibbonControl" Me.RibbonControl.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) Me.RibbonControl.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] + Me.RibbonControl.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.Hide Me.RibbonControl.StatusBar = Me.RibbonStatusBar ' 'btnCreateEnvelope @@ -228,9 +281,16 @@ Partial Class frmMain Me.btnDeleteEnvelope.ImageOptions.SvgImage = CType(resources.GetObject("btnDeleteEnvelope.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.btnDeleteEnvelope.Name = "btnDeleteEnvelope" ' + 'BarButtonItem1 + ' + resources.ApplyResources(Me.BarButtonItem1, "BarButtonItem1") + Me.BarButtonItem1.Id = 5 + Me.BarButtonItem1.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.BarButtonItem1.Name = "BarButtonItem1" + ' 'RibbonPage1 ' - Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageEnvelopeActions}) + Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageEnvelopeActions, Me.RibbonPageGroup1}) Me.RibbonPage1.Name = "RibbonPage1" resources.ApplyResources(Me.RibbonPage1, "RibbonPage1") ' @@ -242,6 +302,13 @@ Partial Class frmMain Me.RibbonPageEnvelopeActions.Name = "RibbonPageEnvelopeActions" resources.ApplyResources(Me.RibbonPageEnvelopeActions, "RibbonPageEnvelopeActions") ' + 'RibbonPageGroup1 + ' + Me.RibbonPageGroup1.Alignment = DevExpress.XtraBars.Ribbon.RibbonPageGroupAlignment.Far + Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem1) + Me.RibbonPageGroup1.Name = "RibbonPageGroup1" + resources.ApplyResources(Me.RibbonPageGroup1, "RibbonPageGroup1") + ' 'RibbonStatusBar ' resources.ApplyResources(Me.RibbonStatusBar, "RibbonStatusBar") @@ -257,9 +324,9 @@ 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}) + GridLevelNode3.LevelTemplate = Me.ViewReceiversCompleted + GridLevelNode3.RelationName = "Receivers" + Me.GridCompleted.LevelTree.Nodes.AddRange(New DevExpress.XtraGrid.GridLevelNode() {GridLevelNode3}) Me.GridCompleted.MainView = Me.ViewCompleted Me.GridCompleted.MenuManager = Me.RibbonControl Me.GridCompleted.Name = "GridCompleted" @@ -306,6 +373,7 @@ Partial Class frmMain 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.OptionsView.ShowIndicator = False ' 'GridColumn3 ' @@ -358,6 +426,7 @@ Partial Class frmMain Me.XtraTabPage1.ResumeLayout(False) CType(Me.GridEnvelopes, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.ViewReceivers, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.ViewHistory, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.ViewEnvelopes, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.RibbonControl, System.ComponentModel.ISupportInitialize).EndInit() Me.XtraTabPage2.ResumeLayout(False) @@ -404,4 +473,11 @@ Partial Class frmMain Friend WithEvents ColNameCompleted As DevExpress.XtraGrid.Columns.GridColumn Friend WithEvents ColEmailCompleted As DevExpress.XtraGrid.Columns.GridColumn Friend WithEvents ColSignedDateCompleted As DevExpress.XtraGrid.Columns.GridColumn + Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents RibbonPageGroup1 As DevExpress.XtraBars.Ribbon.RibbonPageGroup + Friend WithEvents ColStatusReceiver As DevExpress.XtraGrid.Columns.GridColumn + Friend WithEvents ViewHistory As DevExpress.XtraGrid.Views.Grid.GridView + Friend WithEvents ColHistoryDate As DevExpress.XtraGrid.Columns.GridColumn + Friend WithEvents ColHistoryUserReference As DevExpress.XtraGrid.Columns.GridColumn + Friend WithEvents ColHistoryStatus As DevExpress.XtraGrid.Columns.GridColumn End Class diff --git a/EnvelopeGenerator.Form/frmMain.resx b/EnvelopeGenerator.Form/frmMain.resx index 492b412c..af510348 100644 --- a/EnvelopeGenerator.Form/frmMain.resx +++ b/EnvelopeGenerator.Form/frmMain.resx @@ -123,7 +123,7 @@ - 0, 158 + 0, 132 Fill @@ -183,9 +183,39 @@ 134 + + Status + Empfänger + + Status + + + True + + + 0 + + + Benutzer + + + True + + + 1 + + + Datum + + + True + + + 2 + 0, 0 @@ -313,6 +343,27 @@ ICAgPHBhdGggZD0iTTI1LDZoLTdWNWMwLTAuNS0wLjUtMS0xLTFoLTJjLTAuNSwwLTEsMC41LTEsMXYx SDdDNi41LDYsNiw2LjUsNiw3djNoMjBWN0MyNiw2LjUsMjUuNSw2LDI1LDZ6IiBjbGFzcz0iQmxhY2si IC8+DQogIDwvZz4NCjwvc3ZnPgs= + + + + Daten Aktualisieren + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAFwCAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iUmVmcmVzaF9BbGxfUGl2b3RfVGFibGUiIHN0eWxlPSJlbmFibGUtYmFj + a2dyb3VuZDpuZXcgMCAwIDMyIDMyIj4NCiAgPHN0eWxlIHR5cGU9InRleHQvY3NzIj4KCS5HcmVlbntm + aWxsOiMwMzlDMjM7fQo8L3N0eWxlPg0KICA8cGF0aCBkPSJNMzAsMnYxMmgtMC4yaC00SDE4bDUtNWMt + MS44LTEuOC00LjMtMy03LTNjLTQuOCwwLTguOSwzLjQtOS44LDhoLTRDMy4xLDcuMiw4LjksMiwxNiwy + ICBjMy45LDAsNy40LDEuNiw5LjksNC4xTDMwLDJ6IE0xNiwyNmMtMi44LDAtNS4yLTEuMS03LTNsNS01 + SDYuMmgtNEgydjEybDQuMS00LjFjMi41LDIuNSw2LDQuMSw5LjksNC4xYzcuMSwwLDEyLjktNS4yLDEz + LjgtMTJoLTQgIEMyNC45LDIyLjYsMjAuOCwyNiwxNiwyNnoiIGNsYXNzPSJHcmVlbiIgLz4NCjwvc3Zn + Pgs= @@ -321,11 +372,14 @@ Funktionen + + Daten + Start - 1088, 158 + 1088, 132 0, 659 @@ -358,7 +412,7 @@ 2 - 1086, 415 + 1086, 494 2 @@ -376,7 +430,7 @@ 0 - 1086, 415 + 1086, 494 Offene Umschläge @@ -394,7 +448,7 @@ 0 - 1088, 272 + 1088, 517 3 @@ -583,7 +637,7 @@ 1 - 1088, 501 + 1088, 527 5 @@ -667,6 +721,36 @@ DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ColStatusReceiver + + + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + ViewHistory + + + DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + ColHistoryStatus + + + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + ColHistoryUserReference + + + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + ColHistoryDate + + + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ViewEnvelopes @@ -721,6 +805,12 @@ DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + BarButtonItem1 + + + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + RibbonPage1 @@ -733,6 +823,12 @@ DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + RibbonPageGroup1 + + + DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ViewReceiversCompleted diff --git a/EnvelopeGenerator.Form/frmMain.vb b/EnvelopeGenerator.Form/frmMain.vb index cd827fd6..ddabd065 100644 --- a/EnvelopeGenerator.Form/frmMain.vb +++ b/EnvelopeGenerator.Form/frmMain.vb @@ -9,6 +9,7 @@ Imports DigitalData.Modules.Logging Imports EnvelopeGenerator.Common Imports EnvelopeGenerator.Common.My Imports DevExpress.Charts.Native +Imports DevExpress.XtraGrid.Views.Grid Public Class frmMain Private LogConfig As LogConfig @@ -70,10 +71,7 @@ Public Class frmMain Controller = New EnvelopeListController(State) - LoadEnvelopes() - LoadCompletedEnvelopes() - - LoadCharts() + LoadEnvelopeData() Catch ex As Exception Logger.Error(ex) @@ -81,6 +79,14 @@ Public Class frmMain End Sub + Private Sub LoadEnvelopeData() + LoadEnvelopes() + LoadCompletedEnvelopes() + + 'LoadCharts() + End Sub + + Private Sub LoadEnvelopes() GridBuilder = New GridBuilder(ViewEnvelopes) GridBuilder.SetDefaults(ViewEnvelopes) @@ -107,7 +113,7 @@ Public Class frmMain Try Dim oForm As New frmEnvelopeEditor() With {.State = State} oForm.ShowDialog() - GridEnvelopes.DataSource = Controller.ListEnvelopes() + LoadEnvelopeData() Catch ex As Exception Logger.Error(ex) @@ -127,9 +133,14 @@ Public Class frmMain Dim oHandle = SplashScreenManager.ShowOverlayForm(Me) Try Dim oEnvelope As Envelope = DirectCast(ViewEnvelopes.GetRow(pRowHandle), Envelope) + + If oEnvelope.IsAlreadySent Then + Exit Sub + End If + Dim oForm As New frmEnvelopeEditor() With {.State = State, .Envelope = oEnvelope} oForm.ShowDialog() - GridEnvelopes.DataSource = Controller.ListEnvelopes() + LoadEnvelopeData() Catch ex As Exception Logger.Error(ex) @@ -146,7 +157,7 @@ Public Class frmMain End If If Controller.DeleteEnvelope(oEnvelope) Then - GridEnvelopes.DataSource = Controller.ListEnvelopes() + LoadEnvelopeData() Else MsgBox(Resources.Envelope.The_envelope_could_not_be_deleted, MsgBoxStyle.Critical, Text) End If @@ -174,9 +185,75 @@ Public Class frmMain Private Sub XtraTabControl1_SelectedPageChanged(sender As Object, e As DevExpress.XtraTab.TabPageChangedEventArgs) Handles XtraTabControl1.SelectedPageChanged Select Case XtraTabControl1.SelectedTabPageIndex Case 1 - RibbonPageEnvelopeActions.Enabled = False + btnEditEnvelope.Enabled = False Case 0 - RibbonPageEnvelopeActions.Enabled = True + btnEditEnvelope.Enabled = True End Select End Sub + + Private Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem1.ItemClick + LoadEnvelopeData() + End Sub + + Private Sub ViewEnvelopes_FocusedRowChanged(sender As Object, e As DevExpress.XtraGrid.Views.Base.FocusedRowChangedEventArgs) Handles ViewEnvelopes.FocusedRowChanged + Dim oEnvelope As Envelope = ViewEnvelopes.GetRow(ViewEnvelopes.FocusedRowHandle) + + If oEnvelope.IsAlreadySent Then + btnEditEnvelope.Enabled = False + Else + btnEditEnvelope.Enabled = True + End If + End Sub + + Private Sub ViewEnvelopes_CustomDrawCell(sender As Object, e As DevExpress.XtraGrid.Views.Base.RowCellCustomDrawEventArgs) Handles ViewEnvelopes.CustomDrawCell + If e.RowHandle < 0 Then + Exit Sub + End If + + Dim oEnvelope As Envelope = ViewEnvelopes.GetRow(e.RowHandle) + If oEnvelope.Status = Common.Constants.EnvelopeStatus.EnvelopePartlySigned Then + e.Appearance.BackColor = Color.LightGreen + End If + + If oEnvelope.Status = Common.Constants.EnvelopeStatus.EnvelopeQueued Or oEnvelope.Status = Common.Constants.EnvelopeStatus.EnvelopeSent Then + e.Appearance.BackColor = Color.LightGoldenrodYellow + End If + End Sub + + Private Sub ViewReceivers_CustomDrawCell(sender As Object, e As DevExpress.XtraGrid.Views.Base.RowCellCustomDrawEventArgs) Handles ViewReceivers.CustomDrawCell + 'If e.RowHandle < 0 Then + ' Exit Sub + 'End If + + 'Dim oDetailView As GridView = ViewEnvelopes.GetDetailView(ViewEnvelopes.FocusedRowHandle, 0) + 'Dim oRow = oDetailView.GetDataRow(e.RowHandle) + + + 'Dim oReceiver As EnvelopeReceiver = ViewReceivers.GetRow(e.RowHandle) + + 'If e.Column.FieldName = "Status" Then + + ' e.Appearance.BackColor = Color.LightSalmon + 'End If + + 'Dim oReceiver As EnvelopeReceiver = ViewReceivers.GetRow(e.RowHandle) + + 'If (oReceiver Is Nothing) Then + ' Exit Sub + 'End If + + 'If oReceiver.Status = Common.Constants.ReceiverStatus.Signed Then + ' e.Appearance.BackColor = Color.LightGreen + 'Else + ' e.Appearance.BackColor = Color.LightSalmon + 'End If + End Sub + + Private Sub GridEnvelopes_ViewRegistered(sender As Object, e As DevExpress.XtraGrid.ViewOperationEventArgs) Handles GridEnvelopes.ViewRegistered + If (e.View.IsDetailView = False) Then + Exit Sub + End If + + AddHandler DirectCast(e.View, GridView).CustomDrawCell, AddressOf ViewReceivers_CustomDrawCell + End Sub End Class \ No newline at end of file