MS Anpassungen

EnvelopeMailService wurde umgestaltet, um gemeinsam genutzte Veränderungen des _placeholders-Wörterbuchs zu vermeiden.
Die Konfigurationseigenschaft MailParams.Placeholders wurde von einem veränderbaren Dictionary<string, string>
zu einem ImmutableDictionary<string, string> geändert, und _placeholders wird nun bei der Dienstkonstruktion als neues Wörterbuch instanziiert.

EnvelopeGenerator.Application/DTOs/MappingProfile.cs

@@ -54,7 +54,7 @@ public class MappingProfile : Profile
         CreateMap<ReceiverReadDto, Domain.Entities.Receiver>().ForMember(rcv => rcv.EnvelopeReceivers, rcvReadDto => rcvReadDto.Ignore());
         CreateMap<ReceiverCreateDto, Domain.Entities.Receiver>();
         CreateMap<ReceiverUpdateDto, Domain.Entities.Receiver>();
-        CreateMap<EnvelopeReceiverBase, EnvelopeReceiverBasicDto>();
+        CreateMap<Domain.Entities.EnvelopeReceiver, EnvelopeReceiverBasicDto>();
         CreateMap<EnvelopeReceiverReadOnlyCreateDto, Domain.Entities.EnvelopeReceiverReadOnly>();
         CreateMap<EnvelopeReceiverReadOnlyUpdateDto, Domain.Entities.EnvelopeReceiverReadOnly>();
 

EnvelopeGenerator.Application/Services/EnvelopeMailService.cs

@@ -44,11 +44,11 @@ private readonly IAuthenticator _authenticator;
     public EnvelopeMailService(IEmailOutRepository repository, IMapper mapper, IEmailTemplateService tempService, IEnvelopeReceiverService envelopeReceiverService, IOptions<DispatcherParams> dispatcherConfigOptions, IConfigService configService, IOptions<MailParams> mailConfig, IAuthenticator authenticator) : base(repository, mapper)
     {
         _tempService = tempService;
-	_envRcvService = envelopeReceiverService;
+	    _envRcvService = envelopeReceiverService;
-	_dConfig = dispatcherConfigOptions.Value;
+	    _dConfig = dispatcherConfigOptions.Value;
-	_configService = configService;
+	    _configService = configService;
-	_placeholders = mailConfig.Value.Placeholders;
+	    _placeholders = new Dictionary<string, string>(mailConfig.Value.Placeholders);
-	_authenticator = authenticator;
+        _authenticator = authenticator;
     }
 
 private async Task<Dictionary<string, string>> CreatePlaceholders(string? accessCode = null, EnvelopeReceiverDto? envelopeReceiverDto = null)

EnvelopeGenerator.BBTests/frmFinalizePDF.vb

@@ -1,10 +1,11 @@
-Imports DigitalData.Modules.Database
+Imports System.IO
+Imports System.Security.Cryptography
+Imports DigitalData.Modules.Database
 Imports DigitalData.Modules.Logging
+Imports EnvelopeGenerator.CommonServices.Jobs
+Imports EnvelopeGenerator.CommonServices.Jobs.FinalizeDocument
 Imports GdPicture14
 Imports Newtonsoft.Json.Linq
-Imports EnvelopeGenerator.CommonServices.Jobs
-Imports System.IO
-Imports EnvelopeGenerator.CommonServices.Jobs.FinalizeDocument
 
 Public Class frmFinalizePDF
     Private Const CONNECTIONSTRING = "Server=sDD-VMP04-SQL17\DD_DEVELOP01;Database=DD_ECM;User Id=sa;Password=+bk8oAbbQP1AzoHtvZUbd+Mbok2f8Fl4miEx1qssJ5yEaEWoQJ9prg4L14fURpPnqi1WMNs9fE4=;"
@@ -65,6 +66,22 @@ Public Class frmFinalizePDF
 
     Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click
         Try
+            'Dim oEnvelopeData = GetEnvelopeData(oId)
+
+            'If oEnvelopeData Is Nothing Then
+            '    Logger.Warn("EnvelopeData could not be loaded for Id [{0}]!", oId)
+            '    Throw New ArgumentNullException("EnvelopeData")
+            'End If
+            'Logger.Debug("Burning Annotations to pdf ...")
+            'sd
+            'Dim oBurnedDocument As Byte() = BurnAnnotationsToPdf(oEnvelopeData)
+            'If oBurnedDocument Is Nothing Then
+            '    Logger.Warn("Document could not be finalized!")
+            '    Throw New ApplicationException("Document could not be finalized")
+            'End If
+
+
+
 
             Dim oTable = LoadAnnotationDataForEnvelope()
             Dim oJsonList = oTable.Rows.

EnvelopeGenerator.CommonServices/Jobs/FinalizeDocument/FinalizeDocumentJob.vb

@@ -123,6 +123,7 @@ Namespace Jobs
                             Throw New ArgumentNullException("EnvelopeData")
                         End If
                         Logger.Debug("Burning Annotations to pdf ...")
+
                         Dim oBurnedDocument As Byte() = BurnAnnotationsToPdf(oEnvelopeData)
                         If oBurnedDocument Is Nothing Then
                             Logger.Warn("Document could not be finalized!")

EnvelopeGenerator.CommonServices/Jobs/FinalizeDocument/PDFBurner.vb

@@ -16,6 +16,8 @@ Namespace Jobs.FinalizeDocument
         Private Const ANNOTATION_TYPE_IMAGE = "pspdfkit/image"
         Private Const ANNOTATION_TYPE_INK = "pspdfkit/ink"
         Private Const ANNOTATION_TYPE_WIDGET = "pspdfkit/widget"
+        Private Annotationheight_min As Double = 0
+        Private Annotationheight_max As Double = 0
         Private Property _pdfBurnerParams As PDFBurnerParams
 
         Public Sub New(pLogConfig As LogConfig, pGDPictureLicenseKey As String, pdfBurnerParams As PDFBurnerParams)
@@ -69,12 +71,14 @@ Namespace Jobs.FinalizeDocument
             Try
                 Dim oAnnotationData = JsonConvert.DeserializeObject(Of AnnotationData)(pInstantJSON)
                 oAnnotationData.annotations.Reverse()
-                Dim formFieldIndex = 0
+                Dim formFieldIndex = 0, AnnotationIndex = 0, AnnotationImageIndex = 0
                 For Each oAnnotation In oAnnotationData.annotations
-                    Logger.Debug("Adding AnnotationID: " + oAnnotation.id)
+                    AnnotationIndex += 1
+                    Logger.Debug("Adding AnnotationID: " + oAnnotation.id + " -Index: " + AnnotationIndex.ToString)
                     Select Case oAnnotation.type
                         Case ANNOTATION_TYPE_IMAGE
-                            AddImageAnnotation(oAnnotation, oAnnotationData.attachments)
+                            AnnotationImageIndex += 1
+                            AddImageAnnotation(AnnotationImageIndex, oAnnotation, oAnnotationData.attachments)
 
                         Case ANNOTATION_TYPE_INK
                             AddInkAnnotation(oAnnotation)
@@ -98,19 +102,26 @@ Namespace Jobs.FinalizeDocument
             End Try
         End Function
 
-        Private Function AddImageAnnotation(pAnnotation As Annotation, pAttachments As Dictionary(Of String, Attachment)) As Boolean
+        Private Function AddImageAnnotation(pidX As Integer, pAnnotation As Annotation, pAttachments As Dictionary(Of String, Attachment)) As Boolean
             Try
                 Dim oAttachment = pAttachments.Where(Function(a) a.Key = pAnnotation.imageAttachmentId).
                         SingleOrDefault()
 
                 ' Convert pixels to Inches
                 Dim oBounds = pAnnotation.bbox.Select(AddressOf ToInches).ToList()
-
                 Dim oX = oBounds.Item(0)
                 Dim oY = oBounds.Item(1)
+
+
                 Dim oWidth = oBounds.Item(2)
                 Dim oHeight = oBounds.Item(3)
+                If pidX = 1 Then
+                    If Annotationheight_min = 0 Then
+                        Annotationheight_min = oHeight
+                        Annotationheight_min = oHeight
+                    End If
 
+                End If
                 Manager.SelectPage(pAnnotation.pageIndex + 1)
                 Manager.AddEmbeddedImageAnnotFromBase64(oAttachment.Value.binary, oX, oY, oWidth, oHeight)
 

EnvelopeGenerator.CommonServices/Models/ElementModel.vb

@@ -152,6 +152,9 @@ Public Class ElementModel
                 pElement.Id = GetElementId(pElement)
                 Return True
             Else
+
+                Dim filledSql As String = GetFilledSql(oCommand)
+                Logger.Warn(filledSql)
                 Return False
             End If
 
@@ -161,6 +164,26 @@ Public Class ElementModel
         End Try
     End Function
 
+    Function GetFilledSql(command As SqlCommand) As String
+        Dim oSql As String = command.CommandText
+        For Each oParam As SqlParameter In command.Parameters
+            Dim oValue As String
+            If oParam.Value Is Nothing OrElse oParam.Value Is DBNull.Value Then
+                oValue = "NULL"
+            ElseIf TypeOf oParam.Value Is String OrElse TypeOf oParam.Value Is Date Then
+                oValue = $"'{oParam.Value.ToString().Replace("'", "''")}'"
+
+            ElseIf TypeOf oParam.Value Is Boolean Then
+                oValue = If(CBool(oParam.Value), "1", "0")
+            Else
+                oValue = oParam.Value.ToString()
+            End If
+            oSql = oSql.Replace("@" & oParam.ParameterName, oValue)
+        Next
+        Return oSql
+    End Function
+
+
     Public Function Update(pElement As DocumentReceiverElement) As Boolean
         Try
             Dim oSql = "UPDATE [dbo].[TBSIG_DOCUMENT_RECEIVER_ELEMENT]

