From d7b3cae21893a1e1ca4936863e31a38dfe2b5dce Mon Sep 17 00:00:00 2001 From: MPitz Date: Mon, 25 Sep 2023 14:27:47 +0200 Subject: [PATCH] 2023-09-25 --- .../Entities/EmailData.vb | 1 + .../Entities/EmailTemplate.vb | 2 +- .../Models/ElementModel.vb | 20 + EnvelopeGenerator.Common/Models/EmailModel.vb | 10 +- .../Strings/Envelope.en.resx | 3 + .../Strings/Envelope.resx | 5 +- .../Strings/Envelope1.Designer.vb | 11 +- .../Controllers/EnvelopeEditorController.vb | 11 + .../EnvelopeGenerator.Form.vbproj | 1 + EnvelopeGenerator.Form/frmEnvelopeEditor.vb | 9 +- EnvelopeGenerator.Form/frmEnvelopeMainData.vb | 5 +- .../frmFieldEditor.Designer.vb | 32 +- EnvelopeGenerator.Form/frmFieldEditor.resx | 580 ++++++++---------- EnvelopeGenerator.Form/frmFieldEditor.vb | 7 +- 14 files changed, 342 insertions(+), 355 deletions(-) diff --git a/EnvelopeGenerator.Common/Entities/EmailData.vb b/EnvelopeGenerator.Common/Entities/EmailData.vb index 7603d7f8..9d7b5dec 100644 --- a/EnvelopeGenerator.Common/Entities/EmailData.vb +++ b/EnvelopeGenerator.Common/Entities/EmailData.vb @@ -3,6 +3,7 @@ Public Property EmailSubject As String Public Property EmailBody As String Public Property ReferenceID As Integer + Public Property ReferenceString As String Public Property ReceiverName As String diff --git a/EnvelopeGenerator.Common/Entities/EmailTemplate.vb b/EnvelopeGenerator.Common/Entities/EmailTemplate.vb index 9caa4591..d12b5e15 100644 --- a/EnvelopeGenerator.Common/Entities/EmailTemplate.vb +++ b/EnvelopeGenerator.Common/Entities/EmailTemplate.vb @@ -30,7 +30,7 @@ _replaceDictionary = New Dictionary(Of String, String) From { {"", pEmailData.ReceiverName}, {"", pEmailData.SenderName}, - {"", ""}, + {"", "signieren"}, {"", pEmailData.SignatureLink}, {"", pEmailData.Message} } diff --git a/EnvelopeGenerator.Common/Models/ElementModel.vb b/EnvelopeGenerator.Common/Models/ElementModel.vb index e9b475c2..9c1e287b 100644 --- a/EnvelopeGenerator.Common/Models/ElementModel.vb +++ b/EnvelopeGenerator.Common/Models/ElementModel.vb @@ -44,6 +44,26 @@ Public Class ElementModel End Try End Function + Public Function OneElementPerReceiverExist(pEnvelopeId As Integer) As Boolean + Try + Dim oSql = "SELECT COUNT(*) FROM (" + oSql += " SELECT DISTINCT RECEIVER_ID FROM [dbo].[TBSIG_DOCUMENT_RECEIVER_ELEMENT] T" + oSql += " JOIN TBSIG_ENVELOPE_DOCUMENT T2 ON T.DOCUMENT_ID = T2.GUID" + oSql += $" WHERE T2.ENVELOPE_ID = {pEnvelopeId}" + oSql += " ) TMAX" + Dim oElementReceiverCount As Integer = Database.GetScalarValue(oSql) + + Dim oSql2 = $"SELECT COUNT(*) FROM TBSIG_ENVELOPE_RECEIVER WHERE ENVELOPE_ID = {pEnvelopeId}" + Dim oEnvelopeReceiverCount As Integer = Database.GetScalarValue(oSql2) + + Return oElementReceiverCount = oEnvelopeReceiverCount + + Catch ex As Exception + Logger.Error(ex) + Return False + End Try + End Function + Public Function ElementsExist(pEnvelopeId As Integer) As Boolean Try Dim oSql = $"SELECT COUNT(*) FROM [dbo].[TBSIG_DOCUMENT_RECEIVER_ELEMENT] T diff --git a/EnvelopeGenerator.Common/Models/EmailModel.vb b/EnvelopeGenerator.Common/Models/EmailModel.vb index 15481bae..2ecf7550 100644 --- a/EnvelopeGenerator.Common/Models/EmailModel.vb +++ b/EnvelopeGenerator.Common/Models/EmailModel.vb @@ -11,15 +11,19 @@ Public Class EmailModel Public Function Insert(pEmail As EmailData) As Boolean Try - Dim oSql = "INSERT INTO [dbo].[TBEMLP_EMAIL_OUT] (EMAIL_ADRESS, EMAIL_SUBJ, EMAIL_BODY, ADDED_WHO, SENDING_PROFILE, REFERENCE_ID) " - oSql += " VALUES (@EMAIL_ADRESS, @EMAIL_SUBJ, @EMAIL_BODY, @ADDED_WHO, @SENDING_PROFILE, @REFERENCE_ID)" + Dim oSql = "INSERT INTO [dbo].[TBEMLP_EMAIL_OUT] " + oSql += " (EMAIL_ADRESS, EMAIL_SUBJ, EMAIL_BODY, ADDED_WHO, SENDING_PROFILE, REFERENCE_ID, REFERENCE_STRING, REMINDER_TYPE_ID, WF_ID) " + oSql += " VALUES (@EMAIL_ADRESS, @EMAIL_SUBJ, @EMAIL_BODY, @ADDED_WHO, @SENDING_PROFILE, @REFERENCE_ID, @REFERENCE_STRING, @REMINDER_TYPE_ID, @WF_ID)" Dim oCommand As New SqlCommand(oSql) oCommand.Parameters.Add("EMAIL_ADRESS", SqlDbType.NVarChar).Value = pEmail.EmailAdress oCommand.Parameters.Add("EMAIL_SUBJ", SqlDbType.NVarChar).Value = pEmail.EmailSubject oCommand.Parameters.Add("EMAIL_BODY", SqlDbType.NVarChar).Value = pEmail.EmailBody - oCommand.Parameters.Add("ADDED_WHO", SqlDbType.NVarChar).Value = "Envelop Generator" + oCommand.Parameters.Add("ADDED_WHO", SqlDbType.NVarChar).Value = "DDEnvelopGenerator" oCommand.Parameters.Add("SENDING_PROFILE", SqlDbType.Int).Value = State.DbConfig.SendingProfile oCommand.Parameters.Add("REFERENCE_ID", SqlDbType.Int).Value = pEmail.ReferenceID + oCommand.Parameters.Add("REFERENCE_STRING", SqlDbType.NVarChar).Value = pEmail.ReferenceString + oCommand.Parameters.Add("REMINDER_TYPE_ID", SqlDbType.Int).Value = 77 + oCommand.Parameters.Add("WF_ID", SqlDbType.Int).Value = 77 If Database.ExecuteNonQuery(oCommand) Then Return True diff --git a/EnvelopeGenerator.Common/Strings/Envelope.en.resx b/EnvelopeGenerator.Common/Strings/Envelope.en.resx index 0e3831fb..2baf6e4d 100644 --- a/EnvelopeGenerator.Common/Strings/Envelope.en.resx +++ b/EnvelopeGenerator.Common/Strings/Envelope.en.resx @@ -156,6 +156,9 @@ Missing at least one Element + + For Receiver {0} you need at least one Element + Missing Message diff --git a/EnvelopeGenerator.Common/Strings/Envelope.resx b/EnvelopeGenerator.Common/Strings/Envelope.resx index dfc74162..032ddbad 100644 --- a/EnvelopeGenerator.Common/Strings/Envelope.resx +++ b/EnvelopeGenerator.Common/Strings/Envelope.resx @@ -154,7 +154,10 @@ Missing Documents - Missing at least one Element + Es muss mindestens ein Signaturfeld gesetzt werden + + + Für den Empfänger {0} gibt es noch kein Signaturfeld Missing Message diff --git a/EnvelopeGenerator.Common/Strings/Envelope1.Designer.vb b/EnvelopeGenerator.Common/Strings/Envelope1.Designer.vb index 6eb6244b..07008ae5 100644 --- a/EnvelopeGenerator.Common/Strings/Envelope1.Designer.vb +++ b/EnvelopeGenerator.Common/Strings/Envelope1.Designer.vb @@ -173,7 +173,7 @@ Namespace My.Resources End Property ''' - ''' Sucht eine lokalisierte Zeichenfolge, die Missing at least one Element ähnelt. + ''' Sucht eine lokalisierte Zeichenfolge, die Es muss mindestens ein Signaturfeld gesetzt werden ähnelt. ''' Public Shared ReadOnly Property Missing_Elements() As String Get @@ -181,6 +181,15 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Zeichenfolge, die Für den Empfänger {0} gibt es noch kein Signaturfeld ähnelt. + ''' + Public Shared ReadOnly Property Missing_Elements_for_Receiver() As String + Get + Return ResourceManager.GetString("Missing Elements for Receiver", resourceCulture) + End Get + End Property + ''' ''' Sucht eine lokalisierte Zeichenfolge, die Missing Message ähnelt. ''' diff --git a/EnvelopeGenerator.Form/Controllers/EnvelopeEditorController.vb b/EnvelopeGenerator.Form/Controllers/EnvelopeEditorController.vb index 42834390..11768ae1 100644 --- a/EnvelopeGenerator.Form/Controllers/EnvelopeEditorController.vb +++ b/EnvelopeGenerator.Form/Controllers/EnvelopeEditorController.vb @@ -41,6 +41,7 @@ Public Class EnvelopeEditorController .EmailSubject = Envelope.Subject, .Message = Envelope.Message, .ReferenceID = Envelope.Id, + .ReferenceString = Envelope.Uuid, .ReceiverName = receiverItem.Name, .SenderAdress = Envelope.User.Email, .SenderName = Envelope.User.FullName, @@ -75,6 +76,16 @@ Public Class EnvelopeEditorController oEnvelopeErrors.Add(Resources.Envelope.Missing_Elements) End If + If ElementModel.OneElementPerReceiverExist(Envelope.Id) = False Then + + For Each receiverItem As EnvelopeReceiver In Envelope.Receivers + If ElementModel.ElementsExist(Envelope.Id, receiverItem.Id) = False Then + oEnvelopeErrors.Add(String.Format(Resources.Envelope.Missing_Elements_for_Receiver, receiverItem.Name)) + End If + Next + + End If + Return oEnvelopeErrors End Function diff --git a/EnvelopeGenerator.Form/EnvelopeGenerator.Form.vbproj b/EnvelopeGenerator.Form/EnvelopeGenerator.Form.vbproj index 9503e914..8e743078 100644 --- a/EnvelopeGenerator.Form/EnvelopeGenerator.Form.vbproj +++ b/EnvelopeGenerator.Form/EnvelopeGenerator.Form.vbproj @@ -162,6 +162,7 @@ frmFieldEditor.vb + Designer frmMain.vb diff --git a/EnvelopeGenerator.Form/frmEnvelopeEditor.vb b/EnvelopeGenerator.Form/frmEnvelopeEditor.vb index ad1be2ef..30e7d154 100644 --- a/EnvelopeGenerator.Form/frmEnvelopeEditor.vb +++ b/EnvelopeGenerator.Form/frmEnvelopeEditor.vb @@ -61,7 +61,8 @@ Partial Public Class frmEnvelopeEditor Next If Envelope.Status = Constants.EnvelopeStatus.Sent Then - SetFormReadonly() + ' TODO - Nach Testen + ' SetFormReadonly() End If End If @@ -223,7 +224,11 @@ Partial Public Class frmEnvelopeEditor .EnvelopeTitle = Controller.Envelope.Title, .EnvelopeContractType = Controller.Envelope.ContractType } - oForm.ShowDialog() + If oForm.ShowDialog() = DialogResult.OK Then + Controller.Envelope.Title = oForm.EnvelopeTitle + Controller.Envelope.ContractType = oForm.EnvelopeContractType + + End If End Sub Private Sub GridReceivers_PaintEx(sender As Object, e As DevExpress.XtraGrid.PaintExEventArgs) Handles GridReceivers.PaintEx diff --git a/EnvelopeGenerator.Form/frmEnvelopeMainData.vb b/EnvelopeGenerator.Form/frmEnvelopeMainData.vb index ae155e54..39221392 100644 --- a/EnvelopeGenerator.Form/frmEnvelopeMainData.vb +++ b/EnvelopeGenerator.Form/frmEnvelopeMainData.vb @@ -1,7 +1,4 @@ -Imports System.Runtime.CompilerServices -Imports DevExpress.XtraDashboardLayout -Imports DigitalData.Controls.DocumentViewer -Imports EnvelopeGenerator.Common +Imports EnvelopeGenerator.Common Imports EnvelopeGenerator.Common.Constants Public Class frmEnvelopeMainData diff --git a/EnvelopeGenerator.Form/frmFieldEditor.Designer.vb b/EnvelopeGenerator.Form/frmFieldEditor.Designer.vb index ae50ab7f..38fc4a73 100644 --- a/EnvelopeGenerator.Form/frmFieldEditor.Designer.vb +++ b/EnvelopeGenerator.Form/frmFieldEditor.Designer.vb @@ -56,14 +56,10 @@ ' 'ribbonControl1 ' - resources.ApplyResources(Me.ribbonControl1, "ribbonControl1") Me.ribbonControl1.ExpandCollapseItem.Id = 0 - Me.ribbonControl1.ExpandCollapseItem.ImageOptions.ImageIndex = CType(resources.GetObject("ribbonControl1.ExpandCollapseItem.ImageOptions.ImageIndex"), Integer) - Me.ribbonControl1.ExpandCollapseItem.ImageOptions.LargeImageIndex = CType(resources.GetObject("ribbonControl1.ExpandCollapseItem.ImageOptions.LargeImageIndex"), Integer) - Me.ribbonControl1.ExpandCollapseItem.ImageOptions.SvgImage = CType(resources.GetObject("ribbonControl1.ExpandCollapseItem.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) - Me.ribbonControl1.ExpandCollapseItem.SearchTags = resources.GetString("ribbonControl1.ExpandCollapseItem.SearchTags") Me.ribbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.ribbonControl1.ExpandCollapseItem, Me.ribbonControl1.SearchEditItem, Me.BarButtonItem1, Me.btnSave, Me.btnDelete, Me.BarListItem1, Me.BarButtonItem2, Me.txtReceiver}) - Me.ribbonControl1.MaxItemId = 14 + resources.ApplyResources(Me.ribbonControl1, "ribbonControl1") + Me.ribbonControl1.MaxItemId = 16 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}) @@ -72,8 +68,6 @@ ' resources.ApplyResources(Me.BarButtonItem1, "BarButtonItem1") Me.BarButtonItem1.Id = 1 - Me.BarButtonItem1.ImageOptions.ImageIndex = CType(resources.GetObject("BarButtonItem1.ImageOptions.ImageIndex"), Integer) - Me.BarButtonItem1.ImageOptions.LargeImageIndex = CType(resources.GetObject("BarButtonItem1.ImageOptions.LargeImageIndex"), Integer) Me.BarButtonItem1.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.BarButtonItem1.Name = "BarButtonItem1" ' @@ -81,8 +75,6 @@ ' resources.ApplyResources(Me.btnSave, "btnSave") Me.btnSave.Id = 4 - Me.btnSave.ImageOptions.ImageIndex = CType(resources.GetObject("btnSave.ImageOptions.ImageIndex"), Integer) - Me.btnSave.ImageOptions.LargeImageIndex = CType(resources.GetObject("btnSave.ImageOptions.LargeImageIndex"), Integer) Me.btnSave.ImageOptions.SvgImage = CType(resources.GetObject("btnSave.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.btnSave.Name = "btnSave" ' @@ -90,8 +82,6 @@ ' resources.ApplyResources(Me.btnDelete, "btnDelete") Me.btnDelete.Id = 6 - Me.btnDelete.ImageOptions.ImageIndex = CType(resources.GetObject("btnDelete.ImageOptions.ImageIndex"), Integer) - Me.btnDelete.ImageOptions.LargeImageIndex = CType(resources.GetObject("btnDelete.ImageOptions.LargeImageIndex"), Integer) Me.btnDelete.ImageOptions.SvgImage = CType(resources.GetObject("btnDelete.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.btnDelete.Name = "btnDelete" ' @@ -99,19 +89,14 @@ ' resources.ApplyResources(Me.BarListItem1, "BarListItem1") Me.BarListItem1.Id = 9 - Me.BarListItem1.ImageOptions.ImageIndex = CType(resources.GetObject("BarListItem1.ImageOptions.ImageIndex"), Integer) - Me.BarListItem1.ImageOptions.LargeImageIndex = CType(resources.GetObject("BarListItem1.ImageOptions.LargeImageIndex"), Integer) - Me.BarListItem1.ImageOptions.SvgImage = CType(resources.GetObject("BarListItem1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.BarListItem1.Name = "BarListItem1" ' 'BarButtonItem2 ' - resources.ApplyResources(Me.BarButtonItem2, "BarButtonItem2") Me.BarButtonItem2.ButtonStyle = DevExpress.XtraBars.BarButtonStyle.DropDown + resources.ApplyResources(Me.BarButtonItem2, "BarButtonItem2") Me.BarButtonItem2.DropDownControl = Me.PopupMenu1 Me.BarButtonItem2.Id = 11 - Me.BarButtonItem2.ImageOptions.ImageIndex = CType(resources.GetObject("BarButtonItem2.ImageOptions.ImageIndex"), Integer) - Me.BarButtonItem2.ImageOptions.LargeImageIndex = CType(resources.GetObject("BarButtonItem2.ImageOptions.LargeImageIndex"), Integer) Me.BarButtonItem2.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem2.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.BarButtonItem2.Name = "BarButtonItem2" ' @@ -124,9 +109,6 @@ ' resources.ApplyResources(Me.txtReceiver, "txtReceiver") Me.txtReceiver.Id = 13 - Me.txtReceiver.ImageOptions.ImageIndex = CType(resources.GetObject("txtReceiver.ImageOptions.ImageIndex"), Integer) - Me.txtReceiver.ImageOptions.LargeImageIndex = CType(resources.GetObject("txtReceiver.ImageOptions.LargeImageIndex"), Integer) - Me.txtReceiver.ImageOptions.SvgImage = CType(resources.GetObject("txtReceiver.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.txtReceiver.Name = "txtReceiver" ' 'ribbonPage1 @@ -188,26 +170,26 @@ ' 'barDockControlTop ' - resources.ApplyResources(Me.barDockControlTop, "barDockControlTop") Me.barDockControlTop.CausesValidation = False + resources.ApplyResources(Me.barDockControlTop, "barDockControlTop") Me.barDockControlTop.Manager = Me.BarManager1 ' 'barDockControlBottom ' - resources.ApplyResources(Me.barDockControlBottom, "barDockControlBottom") Me.barDockControlBottom.CausesValidation = False + resources.ApplyResources(Me.barDockControlBottom, "barDockControlBottom") Me.barDockControlBottom.Manager = Me.BarManager1 ' 'barDockControlLeft ' - resources.ApplyResources(Me.barDockControlLeft, "barDockControlLeft") Me.barDockControlLeft.CausesValidation = False + resources.ApplyResources(Me.barDockControlLeft, "barDockControlLeft") Me.barDockControlLeft.Manager = Me.BarManager1 ' 'barDockControlRight ' - resources.ApplyResources(Me.barDockControlRight, "barDockControlRight") Me.barDockControlRight.CausesValidation = False + resources.ApplyResources(Me.barDockControlRight, "barDockControlRight") Me.barDockControlRight.Manager = Me.BarManager1 ' 'frmFieldEditor diff --git a/EnvelopeGenerator.Form/frmFieldEditor.resx b/EnvelopeGenerator.Form/frmFieldEditor.resx index c7483a64..ff369e2c 100644 --- a/EnvelopeGenerator.Form/frmFieldEditor.resx +++ b/EnvelopeGenerator.Form/frmFieldEditor.resx @@ -117,233 +117,32 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - RibbonPageGroup3 - - - - -1 - - - - 0, 158 - - - Signatur entfernen - - - DevExpress.XtraBars.Ribbon.RibbonForm, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - - - - - 0, 0 - - - -1 - - - ribbonPageGroup1 - - - barDockControlBottom - - - Signaturen - - - barDockControlLeft - - - PopupMenu1 - - - OpenFileDialog1 - - - 5 - - - 3 - - - False - - - -1 - - - 0, 658 - - - DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - -1 - - - -1 - - - -1 - - - $this - - - 1125, 0 - - - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - -1 - - - 0, 658 - - - -1 - - - DevExpress.XtraBars.BarDockControl, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - DevExpress.XtraBars.Ribbon.RibbonPage, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - Right - - - $this - - - barDockControlTop - - - Top - - - DocumentViewer1 - - - Start - - - -1 - - - ribbonPage1 - - - Left - - - 4 - - - $this - - - 1125, 0 - - - - Combo - - - BarListItem1 - - - RepositoryItemLookUpEdit1 - - - barDockControlRight - - - 1125, 500 - - - RibbonPageGroup2 - - - Sign Flow - Signatur-Editor + + Signatur hinzufügen - + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl - dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAD0DAAAC77u/ + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAANACAAAC77u/ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh - Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg - MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJs - YWNre2ZpbGw6IzcyNzI3Mjt9CgkuQmx1ZXtmaWxsOiMxMTc3RDc7fQoJLkdyZWVue2ZpbGw6IzAzOUMy - Mzt9CgkuWWVsbG93e2ZpbGw6I0ZGQjExNTt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh - Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQo8L3N0eWxlPg0KICA8ZyBpZD0iRGVsZXRlIj4N - CiAgICA8Zz4NCiAgICAgIDxwYXRoIGQ9Ik0xOC44LDE2bDYuOS02LjljMC40LTAuNCwwLjQtMSwwLTEu - NGwtMS40LTEuNGMtMC40LTAuNC0xLTAuNC0xLjQsMEwxNiwxMy4yTDkuMSw2LjNjLTAuNC0wLjQtMS0w - LjQtMS40LDAgICAgTDYuMyw3LjdjLTAuNCwwLjQtMC40LDEsMCwxLjRsNi45LDYuOWwtNi45LDYuOWMt - MC40LDAuNC0wLjQsMSwwLDEuNGwxLjQsMS40YzAuNCwwLjQsMSwwLjQsMS40LDBsNi45LTYuOWw2Ljks - Ni45ICAgIGMwLjQsMC40LDEsMC40LDEuNCwwbDEuNC0xLjRjMC40LTAuNCwwLjQtMSwwLTEuNEwxOC44 - LDE2eiIgY2xhc3M9IlJlZCIgLz4NCiAgICA8L2c+DQogIDwvZz4NCjwvc3ZnPgs= + Y2U9InByZXNlcnZlIiBpZD0iTGluZV9Db2xvciIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAw + IDAgMzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9 + CgkuQmx1ZXtmaWxsOiMxMTc3RDc7fQoJLnN0MHtmaWxsOm5vbmU7fQoJLnN0MXtvcGFjaXR5OjAuMjU7 + fQo8L3N0eWxlPg0KICA8cGF0aCBkPSJNMTcsMTFMNywyMWwtNC00TDEzLDdMMTcsMTF6IE0xOCwxMGwx + LjctMS43YzAuNC0wLjQsMC40LTEsMC0xLjNMMTcsNC4zYy0wLjQtMC40LTEtMC40LTEuMywwTDE0LDZM + MTgsMTB6ICAgTTIsMTh2NGg0TDIsMTh6IiBjbGFzcz0iQmx1ZSIgLz4NCiAgPHJlY3QgeD0iMCIgeT0i + MjQiIHdpZHRoPSIzMiIgaGVpZ2h0PSI4IiByeD0iMCIgcnk9IjAiIGlkPSJJbmRpY2F0b3IiIGNsYXNz + PSJzdDAiIC8+DQogIDxnIGNsYXNzPSJzdDEiPg0KICAgIDxwYXRoIGQ9Ik0wLDIzLjlWMzJoMzJ2LTgu + MUgweiBNMzAsMzBIMnYtNGgyOFYzMHoiIGNsYXNzPSJCbGFjayIgLz4NCiAgPC9nPg0KPC9zdmc+Cw== - - 0, 0 - - - 0, 0 - Speichern - - 1125, 158 - - - BarButtonItem1 - - - - - - 0, 658 - - - $this - - - DevExpress.XtraBars.BarDockControl, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - 1 - - - $this - - - -1 - - - Empfänger - - - 1125, 658 - - - DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 @@ -363,49 +162,39 @@ TTE0LDEwaC0yVjZoMlYxMHoiIGNsYXNzPSJCbGFjayIgLz4NCjwvc3ZnPgs= - - -1 - - - btnSave - - - 6, 13 - - - DevExpress.XtraBars.BarDockControl, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + Signatur entfernen - + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl - dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAANACAAAC77u/ + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAD0DAAAC77u/ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh - Y2U9InByZXNlcnZlIiBpZD0iTGluZV9Db2xvciIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAw - IDAgMzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9 - CgkuQmx1ZXtmaWxsOiMxMTc3RDc7fQoJLnN0MHtmaWxsOm5vbmU7fQoJLnN0MXtvcGFjaXR5OjAuMjU7 - fQo8L3N0eWxlPg0KICA8cGF0aCBkPSJNMTcsMTFMNywyMWwtNC00TDEzLDdMMTcsMTF6IE0xOCwxMGwx - LjctMS43YzAuNC0wLjQsMC40LTEsMC0xLjNMMTcsNC4zYy0wLjQtMC40LTEtMC40LTEuMywwTDE0LDZM - MTgsMTB6ICAgTTIsMTh2NGg0TDIsMTh6IiBjbGFzcz0iQmx1ZSIgLz4NCiAgPHJlY3QgeD0iMCIgeT0i - MjQiIHdpZHRoPSIzMiIgaGVpZ2h0PSI4IiByeD0iMCIgcnk9IjAiIGlkPSJJbmRpY2F0b3IiIGNsYXNz - PSJzdDAiIC8+DQogIDxnIGNsYXNzPSJzdDEiPg0KICAgIDxwYXRoIGQ9Ik0wLDIzLjlWMzJoMzJ2LTgu - MUgweiBNMzAsMzBIMnYtNGgyOFYzMHoiIGNsYXNzPSJCbGFjayIgLz4NCiAgPC9nPg0KPC9zdmc+Cw== + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJs + YWNre2ZpbGw6IzcyNzI3Mjt9CgkuQmx1ZXtmaWxsOiMxMTc3RDc7fQoJLkdyZWVue2ZpbGw6IzAzOUMy + Mzt9CgkuWWVsbG93e2ZpbGw6I0ZGQjExNTt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh + Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQo8L3N0eWxlPg0KICA8ZyBpZD0iRGVsZXRlIj4N + CiAgICA8Zz4NCiAgICAgIDxwYXRoIGQ9Ik0xOC44LDE2bDYuOS02LjljMC40LTAuNCwwLjQtMSwwLTEu + NGwtMS40LTEuNGMtMC40LTAuNC0xLTAuNC0xLjQsMEwxNiwxMy4yTDkuMSw2LjNjLTAuNC0wLjQtMS0w + LjQtMS40LDAgICAgTDYuMyw3LjdjLTAuNCwwLjQtMC40LDEsMCwxLjRsNi45LDYuOWwtNi45LDYuOWMt + MC40LDAuNC0wLjQsMSwwLDEuNGwxLjQsMS40YzAuNCwwLjQsMSwwLjQsMS40LDBsNi45LTYuOWw2Ljks + Ni45ICAgIGMwLjQsMC40LDEsMC40LDEuNCwwbDEuNC0xLjRjMC40LTAuNCwwLjQtMSwwLTEuNEwxOC44 + LDE2eiIgY2xhc3M9IlJlZCIgLz4NCiAgICA8L2c+DQogIDwvZz4NCjwvc3ZnPgs= - - $this - - - DevExpress.XtraBars.PopupMenu, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - + + BarListItem1 - - Combo + + Empfänger + + 159, 17 + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 @@ -429,121 +218,278 @@ IkJsYWNrIiAvPg0KICA8L2c+DQo8L3N2Zz4L - - Allgemein - - - RepositoryItemComboBox1 + + Kein Empfänger ausgewählt - - btnDelete + + + 0, 0 - - PDF Files|*.pdf + + Allgemein + + + Empfänger + + + Signaturen + + Start + + False - - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + Combo - - BarButtonItem2 + + False - - 2 + + Combo - - DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + 1125, 158 - - frmFieldEditor + + ribbonControl1 - - -1 + + DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - DevExpress.XtraEditors.Repository.RepositoryItemComboBox, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + $this - - Kein Empfänger ausgewählt + + 1 - - -1 + + + Fill + + + 0, 158 + + + 1125, 500 3 - - DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + DocumentViewer1 - - Empfänger + + DigitalData.Controls.DocumentViewer.DocumentViewer, DigitalData.Controls.DocumentViewer, Version=1.9.1.0, Culture=neutral, PublicKeyToken=null - - ribbonControl1 + + $this - - DevExpress.XtraBars.BarListItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + 0 - - + + 17, 17 + + + PDF Files|*.pdf - - DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + 284, 17 + + + Top - - BarManager1 + + 0, 0 + + + 1125, 0 + + + barDockControlTop + + + DevExpress.XtraBars.BarDockControl, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + $this + + + 5 Bottom - - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + 0, 658 - - System.Windows.Forms.OpenFileDialog, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 1125, 0 - - DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + barDockControlBottom - + DevExpress.XtraBars.BarDockControl, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - BarListItem1 + + $this - - Fill + + 4 - - DigitalData.Controls.DocumentViewer.DocumentViewer, DigitalData.Controls.DocumentViewer, Version=1.9.1.0, Culture=neutral, PublicKeyToken=null + + Left + + + 0, 0 + + + 0, 658 + + + barDockControlLeft + + + DevExpress.XtraBars.BarDockControl, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + $this + + + 2 + + + Right 1125, 0 - - -1 + + 0, 658 - - 0 + + barDockControlRight - - Signatur hinzufügen + + DevExpress.XtraBars.BarDockControl, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - txtReceiver + + $this + + + 3 - - 284, 17 - - - 17, 17 - - - 159, 17 - True + + 6, 13 + + + 1125, 658 + + + Sign Flow - Signatur-Editor + + + BarButtonItem1 + + + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + btnSave + + + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + btnDelete + + + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + BarListItem1 + + + DevExpress.XtraBars.BarListItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + BarButtonItem2 + + + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + PopupMenu1 + + + DevExpress.XtraBars.PopupMenu, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + txtReceiver + + + DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + ribbonPage1 + + + DevExpress.XtraBars.Ribbon.RibbonPage, 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 + + + RibbonPageGroup3 + + + DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + RibbonPageGroup2 + + + DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + RepositoryItemComboBox1 + + + DevExpress.XtraEditors.Repository.RepositoryItemComboBox, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + RepositoryItemLookUpEdit1 + + + DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + OpenFileDialog1 + + + System.Windows.Forms.OpenFileDialog, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + BarManager1 + + + DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + frmFieldEditor + + + DevExpress.XtraBars.Ribbon.RibbonForm, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + \ No newline at end of file diff --git a/EnvelopeGenerator.Form/frmFieldEditor.vb b/EnvelopeGenerator.Form/frmFieldEditor.vb index bfbce01d..44bd752d 100644 --- a/EnvelopeGenerator.Form/frmFieldEditor.vb +++ b/EnvelopeGenerator.Form/frmFieldEditor.vb @@ -199,7 +199,12 @@ Partial Public Class frmFieldEditor If oInfo.Guid = -1 Then Dim oElement = Controller.GetElement(oStickyNote) - oStickyNote.Tag = GetAnnotationTag(SelectedReceiver.Id, oPage, oElement.Id) + If oElement IsNot Nothing Then + oStickyNote.Tag = GetAnnotationTag(SelectedReceiver.Id, oPage, oElement.Id) + Else + MsgBox("No Element for Update found!") + Logger.Error("No Element for Update found!") + End If End If End If Next