layout specihern

Updated the `StatusTranslated` property to cast the `Status` integer to the `Constants.EnvelopeStatus` enum before calling `ToString()`. This ensures accurate string representation based on the enum rather than the integer value.

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;

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/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

@@ -87,6 +87,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()
@@ -111,6 +112,8 @@ Partial Class frmMain
         Me.RefreshTimer = New System.Windows.Forms.Timer(Me.components)
         Me.SaveFileDialog1 = New System.Windows.Forms.SaveFileDialog()
         Me.XtraSaveFileDialog1 = New DevExpress.XtraEditors.XtraSaveFileDialog(Me.components)
+        Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem()
+        Me.RibbonPageGroupReceiver = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
         CType(Me.SplitContainerControl1, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.SplitContainerControl1.Panel1, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SplitContainerControl1.Panel1.SuspendLayout()
@@ -340,9 +343,9 @@ Partial Class frmMain
         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.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1, Me.RibbonPage2})
         Me.RibbonControl.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False]
@@ -509,7 +512,7 @@ Partial Class frmMain
         '
         '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,9 +535,6 @@ 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"
@@ -662,7 +662,7 @@ Partial Class frmMain
         '
         '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.GridControl = Me.GridCompleted
         Me.ViewCompleted.Name = "ViewCompleted"
         Me.ViewCompleted.OptionsBehavior.Editable = False
@@ -676,6 +676,13 @@ Partial Class frmMain
         Me.GridColumn3.FieldName = "EnvelopeTypeTitle"
         Me.GridColumn3.Name = "GridColumn3"
         '
+        'GridColumn6
+        '
+        resources.ApplyResources(Me.GridColumn6, "GridColumn6")
+        Me.GridColumn6.FieldName = "Comment"
+        Me.GridColumn6.MinWidth = 80
+        Me.GridColumn6.Name = "GridColumn6"
+        '
         'GridColumn4
         '
         resources.ApplyResources(Me.GridColumn4, "GridColumn4")
@@ -841,6 +848,22 @@ Partial Class frmMain
         '
         Me.XtraSaveFileDialog1.FileName = "XtraSaveFileDialog1"
         '
+        '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"
+        '
+        'RibbonPageGroupReceiver
+        '
+        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")
+        '
         'frmMain
         '
         resources.ApplyResources(Me, "$this")
@@ -976,4 +999,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.resx

@@ -746,7 +746,7 @@
 </value>
   </data>
   <data name="bbtnitm_ResendInvitation.Caption" xml:space="preserve">
-    <value>Einladung erneut versenden</value>
+    <value>Einladung manuell versenden</value>
   </data>
   <data name="bbtnitm_ResendInvitation.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
@@ -903,6 +903,28 @@
         LjQsMjEuNiwxNCwxNiwxNCAgIGMtNi41LDAtMTAsNS4yLTEwLDljMCw0LDIuMSw2LjUsMi4yLDYuN0M4
         LjQsMjkuOSw4LjcsMzAsOSwzMEM5LjIsMzAsOS41LDI5LjksOS43LDI5Ljh6IiBjbGFzcz0iQmxhY2si
         IC8+DQogIDwvZz4NCjwvc3ZnPgs=
+</value>
+  </data>
+  <data name="BarButtonItem2.Caption" xml:space="preserve">
+    <value>AccessCode manuell versenden</value>
+  </data>
+  <data name="BarButtonItem2.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
+        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
+        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAKQCAAAC77u/
+        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
+        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
+        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
+        Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
+        MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cgku
+        WWVsbG93e2ZpbGw6I0ZGQjExNTt9CgkuQmx1ZXtmaWxsOiMxMTc3RDc7fQoJLlJlZHtmaWxsOiNEMTFD
+        MUM7fQoJLldoaXRle2ZpbGw6I0ZGRkZGRjt9CgkuR3JlZW57ZmlsbDojMDM5QzIzO30KCS5zdDB7Zmls
+        bDojNzI3MjcyO30KCS5zdDF7b3BhY2l0eTowLjU7fQoJLnN0MntvcGFjaXR5OjAuNzU7fQo8L3N0eWxl
+        Pg0KICA8ZyBpZD0iTWFpbCI+DQogICAgPHBhdGggZD0iTTE2LDE4LjNsMTQtOFYyNWMwLDAuNS0wLjUs
+        MS0xLDFIM2MtMC41LDAtMS0wLjUtMS0xVjEwLjNMMTYsMTguM3ogTTI5LDZIM0MyLjUsNiwyLDYuNSwy
+        LDd2MWwxNCw4bDE0LThWNyAgIEMzMCw2LjUsMjkuNSw2LDI5LDZ6IiBjbGFzcz0iQmxhY2siIC8+DQog
+        IDwvZz4NCjwvc3ZnPgs=
 </value>
   </data>
   <data name="RibbonControl.Location" type="System.Drawing.Point, System.Drawing">