EnvelopeGenerator.CommonServices/Models/EnvelopeModel.vb

@@ -27,6 +27,7 @@ Public Class EnvelopeModel
         Dim oEnvelope = New Envelope() With {
             .Id = pRow.ItemEx("GUID", 0),
             .Title = pRow.ItemEx("TITLE", ""),
+            .Comment = pRow.ItemEx("COMMENT", ""),
             .EnvelopeTypeId = pRow.ItemEx("ENVELOPE_TYPE", 0),
             .ContractType = pRow.ItemEx("CONTRACT_TYPE", 0),
             .Uuid = pRow.ItemEx("ENVELOPE_UUID", ""),

EnvelopeGenerator.CommonServices/Services/ActionService.vb

@@ -57,7 +57,9 @@ Public Class ActionService
     Public Function ResendReceiver(pEnvelope As Domain.Entities.Envelope, pReceiver As Receiver) As Boolean
         Return EmailService.SendDocumentReceivedEmail(pEnvelope, pReceiver)
     End Function
-
+    Public Function ManuallySendAccessCode(pEnvelope As Domain.Entities.Envelope, pReceiver As Receiver) As Boolean
+        Return EmailService.SendDocumentAccessCodeReceivedEmail(pEnvelope, pReceiver)
+    End Function
 
     Public Function DeleteEnvelope(pEnvelope As Domain.Entities.Envelope, pReason As String) As Boolean
         Dim oStatus As EnvelopeStatus

EnvelopeGenerator.CommonServices/Strings/Envelope1.Designer.vb

@@ -325,7 +325,11 @@ Namespace My.Resources
                 Return ResourceManager.GetString("Invitation successfully resend", resourceCulture)
             End Get
         End Property
-        
+        Public Shared ReadOnly Property AccessCode_successfully_send() As String
+            Get
+                Return ResourceManager.GetString("AccessCode manually send", resourceCulture)
+            End Get
+        End Property
         '''<summary>
         '''  Sucht eine lokalisierte Zeichenfolge, die Fehlendes Dokument ähnelt.
         '''</summary>

EnvelopeGenerator.Domain/Entities/Envelope.cs

@@ -56,6 +56,9 @@ namespace EnvelopeGenerator.Domain.Entities
         [Column("TITLE", TypeName = "nvarchar(128)")]
         public string Title { get; set; } = string.Empty;
 
+        [Column("COMMENT", TypeName = "nvarchar(128)")]
+        public string Comment { get; set; } = string.Empty;
+
         [Column("CONTRACT_TYPE")]
         public int ContractType { get; set; }
 
@@ -126,7 +129,7 @@ namespace EnvelopeGenerator.Domain.Entities
         public bool IsAlreadySent => Status > (int)Constants.EnvelopeStatus.EnvelopeSaved;
 
         [NotMapped]
-        public string StatusTranslated => My.Resources.Model.ResourceManager.GetString(Status.ToString());
+        public string StatusTranslated => My.Resources.Model.ResourceManager.GetString(((Constants.EnvelopeStatus)Status).ToString());
 
         [NotMapped]
         public bool TFA_Enabled { get; set; } = false;
@@ -135,12 +138,15 @@ namespace EnvelopeGenerator.Domain.Entities
         public byte[] DOC_RESULT { get; set; }
 
         // TODO: * Check the Form App and remove the default value
+        [NotMapped]
         public List<EnvelopeDocument> Documents { get; set; } = new List<EnvelopeDocument>();
 
         // TODO: * Check the Form App and remove the default value
+        [NotMapped]
         public List<EnvelopeHistory> History { get; set; } = new List<EnvelopeHistory>();
 
         // TODO: * Check the Form App and remove the default value
+        [NotMapped]
         public List<Receiver> Receivers { get; set; } = new List<Receiver>();
 
         /// <summary>

EnvelopeGenerator.Domain/Entities/EnvelopeReceiver.cs

@@ -1,10 +1,59 @@
-using System.ComponentModel.DataAnnotations.Schema;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+#if NETFRAMEWORK
+using System;
+#endif
 
 namespace EnvelopeGenerator.Domain.Entities
 {
     [Table("TBSIG_ENVELOPE_RECEIVER", Schema = "dbo")]
-    public class EnvelopeReceiver : EnvelopeReceiverBase
+    public class EnvelopeReceiver
     {
+        [Key]
+        [Column("ENVELOPE_ID")]
+        public int EnvelopeId { get; set; }
+
+        [Key]
+        [Column("RECEIVER_ID")]
+        public int ReceiverId { get; set; }
+
+        [Required]
+        [Column("SEQUENCE")]
+        public int Sequence { get; set; }
+
+        [Column("NAME", TypeName = "nvarchar(128)")]
+        public string Name { get; set; }
+
+        [Column("JOB_TITLE", TypeName = "nvarchar(128)")]
+        public string JobTitle { get; set; }
+
+        [Column("COMPANY_NAME", TypeName = "nvarchar(128)")]
+        public string CompanyName { get; set; }
+
+        [Column("PRIVATE_MESSAGE", TypeName = "nvarchar(max)")]
+        public string PrivateMessage { get; set; }
+
+        [Column("ACCESS_CODE", TypeName = "nvarchar(64)")]
+        public string AccessCode { get; set; }
+
+        [Required]
+        [Column("ADDED_WHEN", TypeName = "datetime")]
+        public DateTime AddedWhen { get; set; }
+
+        [Column("CHANGED_WHEN", TypeName = "datetime")]
+        public DateTime ChangedWhen { get; set; }
+
+        [Column("PHONE_NUMBER")]
+        [StringLength(20)]
+        [RegularExpression(@"^\+[0-9]+$", ErrorMessage = "Phone number must start with '+' followed by digits.")]
+        public string PhoneNumber { get; set; }
+
+        [NotMapped]
+        public Tuple<int, int> Id => Tuple.Create(EnvelopeId, ReceiverId);
+
+        [NotMapped]
+        public bool HasPhoneNumber => !string.IsNullOrWhiteSpace(PhoneNumber);
+
         [ForeignKey("EnvelopeId")]
         public Envelope Envelope { get; set; }
 

EnvelopeGenerator.Domain/Entities/EnvelopeReceiverBase.cs

@@ -1,57 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-#if NETFRAMEWORK
-using System;
-#endif
-
-namespace EnvelopeGenerator.Domain.Entities
-{
-    [Table("TBSIG_ENVELOPE_RECEIVER", Schema = "dbo")]
-    public class EnvelopeReceiverBase
-    {
-        [Key]
-        [Column("ENVELOPE_ID")]
-        public int EnvelopeId { get; set; }
-
-        [Key]
-        [Column("RECEIVER_ID")]
-        public int ReceiverId { get; set; }
-
-        [Required]
-        [Column("SEQUENCE")]
-        public int Sequence { get; set; }
-
-        [Column("NAME", TypeName = "nvarchar(128)")]
-        public string Name { get; set; }
-
-        [Column("JOB_TITLE", TypeName = "nvarchar(128)")]
-        public string JobTitle { get; set; }
-
-        [Column("COMPANY_NAME", TypeName = "nvarchar(128)")]
-        public string CompanyName { get; set; }
-
-        [Column("PRIVATE_MESSAGE", TypeName = "nvarchar(max)")]
-        public string PrivateMessage { get; set; }
-
-        [Column("ACCESS_CODE", TypeName = "nvarchar(64)")]
-        public string AccessCode { get; set; }
-
-        [Required]
-        [Column("ADDED_WHEN", TypeName = "datetime")]
-        public DateTime AddedWhen { get; set; }
-
-        [Column("CHANGED_WHEN", TypeName = "datetime")]
-        public DateTime ChangedWhen { get; set; }
-
-        [Column("PHONE_NUMBER")]
-        [StringLength(20)]
-        [RegularExpression(@"^\+[0-9]+$", ErrorMessage = "Phone number must start with '+' followed by digits.")]
-        public string PhoneNumber { get; set; }
-        
-        [NotMapped]
-        public Tuple<int, int> Id => Tuple.Create(EnvelopeId, ReceiverId);
-
-        [NotMapped]
-        public bool HasPhoneNumber => !string.IsNullOrWhiteSpace(PhoneNumber);
-    }
-}

EnvelopeGenerator.Domain/EnvelopeGenerator.Domain.csproj

@@ -2,6 +2,8 @@
 
   <PropertyGroup>
     <TargetFrameworks>net462;net7.0;net8.0;net9.0</TargetFrameworks>
+    <AssemblyVersion>1.4.0</AssemblyVersion>
+    <FileVersion>1.4.0</FileVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(TargetFramework)' == 'net462'">

EnvelopeGenerator.Domain/Resources/Envelope.Designer.cs

@@ -60,6 +60,15 @@ namespace My.Resources {
             }
         }
         
+        /// <summary>
+        ///   Sucht eine lokalisierte Zeichenfolge, die Der Zugangs Code wurde erfolgreich an [@Mail] versendet! ähnelt.
+        /// </summary>
+        public static string AccessCode_manually_send {
+            get {
+                return ResourceManager.GetString("AccessCode manually send", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Sucht eine lokalisierte Zeichenfolge, die Bitte wählen Sie die PDF-Dokumente die Sie verketten möchten: ähnelt.
         /// </summary>
@@ -150,6 +159,15 @@ namespace My.Resources {
             }
         }
         
+        /// <summary>
+        ///   Sucht eine lokalisierte Zeichenfolge, die Aktuell sind per Drag and Drop nur  PDF-Dateien erlaubt. ähnelt.
+        /// </summary>
+        public static string Drop_only_pdf {
+            get {
+                return ResourceManager.GetString("Drop only pdf", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Sucht eine lokalisierte Zeichenfolge, die Bearbeite Umschlag ähnelt.
         /// </summary>
@@ -241,8 +259,8 @@ namespace My.Resources {
         }
         
         /// <summary>
-        ///   Sucht eine lokalisierte Zeichenfolge, die The mobile phone number [@PhoneNr] could not be validated. 
+        ///   Sucht eine lokalisierte Zeichenfolge, die Die Mobiltelefonnummer [@PhoneNr] konnte nicht validiert werden. 
-        ///Pattern: +491234567890 ähnelt.
+        ///Muster: +491234567890 ähnelt.
         /// </summary>
         public static string Error_phone_Validation {
             get {
@@ -368,7 +386,7 @@ namespace My.Resources {
         }
         
         /// <summary>
-        ///   Sucht eine lokalisierte Zeichenfolge, die  ähnelt.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Not translated ähnelt.
         /// </summary>
         public static string ModificationOriginFile_FormFields {
             get {
@@ -476,7 +494,7 @@ namespace My.Resources {
         }
         
         /// <summary>
-        ///   Sucht eine lokalisierte Zeichenfolge, die Es sind ungespeicherte Änderungen vorhanden. Wollen Sie diese Speichern? ähnelt.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Es sind ungespeicherte Änderungen vorhanden. Wollen Sie diese speichern? ähnelt.
         /// </summary>
         public static string There_are_unsaved_changes {
             get {

EnvelopeGenerator.Domain/Resources/Envelope.en.resx

@@ -147,9 +147,6 @@
   <data name="Drop only one file" xml:space="preserve">
     <value>Currently, only one PDF file is permitted via drag and drop.</value>
   </data>
-  <data name="Drop only pdf" xml:space="preserve">
-    <value />
-  </data>
   <data name="Edit Envelope" xml:space="preserve">
     <value>Edit Envelope</value>
   </data>
@@ -181,7 +178,8 @@
     <value>The email  [ @Mail ] could not be varified!</value>
   </data>
   <data name="Error phone Validation" xml:space="preserve">
-    <value />
+    <value>The mobile phone number [@PhoneNr] could not be validated. 
+Pattern: +491234567890</value>
   </data>
   <data name="Error sending the envelope" xml:space="preserve">
     <value>Error sending the envelope:</value>
@@ -222,6 +220,9 @@
   <data name="Missing Receivers" xml:space="preserve">
     <value>Missing Receivers</value>
   </data>
+  <data name="ModificationOriginFile_FormFields" xml:space="preserve">
+    <value>Not translated</value>
+  </data>
   <data name="New Envelope" xml:space="preserve">
     <value>New Envelope</value>
   </data>
@@ -255,10 +256,16 @@
   <data name="There are already elements for this recipient" xml:space="preserve">
     <value>There are already elements for this recipient. Do you still want to delete the recipient?</value>
   </data>
-  <data name="There are unsaved changes." xml:space="preserve">
+  <data name="There are unsaved changes" xml:space="preserve">
     <value>There are unsaved changes. Do you want to save them?</value>
   </data>
   <data name="You received a document to sign" xml:space="preserve">
     <value>You received a document to sign:</value>
   </data>
+  <data name="Drop only pdf" xml:space="preserve">
+    <value>Currently, only PDF files are allowed via drag and drop.</value>
+  </data>
+  <data name="AccessCode manually send" xml:space="preserve">
+    <value>The access code was successfully sent to [@Mail]!</value>
+  </data>
 </root>

EnvelopeGenerator.Domain/Resources/Envelope.resx

@@ -178,8 +178,8 @@
     <value>Die Email-Adresse [ @Mail ] konnte nicht validiert werden!</value>
   </data>
   <data name="Error phone Validation" xml:space="preserve">
-    <value>The mobile phone number [@PhoneNr] could not be validated. 
+    <value>Die Mobiltelefonnummer [@PhoneNr] konnte nicht validiert werden. 
-Pattern: +491234567890</value>
+Muster: +491234567890</value>
   </data>
   <data name="Error sending the envelope" xml:space="preserve">
     <value>Fehler beim Senden des Umschlags:</value>
@@ -221,7 +221,7 @@ Pattern: +491234567890</value>
     <value>Fehlende Empfänger</value>
   </data>
   <data name="ModificationOriginFile_FormFields" xml:space="preserve">
-    <value />
+    <value>Not translated</value>
   </data>
   <data name="New Envelope" xml:space="preserve">
     <value>Neuer Umschlag</value>
@@ -257,9 +257,15 @@ Pattern: +491234567890</value>
     <value>Es gibt für diesen Empfänger bereits Elemente. Wollen Sie den Empfänger trotzdem löschen?</value>
   </data>
   <data name="There are unsaved changes" xml:space="preserve">
-    <value>Es sind ungespeicherte Änderungen vorhanden. Wollen Sie diese Speichern?</value>
+    <value>Es sind ungespeicherte Änderungen vorhanden. Wollen Sie diese speichern?</value>
   </data>
   <data name="You received a document to sign" xml:space="preserve">
     <value>Sie haben ein Dokument zum signieren erhalten:</value>
   </data>
+  <data name="Drop only pdf" xml:space="preserve">
+    <value>Aktuell sind per Drag and Drop nur  PDF-Dateien erlaubt.</value>
+  </data>
+  <data name="AccessCode manually send" xml:space="preserve">
+    <value>Der Zugangs Code wurde erfolgreich an [@Mail] versendet!</value>
+  </data>
 </root>

EnvelopeGenerator.Domain/Resources/Model.en.resx

@@ -132,6 +132,9 @@
   <data name="Completed" xml:space="preserve">
     <value>Completed</value>
   </data>
+  <data name="CompletelySigned" xml:space="preserve">
+    <value>Completely signed</value>
+  </data>
   <data name="Contract" xml:space="preserve">
     <value>Contract</value>
   </data>

EnvelopeGenerator.Form/frmEnvelopeEditor.Designer.vb

@@ -424,7 +424,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, 530)
+        Me.LayoutControlGroup4.Size = New System.Drawing.Size(251, 418)
         Me.LayoutControlGroup4.TextVisible = False
         '
         'LayoutControlGroup5
@@ -432,7 +432,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, 530)
+        Me.LayoutControlGroup5.Size = New System.Drawing.Size(251, 418)
         resources.ApplyResources(Me.LayoutControlGroup5, "LayoutControlGroup5")
         '
         'LayoutControlItem5
@@ -440,7 +440,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, 485)
+        Me.LayoutControlItem5.Size = New System.Drawing.Size(227, 373)
         Me.LayoutControlItem5.TextSize = New System.Drawing.Size(0, 0)
         Me.LayoutControlItem5.TextVisible = False
         '
@@ -594,7 +594,7 @@ Partial Public Class frmEnvelopeEditor
         Me.LayoutControlGroup2.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlGroup3})
         Me.LayoutControlGroup2.Name = "LayoutControlGroup2"
         Me.LayoutControlGroup2.Padding = New DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0)
-        Me.LayoutControlGroup2.Size = New System.Drawing.Size(899, 249)
+        Me.LayoutControlGroup2.Size = New System.Drawing.Size(796, 249)
         Me.LayoutControlGroup2.TextVisible = False
         '
         'LayoutControlGroup3
@@ -602,7 +602,7 @@ Partial Public Class frmEnvelopeEditor
         Me.LayoutControlGroup3.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem2})
         Me.LayoutControlGroup3.Location = New System.Drawing.Point(0, 0)
         Me.LayoutControlGroup3.Name = "LayoutControlGroup3"
-        Me.LayoutControlGroup3.Size = New System.Drawing.Size(899, 249)
+        Me.LayoutControlGroup3.Size = New System.Drawing.Size(796, 249)
         resources.ApplyResources(Me.LayoutControlGroup3, "LayoutControlGroup3")
         '
         'LayoutControlItem2
@@ -610,7 +610,7 @@ Partial Public Class frmEnvelopeEditor
         Me.LayoutControlItem2.Control = Me.GridReceivers
         Me.LayoutControlItem2.Location = New System.Drawing.Point(0, 0)
         Me.LayoutControlItem2.Name = "LayoutControlItem2"
-        Me.LayoutControlItem2.Size = New System.Drawing.Size(875, 204)
+        Me.LayoutControlItem2.Size = New System.Drawing.Size(772, 204)
         Me.LayoutControlItem2.TextSize = New System.Drawing.Size(0, 0)
         Me.LayoutControlItem2.TextVisible = False
         '
@@ -644,7 +644,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, 263)
+        Me.Root.Size = New System.Drawing.Size(796, 151)
         Me.Root.TextVisible = False
         '
         'LayoutControlGroup1
@@ -653,7 +653,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, 263)
+        Me.LayoutControlGroup1.Size = New System.Drawing.Size(796, 151)
         resources.ApplyResources(Me.LayoutControlGroup1, "LayoutControlGroup1")
         '
         'LayoutControlItem3
@@ -662,7 +662,7 @@ Partial Public Class frmEnvelopeEditor
         Me.LayoutControlItem3.Location = New System.Drawing.Point(0, 0)
         Me.LayoutControlItem3.Name = "LayoutControlItem3"
         Me.LayoutControlItem3.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10)
-        Me.LayoutControlItem3.Size = New System.Drawing.Size(873, 216)
+        Me.LayoutControlItem3.Size = New System.Drawing.Size(770, 104)
         resources.ApplyResources(Me.LayoutControlItem3, "LayoutControlItem3")
         Me.LayoutControlItem3.TextLocation = DevExpress.Utils.Locations.Top
         Me.LayoutControlItem3.TextSize = New System.Drawing.Size(46, 13)

EnvelopeGenerator.Form/frmEnvelopeEditor.resx

@@ -485,13 +485,13 @@
     <value>Start</value>
   </data>
   <data name="RibbonControl1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1164, 132</value>
+    <value>1061, 132</value>
   </data>
   <data name="RibbonStatusBar1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 662</value>
+    <value>0, 550</value>
   </data>
   <data name="RibbonStatusBar1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1164, 22</value>
+    <value>1061, 22</value>
   </data>
   <data name="&gt;&gt;RibbonStatusBar1.Name" xml:space="preserve">
     <value>RibbonStatusBar1</value>
@@ -518,7 +518,7 @@
     <value>2</value>
   </data>
   <data name="GridDocuments.Size" type="System.Drawing.Size, System.Drawing">
-    <value>223, 481</value>
+    <value>223, 369</value>
   </data>
   <data name="GridDocuments.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
@@ -545,7 +545,7 @@
     <value>Ihre Dokumente</value>
   </data>
   <data name="LayoutControl3.Size" type="System.Drawing.Size, System.Drawing">
-    <value>251, 530</value>
+    <value>251, 418</value>
   </data>
   <data name="LayoutControl3.TabIndex" type="System.Int32, mscorlib">
     <value>1</value>
@@ -627,7 +627,7 @@
     <value>0</value>
   </data>
   <data name="colColor.Width" type="System.Int32, mscorlib">
-    <value>32</value>
+    <value>54</value>
   </data>
   <data name="RepositoryItemComboBox1.AutoHeight" type="System.Boolean, mscorlib">
     <value>False</value>
@@ -696,7 +696,7 @@
     <value>Combo</value>
   </data>
   <data name="GridReceivers.Size" type="System.Drawing.Size, System.Drawing">
-    <value>871, 200</value>
+    <value>768, 200</value>
   </data>
   <data name="GridReceivers.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
@@ -726,7 +726,7 @@
     <value>Empfänger</value>
   </data>
   <data name="LayoutControl2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>899, 249</value>
+    <value>796, 249</value>
   </data>
   <data name="LayoutControl2.TabIndex" type="System.Int32, mscorlib">
     <value>1</value>
@@ -756,7 +756,7 @@
     <value>0, 0, 0, 0</value>
   </data>
   <data name="PanelControl1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>903, 253</value>
+    <value>800, 253</value>
   </data>
   <data name="PanelControl1.TabIndex" type="System.Int32, mscorlib">
     <value>1</value>
@@ -795,7 +795,7 @@
     <value>Segoe UI, 9.75pt</value>
   </data>
   <data name="txtMessage.Size" type="System.Drawing.Size, System.Drawing">
-    <value>853, 180</value>
+    <value>750, 68</value>
   </data>
   <data name="txtMessage.TabIndex" type="System.Int32, mscorlib">
     <value>2</value>
@@ -825,7 +825,7 @@
     <value>Ihre Nachricht</value>
   </data>
   <data name="LayoutControl1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>899, 263</value>
+    <value>796, 151</value>
   </data>
   <data name="LayoutControl1.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
@@ -855,7 +855,7 @@
     <value>0, 0, 0, 0</value>
   </data>
   <data name="PanelControl2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>903, 267</value>
+    <value>800, 155</value>
   </data>
   <data name="PanelControl2.TabIndex" type="System.Int32, mscorlib">
     <value>1</value>
@@ -888,7 +888,7 @@
     <value>1</value>
   </data>
   <data name="SplitContainerControl2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>903, 530</value>
+    <value>800, 418</value>
   </data>
   <data name="SplitContainerControl2.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
@@ -921,7 +921,7 @@
     <value>1</value>
   </data>
   <data name="SplitContainerControl1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1164, 530</value>
+    <value>1061, 418</value>
   </data>
   <data name="SplitContainerControl1.TabIndex" type="System.Int32, mscorlib">
     <value>1</value>
@@ -985,7 +985,7 @@
     <value>6, 13</value>
   </data>
   <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
-    <value>1164, 684</value>
+    <value>1061, 572</value>
   </data>
   <data name="frmEnvelopeEditor.IconOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>

EnvelopeGenerator.Form/frmFieldEditor.resx

@@ -123,7 +123,7 @@
   </data>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="SplitContainerControl1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 59</value>
+    <value>0, 132</value>
   </data>
   <data name="ThumbnailEx2.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
     <value>Fill</value>
@@ -132,7 +132,7 @@
     <value>0, 0</value>
   </data>
   <data name="ThumbnailEx2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>199, 600</value>
+    <value>199, 402</value>
   </data>
   <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="ThumbnailEx2.TabIndex" type="System.Int32, mscorlib">
@@ -172,7 +172,7 @@
     <value>0, 0</value>
   </data>
   <data name="DocumentViewer1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>917, 600</value>
+    <value>577, 402</value>
   </data>
   <data name="DocumentViewer1.TabIndex" type="System.Int32, mscorlib">
     <value>3</value>
@@ -205,7 +205,7 @@
     <value>1</value>
   </data>
   <data name="SplitContainerControl1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1126, 600</value>
+    <value>786, 402</value>
   </data>
   <data name="SplitContainerControl1.TabIndex" type="System.Int32, mscorlib">
     <value>15</value>
@@ -397,7 +397,7 @@
     <value>Combo</value>
   </data>
   <data name="ribbonControl1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1126, 88</value>
+    <value>786, 132</value>
   </data>
   <data name="&gt;&gt;ribbonControl1.Name" xml:space="preserve">
     <value>ribbonControl1</value>
@@ -427,7 +427,7 @@
     <value>0, 0</value>
   </data>
   <data name="barDockControlTop.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1126, 0</value>
+    <value>786, 0</value>
   </data>
   <data name="&gt;&gt;barDockControlTop.Name" xml:space="preserve">
     <value>barDockControlTop</value>
@@ -445,10 +445,10 @@
     <value>Bottom</value>
   </data>
   <data name="barDockControlBottom.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 659</value>
+    <value>0, 534</value>
   </data>
   <data name="barDockControlBottom.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1126, 0</value>
+    <value>786, 0</value>
   </data>
   <data name="&gt;&gt;barDockControlBottom.Name" xml:space="preserve">
     <value>barDockControlBottom</value>
@@ -469,7 +469,7 @@
     <value>0, 0</value>
   </data>
   <data name="barDockControlLeft.Size" type="System.Drawing.Size, System.Drawing">
-    <value>0, 659</value>
+    <value>0, 534</value>
   </data>
   <data name="&gt;&gt;barDockControlLeft.Name" xml:space="preserve">
     <value>barDockControlLeft</value>
@@ -487,10 +487,10 @@
     <value>Right</value>
   </data>
   <data name="barDockControlRight.Location" type="System.Drawing.Point, System.Drawing">
-    <value>1126, 0</value>
+    <value>786, 0</value>
   </data>
   <data name="barDockControlRight.Size" type="System.Drawing.Size, System.Drawing">
-    <value>0, 659</value>
+    <value>0, 534</value>
   </data>
   <data name="&gt;&gt;barDockControlRight.Name" xml:space="preserve">
     <value>barDockControlRight</value>
@@ -511,7 +511,7 @@
     <value>6, 13</value>
   </data>
   <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
-    <value>1689, 988</value>
+    <value>786, 534</value>
   </data>
   <data name="$this.Font" type="System.Drawing.Font, System.Drawing">
     <value>Segoe UI, 8.25pt</value>

EnvelopeGenerator.Form/frmFieldEditor.vb

@@ -243,7 +243,7 @@ Partial Public Class frmFieldEditor
                         If oElement IsNot Nothing Then
                             oStickyNote.Tag = GetAnnotationTag(SelectedReceiver.Id, oPage, oElement.Id)
                         Else
-                            MsgBox("No Element for Update found!")
+                            'MsgBox("No Element for Update found!")
                             Logger.Error("No Element for Update found!")
                         End If
                     End If

EnvelopeGenerator.Form/frmMain.Designer.vb

@@ -67,10 +67,12 @@ Partial Class frmMain
         Me.BarButtonItem4 = New DevExpress.XtraBars.BarButtonItem()
         Me.BarStaticItemGhost = New DevExpress.XtraBars.BarStaticItem()
         Me.bbtnitm2Faktor = New DevExpress.XtraBars.BarButtonItem()
+        Me.BarButtonItem2 = 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.RibbonPageGroupFunctions = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
+        Me.RibbonPageGroupReceiver = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
         Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage()
         Me.RibbonPageGroup3 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
         Me.RibbonStatusBar = New DevExpress.XtraBars.Ribbon.RibbonStatusBar()
@@ -87,6 +89,7 @@ Partial Class frmMain
         Me.ColHistoryDateCompleted = New DevExpress.XtraGrid.Columns.GridColumn()
         Me.ViewCompleted = New DevExpress.XtraGrid.Views.Grid.GridView()
         Me.GridColumn3 = New DevExpress.XtraGrid.Columns.GridColumn()
+        Me.GridColumn6 = New DevExpress.XtraGrid.Columns.GridColumn()
         Me.GridColumn4 = New DevExpress.XtraGrid.Columns.GridColumn()
         Me.GridColumn5 = New DevExpress.XtraGrid.Columns.GridColumn()
         Me.GridColumn7 = New DevExpress.XtraGrid.Columns.GridColumn()
@@ -166,7 +169,7 @@ Partial Class frmMain
         'SplitContainerControl1.Panel2
         '
         resources.ApplyResources(Me.SplitContainerControl1.Panel2, "SplitContainerControl1.Panel2")
-        Me.SplitContainerControl1.SplitterPosition = 272
+        Me.SplitContainerControl1.SplitterPosition = 335
         '
         'XtraTabControlMain
         '
@@ -178,8 +181,8 @@ Partial Class frmMain
         'XtraTabPage1
         '
         Me.XtraTabPage1.Controls.Add(Me.GridEnvelopes)
-        Me.XtraTabPage1.Name = "XtraTabPage1"
         resources.ApplyResources(Me.XtraTabPage1, "XtraTabPage1")
+        Me.XtraTabPage1.Name = "XtraTabPage1"
         '
         'GridEnvelopes
         '
@@ -188,6 +191,7 @@ Partial Class frmMain
         Me.GridEnvelopes.EmbeddedNavigator.Anchor = CType(resources.GetObject("GridEnvelopes.EmbeddedNavigator.Anchor"), System.Windows.Forms.AnchorStyles)
         Me.GridEnvelopes.EmbeddedNavigator.BackgroundImageLayout = CType(resources.GetObject("GridEnvelopes.EmbeddedNavigator.BackgroundImageLayout"), System.Windows.Forms.ImageLayout)
         Me.GridEnvelopes.EmbeddedNavigator.ImeMode = CType(resources.GetObject("GridEnvelopes.EmbeddedNavigator.ImeMode"), System.Windows.Forms.ImeMode)
+        Me.GridEnvelopes.EmbeddedNavigator.Margin = CType(resources.GetObject("GridEnvelopes.EmbeddedNavigator.Margin"), System.Windows.Forms.Padding)
         Me.GridEnvelopes.EmbeddedNavigator.TextLocation = CType(resources.GetObject("GridEnvelopes.EmbeddedNavigator.TextLocation"), DevExpress.XtraEditors.NavigatorButtonsTextLocation)
         Me.GridEnvelopes.EmbeddedNavigator.ToolTipIconType = CType(resources.GetObject("GridEnvelopes.EmbeddedNavigator.ToolTipIconType"), DevExpress.Utils.ToolTipIconType)
         GridLevelNode1.LevelTemplate = Me.ViewReceivers
@@ -204,6 +208,7 @@ Partial Class frmMain
         'ViewReceivers
         '
         Me.ViewReceivers.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.ColReceiverStatus, Me.ColName, Me.ColEmail, Me.ColSignedDate, Me.colAccessCode, Me.ColStatusReceiver})
+        Me.ViewReceivers.DetailHeight = 431
         Me.ViewReceivers.GridControl = Me.GridEnvelopes
         Me.ViewReceivers.Name = "ViewReceivers"
         Me.ViewReceivers.OptionsBehavior.Editable = False
@@ -218,6 +223,7 @@ Partial Class frmMain
         '
         resources.ApplyResources(Me.ColReceiverStatus, "ColReceiverStatus")
         Me.ColReceiverStatus.FieldName = "StatusTranslated"
+        Me.ColReceiverStatus.MinWidth = 27
         Me.ColReceiverStatus.Name = "ColReceiverStatus"
         Me.ColReceiverStatus.OptionsColumn.AllowEdit = False
         '
@@ -225,6 +231,7 @@ Partial Class frmMain
         '
         resources.ApplyResources(Me.ColName, "ColName")
         Me.ColName.FieldName = "Name"
+        Me.ColName.MinWidth = 27
         Me.ColName.Name = "ColName"
         Me.ColName.OptionsColumn.AllowEdit = False
         '
@@ -232,6 +239,7 @@ Partial Class frmMain
         '
         resources.ApplyResources(Me.ColEmail, "ColEmail")
         Me.ColEmail.FieldName = "EmailAddress"
+        Me.ColEmail.MinWidth = 27
         Me.ColEmail.Name = "ColEmail"
         Me.ColEmail.OptionsColumn.AllowEdit = False
         '
@@ -239,6 +247,7 @@ Partial Class frmMain
         '
         resources.ApplyResources(Me.ColSignedDate, "ColSignedDate")
         Me.ColSignedDate.FieldName = "SignedDateDisplayValue"
+        Me.ColSignedDate.MinWidth = 27
         Me.ColSignedDate.Name = "ColSignedDate"
         Me.ColSignedDate.OptionsColumn.AllowEdit = False
         '
@@ -246,17 +255,20 @@ Partial Class frmMain
         '
         resources.ApplyResources(Me.colAccessCode, "colAccessCode")
         Me.colAccessCode.FieldName = "AccessCode"
+        Me.colAccessCode.MinWidth = 27
         Me.colAccessCode.Name = "colAccessCode"
         '
         'ColStatusReceiver
         '
         resources.ApplyResources(Me.ColStatusReceiver, "ColStatusReceiver")
         Me.ColStatusReceiver.FieldName = "Status"
+        Me.ColStatusReceiver.MinWidth = 27
         Me.ColStatusReceiver.Name = "ColStatusReceiver"
         '
         'ViewHistory
         '
         Me.ViewHistory.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.ColHistoryStatus, Me.ColHistoryUserReference, Me.ColHistoryDate})
+        Me.ViewHistory.DetailHeight = 431
         Me.ViewHistory.GridControl = Me.GridEnvelopes
         Me.ViewHistory.Name = "ViewHistory"
         Me.ViewHistory.OptionsBehavior.Editable = False
@@ -269,12 +281,14 @@ Partial Class frmMain
         '
         resources.ApplyResources(Me.ColHistoryStatus, "ColHistoryStatus")
         Me.ColHistoryStatus.FieldName = "StatusTranslated"
+        Me.ColHistoryStatus.MinWidth = 27
         Me.ColHistoryStatus.Name = "ColHistoryStatus"
         '
         'ColHistoryUserReference
         '
         resources.ApplyResources(Me.ColHistoryUserReference, "ColHistoryUserReference")
         Me.ColHistoryUserReference.FieldName = "UserReference"
+        Me.ColHistoryUserReference.MinWidth = 27
         Me.ColHistoryUserReference.Name = "ColHistoryUserReference"
         '
         'ColHistoryDate
@@ -283,11 +297,13 @@ Partial Class frmMain
         Me.ColHistoryDate.DisplayFormat.FormatString = "G"
         Me.ColHistoryDate.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime
         Me.ColHistoryDate.FieldName = "ActionDate"
+        Me.ColHistoryDate.MinWidth = 27
         Me.ColHistoryDate.Name = "ColHistoryDate"
         '
         'ViewEnvelopes
         '
         Me.ViewEnvelopes.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colEnvelopeId, Me.colContractType, Me.colStatus, Me.colTitle, Me.colAddedWhen, Me.GridColumn2})
+        Me.ViewEnvelopes.DetailHeight = 431
         Me.ViewEnvelopes.GridControl = Me.GridEnvelopes
         Me.ViewEnvelopes.Name = "ViewEnvelopes"
         Me.ViewEnvelopes.OptionsBehavior.Editable = False
@@ -299,24 +315,28 @@ Partial Class frmMain
         '
         resources.ApplyResources(Me.colEnvelopeId, "colEnvelopeId")
         Me.colEnvelopeId.FieldName = "Id"
+        Me.colEnvelopeId.MinWidth = 27
         Me.colEnvelopeId.Name = "colEnvelopeId"
         '
         'colContractType
         '
         resources.ApplyResources(Me.colContractType, "colContractType")
         Me.colContractType.FieldName = "EnvelopeTypeTitle"
+        Me.colContractType.MinWidth = 27
         Me.colContractType.Name = "colContractType"
         '
         'colStatus
         '
         resources.ApplyResources(Me.colStatus, "colStatus")
         Me.colStatus.FieldName = "StatusTranslated"
+        Me.colStatus.MinWidth = 27
         Me.colStatus.Name = "colStatus"
         '
         'colTitle
         '
         resources.ApplyResources(Me.colTitle, "colTitle")
         Me.colTitle.FieldName = "Title"
+        Me.colTitle.MinWidth = 27
         Me.colTitle.Name = "colTitle"
         '
         'colAddedWhen
@@ -325,6 +345,7 @@ Partial Class frmMain
         Me.colAddedWhen.DisplayFormat.FormatString = "G"
         Me.colAddedWhen.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime
         Me.colAddedWhen.FieldName = "AddedWhen"
+        Me.colAddedWhen.MinWidth = 27
         Me.colAddedWhen.Name = "colAddedWhen"
         '
         'GridColumn2
@@ -333,17 +354,20 @@ Partial Class frmMain
         Me.GridColumn2.DisplayFormat.FormatString = "G"
         Me.GridColumn2.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime
         Me.GridColumn2.FieldName = "ChangedWhen"
+        Me.GridColumn2.MinWidth = 27
         Me.GridColumn2.Name = "GridColumn2"
         '
         'RibbonControl
         '
+        Me.RibbonControl.EmptyAreaImageOptions.ImagePadding = New System.Windows.Forms.Padding(40, 37, 40, 37)
         Me.RibbonControl.ExpandCollapseItem.Id = 0
         Me.RibbonControl.ExpandCollapseItem.ImageOptions.ImageIndex = CType(resources.GetObject("RibbonControl.ExpandCollapseItem.ImageOptions.ImageIndex"), Integer)
         Me.RibbonControl.ExpandCollapseItem.ImageOptions.LargeImageIndex = CType(resources.GetObject("RibbonControl.ExpandCollapseItem.ImageOptions.LargeImageIndex"), Integer)
-        Me.RibbonControl.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl.ExpandCollapseItem, Me.RibbonControl.SearchEditItem, Me.btnCreateEnvelope, Me.btnEditEnvelope, Me.btnDeleteEnvelope, Me.BarButtonItem1, Me.txtRefreshLabel, Me.btnShowDocument, Me.btnContactReceiver, Me.txtEnvelopeIdLabel, Me.btnOpenLogDirectory, Me.BarCheckItem1, Me.bsitmInfo, Me.bbtnitmEB, Me.bbtnitmInfoMail, Me.bbtnitm_ResendInvitation, Me.BarButtonItem3, Me.BarButtonItem4, Me.BarStaticItemGhost, Me.bbtnitm2Faktor})
+        Me.RibbonControl.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl.ExpandCollapseItem, Me.RibbonControl.SearchEditItem, Me.btnCreateEnvelope, Me.btnEditEnvelope, Me.btnDeleteEnvelope, Me.BarButtonItem1, Me.txtRefreshLabel, Me.btnShowDocument, Me.btnContactReceiver, Me.txtEnvelopeIdLabel, Me.btnOpenLogDirectory, Me.BarCheckItem1, Me.bsitmInfo, Me.bbtnitmEB, Me.bbtnitmInfoMail, Me.bbtnitm_ResendInvitation, Me.BarButtonItem3, Me.BarButtonItem4, Me.BarStaticItemGhost, Me.bbtnitm2Faktor, Me.BarButtonItem2})
         resources.ApplyResources(Me.RibbonControl, "RibbonControl")
-        Me.RibbonControl.MaxItemId = 21
+        Me.RibbonControl.MaxItemId = 22
         Me.RibbonControl.Name = "RibbonControl"
+        Me.RibbonControl.OptionsMenuMinWidth = 440
         Me.RibbonControl.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1, Me.RibbonPage2})
         Me.RibbonControl.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False]
         Me.RibbonControl.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.Show
@@ -507,9 +531,16 @@ Partial Class frmMain
         Me.bbtnitm2Faktor.ImageOptions.SvgImage = CType(resources.GetObject("bbtnitm2Faktor.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
         Me.bbtnitm2Faktor.Name = "bbtnitm2Faktor"
         '
+        'BarButtonItem2
+        '
+        resources.ApplyResources(Me.BarButtonItem2, "BarButtonItem2")
+        Me.BarButtonItem2.Id = 21
+        Me.BarButtonItem2.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem2.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
+        Me.BarButtonItem2.Name = "BarButtonItem2"
+        '
         'RibbonPage1
         '
-        Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageEnvelopeActions, Me.RibbonPageGroup1, Me.RibbonPageGroupFunctions})
+        Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageEnvelopeActions, Me.RibbonPageGroup1, Me.RibbonPageGroupFunctions, Me.RibbonPageGroupReceiver})
         Me.RibbonPage1.Name = "RibbonPage1"
         resources.ApplyResources(Me.RibbonPage1, "RibbonPage1")
         '
@@ -532,14 +563,21 @@ Partial Class frmMain
         'RibbonPageGroupFunctions
         '
         Me.RibbonPageGroupFunctions.ItemLinks.Add(Me.btnShowDocument)
-        Me.RibbonPageGroupFunctions.ItemLinks.Add(Me.bbtnitm_ResendInvitation)
-        Me.RibbonPageGroupFunctions.ItemLinks.Add(Me.btnContactReceiver)
-        Me.RibbonPageGroupFunctions.ItemLinks.Add(Me.bbtnitm2Faktor)
         Me.RibbonPageGroupFunctions.ItemLinks.Add(Me.bbtnitmEB)
         Me.RibbonPageGroupFunctions.ItemLinks.Add(Me.bbtnitmInfoMail)
         Me.RibbonPageGroupFunctions.Name = "RibbonPageGroupFunctions"
         resources.ApplyResources(Me.RibbonPageGroupFunctions, "RibbonPageGroupFunctions")
         '
+        'RibbonPageGroupReceiver
+        '
+        Me.RibbonPageGroupReceiver.Enabled = False
+        Me.RibbonPageGroupReceiver.ItemLinks.Add(Me.bbtnitm_ResendInvitation)
+        Me.RibbonPageGroupReceiver.ItemLinks.Add(Me.BarButtonItem2)
+        Me.RibbonPageGroupReceiver.ItemLinks.Add(Me.bbtnitm2Faktor)
+        Me.RibbonPageGroupReceiver.ItemLinks.Add(Me.btnContactReceiver)
+        Me.RibbonPageGroupReceiver.Name = "RibbonPageGroupReceiver"
+        resources.ApplyResources(Me.RibbonPageGroupReceiver, "RibbonPageGroupReceiver")
+        '
         'RibbonPage2
         '
         Me.RibbonPage2.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup3})
@@ -567,8 +605,8 @@ Partial Class frmMain
         'XtraTabPage2
         '
         Me.XtraTabPage2.Controls.Add(Me.GridCompleted)
-        Me.XtraTabPage2.Name = "XtraTabPage2"
         resources.ApplyResources(Me.XtraTabPage2, "XtraTabPage2")
+        Me.XtraTabPage2.Name = "XtraTabPage2"
         '
         'GridCompleted
         '
@@ -577,6 +615,7 @@ Partial Class frmMain
         Me.GridCompleted.EmbeddedNavigator.Anchor = CType(resources.GetObject("GridCompleted.EmbeddedNavigator.Anchor"), System.Windows.Forms.AnchorStyles)
         Me.GridCompleted.EmbeddedNavigator.BackgroundImageLayout = CType(resources.GetObject("GridCompleted.EmbeddedNavigator.BackgroundImageLayout"), System.Windows.Forms.ImageLayout)
         Me.GridCompleted.EmbeddedNavigator.ImeMode = CType(resources.GetObject("GridCompleted.EmbeddedNavigator.ImeMode"), System.Windows.Forms.ImeMode)
+        Me.GridCompleted.EmbeddedNavigator.Margin = CType(resources.GetObject("GridCompleted.EmbeddedNavigator.Margin"), System.Windows.Forms.Padding)
         Me.GridCompleted.EmbeddedNavigator.TextLocation = CType(resources.GetObject("GridCompleted.EmbeddedNavigator.TextLocation"), DevExpress.XtraEditors.NavigatorButtonsTextLocation)
         Me.GridCompleted.EmbeddedNavigator.ToolTipIconType = CType(resources.GetObject("GridCompleted.EmbeddedNavigator.ToolTipIconType"), DevExpress.Utils.ToolTipIconType)
         GridLevelNode3.LevelTemplate = Me.ViewReceiversCompleted
@@ -593,6 +632,7 @@ Partial Class frmMain
         'ViewReceiversCompleted
         '
         Me.ViewReceiversCompleted.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.ColStatusCompleted, Me.ColNameCompleted, Me.ColEmailCompleted, Me.ColSignedDateCompleted})
+        Me.ViewReceiversCompleted.DetailHeight = 431
         Me.ViewReceiversCompleted.GridControl = Me.GridCompleted
         Me.ViewReceiversCompleted.Name = "ViewReceiversCompleted"
         Me.ViewReceiversCompleted.OptionsBehavior.Editable = False
@@ -607,29 +647,34 @@ Partial Class frmMain
         '
         resources.ApplyResources(Me.ColStatusCompleted, "ColStatusCompleted")
         Me.ColStatusCompleted.FieldName = "StatusTranslated"
+        Me.ColStatusCompleted.MinWidth = 27
         Me.ColStatusCompleted.Name = "ColStatusCompleted"
         '
         'ColNameCompleted
         '
         resources.ApplyResources(Me.ColNameCompleted, "ColNameCompleted")
         Me.ColNameCompleted.FieldName = "Name"
+        Me.ColNameCompleted.MinWidth = 27
         Me.ColNameCompleted.Name = "ColNameCompleted"
         '
         'ColEmailCompleted
         '
         resources.ApplyResources(Me.ColEmailCompleted, "ColEmailCompleted")
         Me.ColEmailCompleted.FieldName = "EmailAddress"
+        Me.ColEmailCompleted.MinWidth = 27
         Me.ColEmailCompleted.Name = "ColEmailCompleted"
         '
         'ColSignedDateCompleted
         '
         resources.ApplyResources(Me.ColSignedDateCompleted, "ColSignedDateCompleted")
         Me.ColSignedDateCompleted.FieldName = "SignedDateDisplayValue"
+        Me.ColSignedDateCompleted.MinWidth = 27
         Me.ColSignedDateCompleted.Name = "ColSignedDateCompleted"
         '
         'ViewHistoryCompleted
         '
         Me.ViewHistoryCompleted.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.ColHistoryStatusCompleted, Me.ColHistoryUserReferenceCompleted, Me.ColHistoryDateCompleted})
+        Me.ViewHistoryCompleted.DetailHeight = 431
         Me.ViewHistoryCompleted.GridControl = Me.GridCompleted
         Me.ViewHistoryCompleted.Name = "ViewHistoryCompleted"
         Me.ViewHistoryCompleted.OptionsBehavior.Editable = False
@@ -644,12 +689,14 @@ Partial Class frmMain
         '
         resources.ApplyResources(Me.ColHistoryStatusCompleted, "ColHistoryStatusCompleted")
         Me.ColHistoryStatusCompleted.FieldName = "StatusTranslated"
+        Me.ColHistoryStatusCompleted.MinWidth = 27
         Me.ColHistoryStatusCompleted.Name = "ColHistoryStatusCompleted"
         '
         'ColHistoryUserReferenceCompleted
         '
         resources.ApplyResources(Me.ColHistoryUserReferenceCompleted, "ColHistoryUserReferenceCompleted")
         Me.ColHistoryUserReferenceCompleted.FieldName = "UserReference"
+        Me.ColHistoryUserReferenceCompleted.MinWidth = 27
         Me.ColHistoryUserReferenceCompleted.Name = "ColHistoryUserReferenceCompleted"
         '
         'ColHistoryDateCompleted
@@ -658,11 +705,13 @@ Partial Class frmMain
         Me.ColHistoryDateCompleted.DisplayFormat.FormatString = "G"
         Me.ColHistoryDateCompleted.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime
         Me.ColHistoryDateCompleted.FieldName = "ActionDate"
+        Me.ColHistoryDateCompleted.MinWidth = 27
         Me.ColHistoryDateCompleted.Name = "ColHistoryDateCompleted"
         '
         'ViewCompleted
         '
-        Me.ViewCompleted.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.GridColumn3, Me.GridColumn4, Me.GridColumn5, Me.GridColumn7, Me.GridColumn1})
+        Me.ViewCompleted.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.GridColumn3, Me.GridColumn6, Me.GridColumn4, Me.GridColumn5, Me.GridColumn7, Me.GridColumn1})
+        Me.ViewCompleted.DetailHeight = 431
         Me.ViewCompleted.GridControl = Me.GridCompleted
         Me.ViewCompleted.Name = "ViewCompleted"
         Me.ViewCompleted.OptionsBehavior.Editable = False
@@ -674,18 +723,28 @@ Partial Class frmMain
         '
         resources.ApplyResources(Me.GridColumn3, "GridColumn3")
         Me.GridColumn3.FieldName = "EnvelopeTypeTitle"
+        Me.GridColumn3.MinWidth = 27
         Me.GridColumn3.Name = "GridColumn3"
         '
+        'GridColumn6
+        '
+        resources.ApplyResources(Me.GridColumn6, "GridColumn6")
+        Me.GridColumn6.FieldName = "Comment"
+        Me.GridColumn6.MinWidth = 107
+        Me.GridColumn6.Name = "GridColumn6"
+        '
         'GridColumn4
         '
         resources.ApplyResources(Me.GridColumn4, "GridColumn4")
         Me.GridColumn4.FieldName = "StatusTranslated"
+        Me.GridColumn4.MinWidth = 27
         Me.GridColumn4.Name = "GridColumn4"
         '
         'GridColumn5
         '
         resources.ApplyResources(Me.GridColumn5, "GridColumn5")
         Me.GridColumn5.FieldName = "Title"
+        Me.GridColumn5.MinWidth = 27
         Me.GridColumn5.Name = "GridColumn5"
         '
         'GridColumn7
@@ -694,6 +753,7 @@ Partial Class frmMain
         Me.GridColumn7.DisplayFormat.FormatString = "G"
         Me.GridColumn7.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime
         Me.GridColumn7.FieldName = "AddedWhen"
+        Me.GridColumn7.MinWidth = 27
         Me.GridColumn7.Name = "GridColumn7"
         '
         'GridColumn1
@@ -702,14 +762,15 @@ Partial Class frmMain
         Me.GridColumn1.DisplayFormat.FormatString = "G"
         Me.GridColumn1.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime
         Me.GridColumn1.FieldName = "ChangedWhen"
+        Me.GridColumn1.MinWidth = 27
         Me.GridColumn1.Name = "GridColumn1"
         '
         'XtraTabPageAdmin
         '
         Me.XtraTabPageAdmin.Controls.Add(Me.SplitContainerControl2)
         Me.XtraTabPageAdmin.Controls.Add(Me.PanelControl1)
-        Me.XtraTabPageAdmin.Name = "XtraTabPageAdmin"
         resources.ApplyResources(Me.XtraTabPageAdmin, "XtraTabPageAdmin")
+        Me.XtraTabPageAdmin.Name = "XtraTabPageAdmin"
         '
         'SplitContainerControl2
         '
@@ -724,11 +785,12 @@ Partial Class frmMain
         'SplitContainerControl2.Panel2
         '
         resources.ApplyResources(Me.SplitContainerControl2.Panel2, "SplitContainerControl2.Panel2")
-        Me.SplitContainerControl2.SplitterPosition = 907
+        Me.SplitContainerControl2.SplitterPosition = 1209
         '
         'GridControlData
         '
         resources.ApplyResources(Me.GridControlData, "GridControlData")
+        Me.GridControlData.EmbeddedNavigator.Margin = CType(resources.GetObject("GridControlData.EmbeddedNavigator.Margin"), System.Windows.Forms.Padding)
         Me.GridControlData.MainView = Me.GridViewData
         Me.GridControlData.MenuManager = Me.RibbonControl
         Me.GridControlData.Name = "GridControlData"
@@ -736,6 +798,7 @@ Partial Class frmMain
         '
         'GridViewData
         '
+        Me.GridViewData.DetailHeight = 431
         Me.GridViewData.GridControl = Me.GridControlData
         Me.GridViewData.Name = "GridViewData"
         Me.GridViewData.OptionsView.ShowAutoFilterRow = True
@@ -810,8 +873,8 @@ Partial Class frmMain
         Me.XtraTabPage3.Controls.Add(Me.Label1)
         Me.XtraTabPage3.Controls.Add(Me.Button1)
         Me.XtraTabPage3.Controls.Add(Me.txtEnvID)
-        Me.XtraTabPage3.Name = "XtraTabPage3"
         resources.ApplyResources(Me.XtraTabPage3, "XtraTabPage3")
+        Me.XtraTabPage3.Name = "XtraTabPage3"
         '
         'Label1
         '
@@ -976,4 +1039,7 @@ Partial Class frmMain
     Friend WithEvents Label1 As Label
     Friend WithEvents Button1 As Button
     Friend WithEvents txtEnvID As TextBox
+    Friend WithEvents GridColumn6 As DevExpress.XtraGrid.Columns.GridColumn
+    Friend WithEvents BarButtonItem2 As DevExpress.XtraBars.BarButtonItem
+    Friend WithEvents RibbonPageGroupReceiver As DevExpress.XtraBars.Ribbon.RibbonPageGroup
 End Class

EnvelopeGenerator.Form/frmMain.vb

@@ -1,17 +1,19 @@
-Imports System.IO
+Imports System.ComponentModel
+Imports System.IdentityModel.Metadata
+Imports System.IO
+Imports System.Text
 Imports DevExpress.LookAndFeel
 Imports DevExpress.Utils.Extensions
 Imports DevExpress.XtraCharts
 Imports DevExpress.XtraGrid
 Imports DevExpress.XtraGrid.Views.Grid
+Imports DevExpress.XtraPrinting
 Imports DevExpress.XtraSplashScreen
 Imports DigitalData.GUIs.Common
 Imports DigitalData.Modules.Base
 Imports DigitalData.Modules.Logging
 Imports EnvelopeGenerator.CommonServices
 Imports EnvelopeGenerator.CommonServices.My
-Imports System.ComponentModel
-Imports DevExpress.XtraPrinting
 Imports EnvelopeGenerator.Domain.Entities
 
 Public Class frmMain
@@ -25,6 +27,7 @@ Public Class frmMain
     Private Controller As EnvelopeListController
     Private myFileData As Byte()
     Private myResFileData As Byte()
+    Private FormLoad As Boolean = True
 
     Public Sub New(pState As State)
         ' Dieser Aufruf ist für den Designer erforderlich.
@@ -60,6 +63,10 @@ Public Class frmMain
             XtraTabControlMain.TabPages(3).PageVisible = False
         End If
         LoadEnvelopeData()
+        Dim oXMLPath = Get_DocGrid_Layout_Filename(ViewEnvelopes.Name)
+        If File.Exists(oXMLPath) Then
+            ViewEnvelopes.RestoreLayoutFromXml(oXMLPath)
+        End If
     End Sub
 
     Private Sub LoadEnvelopeData()
@@ -216,6 +223,7 @@ Public Class frmMain
             RibbonPageEnvelopeActions.Enabled = True
             Select Case XtraTabControlMain.SelectedTabPageIndex
                 Case 1
+                    RibbonPageGroupReceiver.Visible = False
                     btnEditEnvelope.Enabled = False
                     btnDeleteEnvelope.Enabled = False
                     btnContactReceiver.Enabled = False
@@ -225,7 +233,12 @@ Public Class frmMain
                     bbtnitmEB.Enabled = True
                     bbtnitm2Faktor.Enabled = False
                     LoadEnvelopeData()
+                    Dim oXMLPath = Get_DocGrid_Layout_Filename(ViewCompleted.Name)
+                    If File.Exists(oXMLPath) Then
+                        ViewCompleted.RestoreLayoutFromXml(oXMLPath)
+                    End If
                 Case 0
+                    RibbonPageGroupReceiver.Visible = True
                     btnEditEnvelope.Enabled = True
                     btnDeleteEnvelope.Enabled = True
                     btnContactReceiver.Enabled = True
@@ -256,6 +269,7 @@ Public Class frmMain
 
     Private Sub ViewEnvelopes_FocusedRowChanged(sender As Object, e As DevExpress.XtraGrid.Views.Base.FocusedRowChangedEventArgs) Handles ViewEnvelopes.FocusedRowChanged
         If ViewEnvelopes.FocusedRowHandle < 0 Then
+            RibbonPageGroupReceiver.Enabled = False
             Exit Sub
         End If
 
@@ -557,6 +571,7 @@ Public Class frmMain
                 MYUSER = oUser
             End If
         End If
+        FormLoad = False
     End Sub
 
     Private Sub bbtnitmInfoMail_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles bbtnitmInfoMail.ItemClick
@@ -781,10 +796,13 @@ Public Class frmMain
     End Sub
 
     Private Sub bbtnitm2Faktor_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles bbtnitm2Faktor.ItemClick
+        Show_MF_Info
+
+    End Sub
+    Private Sub Show_MF_Info()
         If ViewEnvelopes.FocusedRowHandle < 0 Then
             Exit Sub
         End If
-
         Dim oEnvelope As Envelope = ViewEnvelopes.GetRow(ViewEnvelopes.FocusedRowHandle)
         Dim oView As GridView = GridEnvelopes.FocusedView
         If oView.Name = ViewReceivers.Name Then
@@ -795,8 +813,11 @@ Public Class frmMain
                 If oDT.Rows.Count = 1 Then
                     Dim oTFA_REG_DL = oDT.Rows(0).Item("TFA_REG_DEADLINE")
                     Dim oTOTP = oDT.Rows(0).Item("TOTP_SECRET_KEY")
-                    Dim oForm As New frm2Factor_Properties(oReceiver.EmailAddress, oTOTP, oTFA_REG_DL, DB_DD_ECM)
+                    If Not IsDBNull(oTOTP) And Not IsDBNull(oTFA_REG_DL) Then
-                    oForm.ShowDialog()
+                        Dim oForm As New frm2Factor_Properties(oReceiver.EmailAddress, oTOTP.ToString, oTFA_REG_DL, DB_DD_ECM)
+                        oForm.ShowDialog()
+                    End If
+
                 End If
             End If
 
@@ -804,7 +825,6 @@ Public Class frmMain
             MsgBox(Resources.Envelope.Please_select_a_recipient_from_the_Recipients_tab, MsgBoxStyle.Information, Text)
         End If
     End Sub
-
     Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click
         If txtEnvID.Text = String.Empty Then
             Exit Sub
@@ -838,4 +858,116 @@ Public Class frmMain
             .DbConfig = Nothing
         }
     End Function
+
+    Private Sub BarButtonItem2_ItemClick_1(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem2.ItemClick
+        Dim oHandle = SplashScreenManager.ShowOverlayForm(Me)
+        Try
+            Dim oView As GridView = GridEnvelopes.FocusedView
+            Dim selReceiver As Receiver
+            If oView.Name = ViewReceivers.Name Then
+                selReceiver = oView.GetRow(oView.FocusedRowHandle)
+            Else
+                MsgBox(Resources.Envelope.Please_select_a_recipient_from_the_Recipients_tab, MsgBoxStyle.Information, Text)
+            End If
+            If ViewEnvelopes.FocusedRowHandle < 0 Or IsNothing(selReceiver) Then
+                Exit Sub
+            End If
+            Dim oEnvelope As Envelope = ViewEnvelopes.GetRow(ViewEnvelopes.FocusedRowHandle)
+            If oEnvelope.UseAccessCode = True Then
+                Dim oController = New EnvelopeEditorController(State, oEnvelope)
+                Dim Documents As New BindingList(Of EnvelopeDocument)
+                Dim Receivers As New BindingList(Of Receiver)
+                Receivers = New BindingList(Of Receiver)(oController.Envelope.Receivers)
+                For Each oReceiver As Receiver In Receivers
+                    If oReceiver.EmailAddress = selReceiver.EmailAddress Then
+                        If oController.ActionService.ManuallySendAccessCode(oEnvelope, oReceiver) = True Then
+                            Dim oMsg = Resources.Envelope.AccessCode_successfully_send.Replace("@Mail", oReceiver.EmailAddress)
+                            MsgBox(oMsg, MsgBoxStyle.Information, Text)
+
+                        End If
+                    End If
+                Next
+            Else
+                MsgBox("Envelope is defined without AccessCode so far!", MsgBoxStyle.Information)
+            End If
+
+        Catch ex As Exception
+            Logger.Error(ex)
+        Finally
+
+
+        End Try
+        SplashScreenManager.CloseOverlayForm(oHandle)
+
+    End Sub
+
+    Private Sub ViewCompleted_Layout(sender As Object, e As EventArgs) Handles ViewCompleted.Layout
+        If FormLoad = True Then
+            Exit Sub
+        End If
+        Dim oXMLPath = Get_DocGrid_Layout_Filename(ViewCompleted.Name)
+        ViewCompleted.SaveLayoutToXml(oXMLPath)
+        bsitmInfo.Caption = "Grid Layout Envelopes Completed Saved"
+    End Sub
+
+    Private Sub ViewEnvelopes_Layout(sender As Object, e As EventArgs) Handles ViewEnvelopes.Layout
+        If FormLoad = True Then
+            Exit Sub
+        End If
+        Dim oXMLPath = Get_DocGrid_Layout_Filename(ViewEnvelopes.Name)
+        ViewEnvelopes.SaveLayoutToXml(oXMLPath)
+        bsitmInfo.Caption = "Grid Layout Envelopes Saved"
+
+    End Sub
+    Private Function Get_DocGrid_Layout_Filename(pGridViewName As String)
+        Dim EntityRegex As New RegularExpressions.Regex("\s+\(\d+\)")
+        Dim Filename As String = String.Format("{0}_UserLayout.xml", pGridViewName)
+        Dim oGridlayoutFullFilename = System.IO.Path.Combine(Application.UserAppDataPath(), Filename)
+        Return oGridlayoutFullFilename
+    End Function
+    Private Sub ViewReceivers_FocusedRowChanged(sender As Object, e As Views.Base.FocusedRowChangedEventArgs) Handles ViewReceivers.FocusedRowChanged
+
+        Dim detailView As GridView = TryCast(sender, GridView)
+
+        ' Sicherstellen, dass die View gültig ist
+        If detailView Is Nothing Then
+            Exit Sub
+        End If
+        ' Prüfen, ob der RowHandle gültig ist
+        If Not detailView.IsValidRowHandle(e.FocusedRowHandle) Then
+            Exit Sub
+        End If
+
+        Dim row = detailView.GetRow(e.FocusedRowHandle)
+
+        If row Is Nothing Then
+            Exit Sub
+        End If
+
+        Dim oReceiver As Receiver = CType(row, Receiver)
+        'Dim oEnvelopeTitle As String = Net.WebUtility.UrlEncode(oEnvelope.Title)
+
+        If Not IsNothing(oReceiver) Then
+            Dim oDT As DataTable = DB_DD_ECM.GetDatatable($"SELECT * FROM TBSIG_RECEIVER WHERE EMAIL_ADDRESS = '{oReceiver.EmailAddress}'")
+            If Not IsNothing(oDT) Then
+                If oDT.Rows.Count = 1 Then
+                    RibbonPageGroupReceiver.Enabled = True
+                    Dim oTFA_REG_DL = oDT.Rows(0).Item("TFA_REG_DEADLINE")
+                    Dim oTOTP = oDT.Rows(0).Item("TOTP_SECRET_KEY")
+                    If Not IsDBNull(oTOTP) And Not IsDBNull(oTFA_REG_DL) Then
+                        bbtnitm2Faktor.Enabled = True
+                    Else
+                        bbtnitm2Faktor.Enabled = False
+                    End If
+                Else
+                    RibbonPageGroupReceiver.Enabled = False
+                    End If
+
+                End If
+            End If
+
+
+
+
+    End Sub
 End Class

EnvelopeGenerator.Web/Controllers/BaseController.cs

@@ -1,18 +1,17 @@
 using EnvelopeGenerator.Web.Services;
 using Microsoft.AspNetCore.Mvc;
 
-namespace EnvelopeGenerator.Web.Controllers
+namespace EnvelopeGenerator.Web.Controllers;
+
+public class BaseController : Controller
 {
-    public class BaseController : Controller
+    protected readonly DatabaseService database;
+
+    protected readonly ILogger _logger;
+
+    public BaseController(DatabaseService database, ILogger logger)
     {
-        protected readonly DatabaseService database;
+        this.database = database;
-
+        _logger = logger;
-        protected readonly ILogger _logger;
-
-        public BaseController(DatabaseService database, ILogger logger)
-        {
-            this.database = database;
-            _logger = logger;
-        }
     }
 }

EnvelopeGenerator.Web/wwwroot/README.md

@@ -0,0 +1,74 @@
+# 📄 PSPDFKit-Integration – Vanilla JavaScript
+
+Dieses Projekt zeigt, wie die PDF-Anzeige- und Signaturbibliothek [PSPDFKit](https://www.nutrient.io/sdk/web/getting-started/other-frameworks/javascript/) mithilfe von **Vanilla JavaScript** integriert werden kann.
+
+## 🚀 Verwendungszweck
+
+PSPDFKit wurde in der Webanwendung verwendet, um PDF-Dokumente:
+- anzuzeigen,
+- zu signieren,
+- mit Anmerkungen zu versehen,
+- Formularfelder auszufüllen.
+
+Benutzer können Dokumente **direkt über den Browser signieren und versenden**.
+
+---
+
+## 🔧 Wo und wie wurde PSPDFKit verwendet?
+
+### 1. PSPDFKit laden
+
+PSPDFKit wurde mit der Funktion `loadPSPDFKit` in `UI.js` gestartet:
+
+```js
+PSPDFKit.load({
+  container: ‚#app‘,
+  document: arrayBuffer,
+  licenseKey: ‚YOUR_LICENSE_KEY‘,
+  ...
+})
+```
+
+### 2. Anmerkungen und Formularfelder
+
+In `annotation.js` werden die folgenden Felder dynamisch zu PDF-Dokumenten hinzugefügt:
+
+- **Signaturfeld** (`SignatureFormField`)
+- **Position** (`TextFormField`)
+- **Stadt** (`TextFormField`)
+- **Datum** (`TextFormField`, wird automatisch mit dem heutigen Datum ausgefüllt)
+- **Bezeichnungen** (`Ort`, `Position`, `Date`) – dies sind nur lesbare Textfelder.
+- **Rahmen für Signaturbild** – wird dynamisch erstellt und platziert, wenn der Benutzer unterschreibt.
+
+Die Felder werden entsprechend ihrer Position auf dem PDF berechnet und für jedes Feld wird eine eindeutige ID erstellt.
+
+---
+
+### 3. Anpassungen der Symbolleiste
+
+In `UI.js` ist die Standard-Symbolleiste (`toolbarItems`) von PSPDFKit konfiguriert:
+
+- Es werden nur zulässige Elemente (`sidebar`, `zoom`, `pager`, `search` usw.) angezeigt.
+- Je nach Benutzerberechtigung (z. B. schreibgeschützt oder beschreibbar) werden die folgenden speziellen Schaltflächen dynamisch hinzugefügt:
+
+**Beschreibbarer Modus:**
+- `Teilen` (SHARE)
+- `Logout` (LOGOUT)
+- `Zurücksetzen` (RESET)
+- `Ablehnen` (REJECT)
+- `Finalisieren` (FINISH)
+
+**Nur-Lesemodus:**
+- Die Schaltfläche `Teilen` kopiert nur den Link in die Zwischenablage (COPY_URL)
+
+Für mobile Geräte werden zusätzlich vereinfachte Schaltflächen angezeigt.
+
+---
+
+### 📁 Wichtige Dateien
+
+| Datei             | Beschreibung                                      |
+|-------------------|-----------------------------------------------|
+| `app.js`          | Hauptanwendungsklasse, Dokumentladen und -steuerung |
+| `ui.js`           | PSPDFKit-UI-Einrichtung und Symbolleistenverwaltung      |
+| `annotation.js`   | Erstellen und Löschen von Anmerkungsfeldern |