@@ -917,6 +939,9 @@
   <data name="RibbonPageGroupFunctions.Text" xml:space="preserve">
     <value>Funktionen</value>
   </data>
+  <data name="RibbonPageGroupReceiver.Text" xml:space="preserve">
+    <value>Empfänger</value>
+  </data>
   <data name="RibbonPage1.Text" xml:space="preserve">
     <value>Start</value>
   </data>
@@ -1098,11 +1123,23 @@
     <value>True</value>
   </data>
   <data name="GridColumn3.VisibleIndex" type="System.Int32, mscorlib">
-    <value>2</value>
+    <value>3</value>
   </data>
   <data name="GridColumn3.Width" type="System.Int32, mscorlib">
     <value>100</value>
   </data>
+  <data name="GridColumn6.Caption" xml:space="preserve">
+    <value>Kommentar</value>
+  </data>
+  <data name="GridColumn6.Visible" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="GridColumn6.VisibleIndex" type="System.Int32, mscorlib">
+    <value>1</value>
+  </data>
+  <data name="GridColumn6.Width" type="System.Int32, mscorlib">
+    <value>80</value>
+  </data>
   <data name="GridColumn4.Caption" xml:space="preserve">
     <value>Status</value>
   </data>
@@ -1110,7 +1147,7 @@
     <value>True</value>
   </data>
   <data name="GridColumn4.VisibleIndex" type="System.Int32, mscorlib">
-    <value>1</value>
+    <value>2</value>
   </data>
   <data name="GridColumn4.Width" type="System.Int32, mscorlib">
     <value>163</value>
@@ -1134,7 +1171,7 @@
     <value>True</value>
   </data>
   <data name="GridColumn7.VisibleIndex" type="System.Int32, mscorlib">
-    <value>3</value>
+    <value>4</value>
   </data>
   <data name="GridColumn7.Width" type="System.Int32, mscorlib">
     <value>120</value>
@@ -1146,7 +1183,7 @@
     <value>True</value>
   </data>
   <data name="GridColumn1.VisibleIndex" type="System.Int32, mscorlib">
-    <value>4</value>
+    <value>5</value>
   </data>
   <data name="GridColumn1.Width" type="System.Int32, mscorlib">
     <value>120</value>
@@ -2084,6 +2121,12 @@
   <data name="&gt;&gt;GridColumn3.Type" xml:space="preserve">
     <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
+  <data name="&gt;&gt;GridColumn6.Name" xml:space="preserve">
+    <value>GridColumn6</value>
+  </data>
+  <data name="&gt;&gt;GridColumn6.Type" xml:space="preserve">
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
   <data name="&gt;&gt;GridColumn4.Name" xml:space="preserve">
     <value>GridColumn4</value>
   </data>
@@ -2132,6 +2175,18 @@
   <data name="&gt;&gt;XtraSaveFileDialog1.Type" xml:space="preserve">
     <value>DevExpress.XtraEditors.XtraSaveFileDialog, DevExpress.XtraDialogs.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
+  <data name="&gt;&gt;BarButtonItem2.Name" xml:space="preserve">
+    <value>BarButtonItem2</value>
+  </data>
+  <data name="&gt;&gt;BarButtonItem2.Type" xml:space="preserve">
+    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="&gt;&gt;RibbonPageGroupReceiver.Name" xml:space="preserve">
+    <value>RibbonPageGroupReceiver</value>
+  </data>
+  <data name="&gt;&gt;RibbonPageGroupReceiver.Type" xml:space="preserve">
+    <value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
   <data name="&gt;&gt;$this.Name" xml:space="preserve">
     <value>frmMain</value>
   </data>

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
@@ -557,6 +570,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
@@ -795,8 +809,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
 
@@ -838,4 +855,71 @@ 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
 End Class