feat(appsettings.Dev): remove wrong cnn string

This reverts commit f4c61e3bc7.

EnvelopeGenerator.Application/Contracts/Repositories/IEnvelopeCertificateRepository.cs

@@ -1,12 +0,0 @@
-using DigitalData.Core.Abstraction.Application.Repository;
-using EnvelopeGenerator.Domain.Entities;
-
-namespace EnvelopeGenerator.Application.Contracts.Repositories;
-
-/// <summary>
-/// 
-/// </summary>
-[Obsolete("Use Read-method returning IReadQuery<TEntity> instead.")]
-public interface IEnvelopeCertificateRepository : ICRUDRepository<EnvelopeCertificate, int>
-{
-}

EnvelopeGenerator.Application/Contracts/Services/IEnvelopeCertificateService.cs

@@ -1,13 +0,0 @@
-using DigitalData.Core.Abstraction.Application;
-using EnvelopeGenerator.Application.DTOs;
-using EnvelopeGenerator.Domain.Entities;
-
-namespace EnvelopeGenerator.Application.Contracts.Services;
-
-/// <summary>
-/// 
-/// </summary>
-[Obsolete("Use MediatR")]
-public interface IEnvelopeCertificateService : IBasicCRUDService<EnvelopeCertificateDto, EnvelopeCertificate, int>
-{
-}

EnvelopeGenerator.Application/DTOs/EnvelopeCertificateDto.cs

@@ -1,50 +0,0 @@
-using Microsoft.AspNetCore.Mvc;
-
-namespace EnvelopeGenerator.Application.DTOs;
-
-/// <summary>
-/// Data Transfer Object representing certificate information for an envelope.
-/// </summary>
-[ApiExplorerSettings(IgnoreApi = true)]
-public class EnvelopeCertificateDto
-{
-    /// <summary>
-    /// Gets the unique identifier of the certificate.
-    /// </summary>
-    public int Id { get; init; }
-
-    /// <summary>
-    /// Gets the envelope ID associated with the certificate.
-    /// </summary>
-    public int EnvelopeId { get; init; }
-
-    /// <summary>
-    /// Gets the UUID of the envelope.
-    /// </summary>
-    public string EnvelopeUuid { get; init; } = string.Empty;
-
-    /// <summary>
-    /// Gets the subject of the envelope.
-    /// </summary>
-    public string EnvelopeSubject { get; init; } = string.Empty;
-
-    /// <summary>
-    /// Gets the ID of the creator of the envelope.
-    /// </summary>
-    public int CreatorId { get; init; }
-
-    /// <summary>
-    /// Gets the name of the creator.
-    /// </summary>
-    public string CreatorName { get; init; } = string.Empty;
-
-    /// <summary>
-    /// Gets the email address of the creator.
-    /// </summary>
-    public string CreatorEmail { get; init; } = string.Empty;
-
-    /// <summary>
-    /// Gets the current status of the envelope.
-    /// </summary>
-    public int EnvelopeStatus { get; init; }
-}

EnvelopeGenerator.Application/DTOs/MappingProfile.cs

@@ -27,7 +27,6 @@ public class MappingProfile : Profile
         CreateMap<DocumentStatus, DocumentStatusDto>();
         CreateMap<EmailTemplate, EmailTemplateDto>();
         CreateMap<Envelope, EnvelopeDto>();
-        CreateMap<EnvelopeCertificate, EnvelopeCertificateDto>();
         CreateMap<EnvelopeDocument, EnvelopeDocumentDto>();
         CreateMap<Domain.Entities.EnvelopeHistory, EnvelopeHistoryDto>();
         CreateMap<Domain.Entities.EnvelopeHistory, EnvelopeHistoryCreateDto>();
@@ -45,7 +44,6 @@ public class MappingProfile : Profile
         CreateMap<DocumentStatusDto, DocumentStatus>();
         CreateMap<EmailTemplateDto, EmailTemplate>();
         CreateMap<EnvelopeDto, Envelope>();
-        CreateMap<EnvelopeCertificateDto, EnvelopeCertificate>();
         CreateMap<EnvelopeDocumentDto, EnvelopeDocument>();
         CreateMap<EnvelopeHistoryDto, Domain.Entities.EnvelopeHistory>();
         CreateMap<EnvelopeHistoryCreateDto, Domain.Entities.EnvelopeHistory>();

EnvelopeGenerator.Application/DependencyInjection.cs

@@ -33,7 +33,6 @@ public static class DependencyInjection
         services.TryAddScoped<IDocumentStatusService, DocumentStatusService>();
         services.TryAddScoped<IEmailTemplateService, EmailTemplateService>();
         services.TryAddScoped<IEnvelopeService, EnvelopeService>();
-        services.TryAddScoped<IEnvelopeCertificateService, EnvelopeCertificateService>();
         services.TryAddScoped<IEnvelopeDocumentService, EnvelopeDocumentService>();
         services.TryAddScoped<IEnvelopeReceiverService, EnvelopeReceiverService>();
         services.TryAddScoped<IEnvelopeTypeService, EnvelopeTypeService>();

EnvelopeGenerator.Application/EnvelopeGenerator.Application.csproj

@@ -20,11 +20,22 @@
 		<PackageReference Include="DigitalData.EmailProfilerDispatcher" Version="3.1.1" />
 		<PackageReference Include="MediatR" Version="12.5.0" />
 		<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.18" />
-		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.5" />
 		<PackageReference Include="Otp.NET" Version="1.4.0" />
 		<PackageReference Include="QRCoder" Version="1.6.0" />
 		<PackageReference Include="QRCoder-ImageSharp" Version="0.10.0" />
-		<PackageReference Include="UserManager" Version="1.1.1" />
+		<PackageReference Include="UserManager" Version="1.1.3" />
+	</ItemGroup>
+
+	<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
+		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
+	</ItemGroup>
+
+	<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
+		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.5" />
+	</ItemGroup>
+
+	<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
+		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.5" />
 	</ItemGroup>
 
 	<ItemGroup>

EnvelopeGenerator.Application/Services/EnvelopeCertificateService.cs

@@ -1,25 +0,0 @@
-using AutoMapper;
-using DigitalData.Core.Application;
-using EnvelopeGenerator.Application.DTOs;
-using EnvelopeGenerator.Domain.Entities;
-using EnvelopeGenerator.Application.Contracts.Repositories;
-using EnvelopeGenerator.Application.Contracts.Services;
-
-namespace EnvelopeGenerator.Application.Services;
-
-/// <summary>
-/// 
-/// </summary>
-[Obsolete("Use MediatR")]
-public class EnvelopeCertificateService : BasicCRUDService<IEnvelopeCertificateRepository, EnvelopeCertificateDto, EnvelopeCertificate, int>, IEnvelopeCertificateService
-{
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="repository"></param>
-    /// <param name="mapper"></param>
-    public EnvelopeCertificateService(IEnvelopeCertificateRepository repository, IMapper mapper)
-        : base(repository, mapper)
-    {
-    }
-}

EnvelopeGenerator.BBTests/frmFinalizePDF.vb

@@ -1,11 +1,10 @@
-Imports System.IO
+Imports DigitalData.Modules.Database
-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=;"
@@ -66,22 +65,6 @@ 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/EnvelopeGenerator.CommonServices.vbproj

@@ -84,8 +84,8 @@
     <Reference Include="DigitalData.Modules.Logging, Version=2.6.5.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\DigitalData.Modules.Logging.2.6.5\lib\net462\DigitalData.Modules.Logging.dll</HintPath>
     </Reference>
-    <Reference Include="DigitalData.UserManager.Domain, Version=3.2.1.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="DigitalData.UserManager.Domain, Version=3.2.3.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\UserManager.Domain.3.2.1\lib\net462\DigitalData.UserManager.Domain.dll</HintPath>
+      <HintPath>..\packages\UserManager.Domain.3.2.3\lib\net462\DigitalData.UserManager.Domain.dll</HintPath>
     </Reference>
     <Reference Include="DocumentFormat.OpenXml, Version=3.2.0.0, Culture=neutral, PublicKeyToken=8fb06cb64d019a17, processorArchitecture=MSIL">
       <HintPath>..\packages\DocumentFormat.OpenXml.3.2.0\lib\net46\DocumentFormat.OpenXml.dll</HintPath>

EnvelopeGenerator.CommonServices/Jobs/FinalizeDocument/FinalizeDocumentJob.vb

@@ -123,7 +123,6 @@ 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,8 +16,6 @@ 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)
@@ -71,14 +69,12 @@ Namespace Jobs.FinalizeDocument
             Try
                 Dim oAnnotationData = JsonConvert.DeserializeObject(Of AnnotationData)(pInstantJSON)
                 oAnnotationData.annotations.Reverse()
-                Dim formFieldIndex = 0, AnnotationIndex = 0, AnnotationImageIndex = 0
+                Dim formFieldIndex = 0
                 For Each oAnnotation In oAnnotationData.annotations
-                    AnnotationIndex += 1
+                    Logger.Debug("Adding AnnotationID: " + oAnnotation.id)
-                    Logger.Debug("Adding AnnotationID: " + oAnnotation.id + " -Index: " + AnnotationIndex.ToString)
                     Select Case oAnnotation.type
                         Case ANNOTATION_TYPE_IMAGE
-                            AnnotationImageIndex += 1
+                            AddImageAnnotation(oAnnotation, oAnnotationData.attachments)
-                            AddImageAnnotation(AnnotationImageIndex, oAnnotation, oAnnotationData.attachments)
 
                         Case ANNOTATION_TYPE_INK
                             AddInkAnnotation(oAnnotation)
@@ -102,26 +98,19 @@ Namespace Jobs.FinalizeDocument
             End Try
         End Function
 
-        Private Function AddImageAnnotation(pidX As Integer, pAnnotation As Annotation, pAttachments As Dictionary(Of String, Attachment)) As Boolean
+        Private Function AddImageAnnotation(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,9 +152,6 @@ Public Class ElementModel
                 pElement.Id = GetElementId(pElement)
                 Return True
             Else
-
-                Dim filledSql As String = GetFilledSql(oCommand)
-                Logger.Warn(filledSql)
                 Return False
             End If
 
@@ -164,26 +161,6 @@ 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

@@ -64,7 +64,7 @@ Public Class EnvelopeModel
         oEnvelope.Receivers = ReceiverModel.ListEnvelopeReceivers(oEnvelope.Id)
         oEnvelope.Documents = DocumentModel.List(oEnvelope.Id)
         oEnvelope.History = HistoryModel.List(oEnvelope.Id)
-        oEnvelope.EnvelopeType = EnvelopeTypeModel.GetById(oEnvelope.EnvelopeTypeId)
+        oEnvelope.Type = EnvelopeTypeModel.GetById(oEnvelope.EnvelopeTypeId)
 
         Return oEnvelope
     End Function

EnvelopeGenerator.CommonServices/packages.config

@@ -43,5 +43,5 @@
   <package id="System.Text.Json" version="8.0.5" targetFramework="net462" />
   <package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net462" />
   <package id="System.ValueTuple" version="4.5.0" targetFramework="net462" />
-  <package id="UserManager.Domain" version="3.2.1" targetFramework="net462" />
+  <package id="UserManager.Domain" version="3.2.3" targetFramework="net462" />
 </packages>

EnvelopeGenerator.Domain/Entities/Config.cs

@@ -2,22 +2,30 @@
 using System.ComponentModel.DataAnnotations.Schema;
 
 namespace EnvelopeGenerator.Domain.Entities
-{
+#if NET
-    [Table("TBSIG_CONFIG", Schema = "dbo")]
+    ;
-    public class Config
+#elif NETFRAMEWORK
     {
-        [Column("SENDING_PROFILE", TypeName = "int")]
+#endif
-        [Required]
-        public int SendingProfile { get; set; }
 
-        [Column("SIGNATURE_HOST", TypeName = "nvarchar(128)")]
+[Table("TBSIG_CONFIG", Schema = "dbo")]
-        [Required]
+public class Config
-        public string SignatureHost { get; set; }
+{
+    [Column("SENDING_PROFILE", TypeName = "int")]
+    [Required]
+    public int SendingProfile { get; set; }
 
-        [Column("EXTERNAL_PROGRAM_NAME", TypeName = "nvarchar(30)")]
+    [Column("SIGNATURE_HOST", TypeName = "nvarchar(128)")]
-        public string ExternalProgramName { get; set; }
+    [Required]
+    public string SignatureHost { get; set; }
 
-        [Column("EXPORT_PATH", TypeName = "nvarchar(256)")]
+    [Column("EXTERNAL_PROGRAM_NAME", TypeName = "nvarchar(30)")]
-        public string ExportPath { get; set; }
+    public string ExternalProgramName { get; set; }
+
+    [Column("EXPORT_PATH", TypeName = "nvarchar(256)")]
+    public string ExportPath { get; set; }
+}
+
+#if NETFRAMEWORK
     }
-}
+#endif

EnvelopeGenerator.Domain/Entities/DocumentReceiverElement.cs

@@ -6,93 +6,110 @@ using System;
 #endif
 
 namespace EnvelopeGenerator.Domain.Entities
+#if NET
+    ;
+#elif NETFRAMEWORK
+    {
+#endif
+
+[Table("TBSIG_DOCUMENT_RECEIVER_ELEMENT", Schema = "dbo")]
+public class DocumentReceiverElement
 {
-    [Table("TBSIG_DOCUMENT_RECEIVER_ELEMENT", Schema = "dbo")]
+    public DocumentReceiverElement()
-    public class DocumentReceiverElement
     {
         // TODO: * Check the Form App and remove the default value
-        [Key]
+#if NETFRAMEWORK
-        [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+        Id = -1;
-        [Column("GUID")]
+        Required = false;
-        public int Id { get; set; } = -1;
+        ReadOnly = false;
-
+        AnnotationIndex = 0;
-        [Required]
+#endif
-        [Column("DOCUMENT_ID")]
-        public int DocumentId { get; set; }
-
-        [Required]
-        [Column("RECEIVER_ID")]
-        public int ReceiverId { get; set; }
-
-        [Required]
-        [Column("ELEMENT_TYPE")]
-        [DefaultValue(0)]
-        public int ElementType { get; set; }
-
-        [Required]
-        [Column("POSITION_X")]
-        [DefaultValue(0)]
-        public double X { get; set; }
-
-        [Required]
-        [Column("POSITION_Y")]
-        [DefaultValue(0)]
-        public double Y { get; set; }
-
-        [Required]
-        [Column("WIDTH")]
-        [DefaultValue(0)]
-        public double Width { get; set; }
-
-        [Required]
-        [Column("HEIGHT")]
-        [DefaultValue(0)]
-        public double Height { get; set; }
-
-        [Required]
-        [Column("PAGE")]
-        [DefaultValue(1)]
-        public int Page { get; set; }
-
-        // TODO: * Check the Form App and remove the default value
-        [Required]
-        [Column("REQUIRED")]
-        [DefaultValue(false)]
-        public bool Required { get; set; } = false;
-
-        [Column("TOOLTIP")]
-        public string Tooltip { get; set; }
-
-        // TODO: * Check the Form App and remove the default value
-        [Required]
-        [Column("READ_ONLY")]
-        [DefaultValue(false)]
-        public bool ReadOnly { get; set; } = false;
-
-        // TODO: * Check the Form App and remove the default value
-        [Required]
-        [Column("ANNOTATION_INDEX")]
-        [DefaultValue(0)]
-        public int AnnotationIndex { get; set; } = 0;
-
-        [Required]
-        [Column("ADDED_WHEN", TypeName = "datetime")]
-        [DefaultValue("GETDATE()")]
-        public DateTime AddedWhen { get; set; }
-
-        [Column("CHANGED_WHEN", TypeName = "datetime")]
-        public DateTime ChangedWhen { get; set; }
-
-        [ForeignKey("DocumentId")]
-        public virtual EnvelopeDocument Document { get; set; }
-
-        [ForeignKey("ReceiverId")]
-        public virtual Receiver Receiver { get; set; }
-
-        [NotMapped]
-        public double Top => Math.Round(Y, 5);
-
-        [NotMapped]
-        public double Left => Math.Round(X, 5);
     }
-}
+
+    [Key]
+    [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+    [Column("GUID")]
+    public int Id { get; set; }
+
+    [Required]
+    [Column("DOCUMENT_ID")]
+    public int DocumentId { get; set; }
+
+    [Required]
+    [Column("RECEIVER_ID")]
+    public int ReceiverId { get; set; }
+
+    [Required]
+    [Column("ELEMENT_TYPE")]
+    [DefaultValue(0)]
+    public int ElementType { get; set; }
+
+    [Required]
+    [Column("POSITION_X")]
+    [DefaultValue(0)]
+    public double X { get; set; }
+
+    [Required]
+    [Column("POSITION_Y")]
+    [DefaultValue(0)]
+    public double Y { get; set; }
+
+    [Required]
+    [Column("WIDTH")]
+    [DefaultValue(0)]
+    public double Width { get; set; }
+
+    [Required]
+    [Column("HEIGHT")]
+    [DefaultValue(0)]
+    public double Height { get; set; }
+
+    [Required]
+    [Column("PAGE")]
+    [DefaultValue(1)]
+    public int Page { get; set; }
+
+    [Required]
+    [Column("REQUIRED")]
+    [DefaultValue(false)]
+    public bool Required { get; set; }
+
+    [Column("TOOLTIP")]
+    public string Tooltip { get; set; }
+
+    [Required]
+    [Column("READ_ONLY")]
+    [DefaultValue(false)]
+    public bool ReadOnly { get; set; }
+
+    [Required]
+    [Column("ANNOTATION_INDEX")]
+    [DefaultValue(0)]
+    public int AnnotationIndex { get; set; }
+
+    [Required]
+    [Column("ADDED_WHEN", TypeName = "datetime")]
+    [DefaultValue("GETDATE()")]
+    public DateTime AddedWhen { get; set; }
+
+    [Column("CHANGED_WHEN", TypeName = "datetime")]
+    public DateTime ChangedWhen { get; set; }
+
+    [ForeignKey("DocumentId")]
+    public virtual EnvelopeDocument Document { get; set; }
+
+    [ForeignKey("ReceiverId")]
+    public virtual Receiver Receiver { get; set; }
+
+#if NETFRAMEWORK
+    [NotMapped]
+    public double Top => Math.Round(Y, 5);
+
+    [NotMapped]
+    public double Left => Math.Round(X, 5);
+#endif
+}
+
+#if NETFRAMEWORK
+    }
+#endif

EnvelopeGenerator.Domain/Entities/DocumentStatus.cs

@@ -5,45 +5,44 @@ using System;
 #endif
 
 namespace EnvelopeGenerator.Domain.Entities
-{
+#if NET
-    [Table("TBSIG_DOCUMENT_STATUS", Schema = "dbo")]
+    ;
-    public class DocumentStatus
+#elif NETFRAMEWORK
     {
-        [Key]
+#endif
-        [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
-        [Column("GUID")]
-        public int Id { get; set; }
-
-        [Required]
-        [Column("ENVELOPE_ID")]
-        public int EnvelopeId { get; set; }
-
-        [Required]
-        [Column("RECEIVER_ID")]
-        public int ReceiverId { get; set; }
 
+[Table("TBSIG_DOCUMENT_STATUS", Schema = "dbo")]
+public class DocumentStatus
+{
+    public DocumentStatus()
+    {
         // TODO: * check Form Application and remove default value
-        [Required]
+#if NETFRAMEWORK
-        [Column("STATUS")]
+        Status = Constants.DocumentStatus.Created;
-        public Constants.DocumentStatus Status { get; set; } = Constants.DocumentStatus.Created;
+#endif
-
-        [Column("STATUS_CHANGED_WHEN", TypeName = "datetime")]
-        public DateTime StatusChangedWhen { get; set; }
-
-        [Column("VALUE", TypeName = "nvarchar(max)")]
-        public string Value { get; set; }
-
-        [Required]
-        [Column("ADDED_WHEN", TypeName = "datetime")]
-        public DateTime AddedWhen { get; set; }
-
-        [Column("CHANGED_WHEN", TypeName = "datetime")]
-        public DateTime ChangedWhen { get; set; }
-
-        [ForeignKey("EnvelopeId")]
-        public virtual Envelope Envelope { get; set; }
-
-        [ForeignKey("ReceiverId")]
-        public virtual Receiver Receiver { get; set; }
     }
-}
+
+    [Key]
+    [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+    [Column("GUID")]
+    public int Id { get; set; }
+
+    [Required]
+    [Column("ENVELOPE_ID")]
+    public int EnvelopeId { get; set; }
+
+    [Required]
+    [Column("RECEIVER_ID")]
+    public int ReceiverId { get; set; }
+
+    [Required]
+    [Column("STATUS")]
+    public Constants.DocumentStatus Status { get; set; }
+
+    [Column("VALUE", TypeName = "nvarchar(max)")]
+    public string Value { get; set; }
+}
+
+#if NETFRAMEWORK
+    }
+#endif

EnvelopeGenerator.Domain/Entities/EmailTemplate.cs

@@ -6,30 +6,38 @@ using System;
 #endif
 
 namespace EnvelopeGenerator.Domain.Entities
-{
+#if NET
-    [Table("TBSIG_EMAIL_TEMPLATE", Schema = "dbo")]
+    ;
-    public class EmailTemplate
+#elif NETFRAMEWORK
     {
-        [Key]
+#endif
-        [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
-        [Column("GUID")]
-        public int Id { get; set; }
 
-        [Column("NAME", TypeName = "nvarchar(64)")]
+[Table("TBSIG_EMAIL_TEMPLATE", Schema = "dbo")]
-        public string Name { get; set; }
+public class EmailTemplate
+{
+    [Key]
+    [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+    [Column("GUID")]
+    public int Id { get; set; }
 
-        [Column("BODY", TypeName = "nvarchar(max)")]
+    [Column("NAME", TypeName = "nvarchar(64)")]
-        public string Body { get; set; }
+    public string Name { get; set; }
 
-        [Column("SUBJECT", TypeName = "nvarchar(512)")]
+    [Column("BODY", TypeName = "nvarchar(max)")]
-        public string Subject { get; set; }
+    public string Body { get; set; }
 
-        [Required]
+    [Column("SUBJECT", TypeName = "nvarchar(512)")]
-        [Column("ADDED_WHEN", TypeName = "datetime")]
+    public string Subject { get; set; }
-        [DefaultValue("GETDATE()")]
-        public DateTime AddedWhen { get; set; }
 
-        [Column("CHANGED_WHEN", TypeName = "datetime")]
+    [Required]
-        public DateTime ChangedWhen { get; set; }
+    [Column("ADDED_WHEN", TypeName = "datetime")]
+    [DefaultValue("GETDATE()")]
+    public DateTime AddedWhen { get; set; }
+
+    [Column("CHANGED_WHEN", TypeName = "datetime")]
+    public DateTime ChangedWhen { get; set; }
+}
+
+#if NETFRAMEWORK
     }
-}
+#endif

EnvelopeGenerator.Domain/Entities/Envelope.cs

@@ -8,164 +8,174 @@ using System.Linq;
 #endif
 
 namespace EnvelopeGenerator.Domain.Entities
+#if NET
+    ;
+#elif NETFRAMEWORK
+    {
+#endif
+
+[Table("TBSIG_ENVELOPE", Schema = "dbo")]
+public class Envelope
 {
-    [Table("TBSIG_ENVELOPE", Schema = "dbo")]
+    public Envelope()
-    public class Envelope
     {
         // TODO: * Check the Form App and remove the default value
-        [Key]
+#if NETFRAMEWORK
-        [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+        Id = 0;
-        [Column("GUID")]
+        Status = (int)Constants.EnvelopeStatus.EnvelopeCreated;
-        public int Id { get; set; } = 0;
+        Uuid = Guid.NewGuid().ToString();
-
+        Message = My.Resources.Envelope.Please_read_and_sign_this_document;
-        [Required]
+        Title= string.Empty;
-        [Column("USER_ID")]
+        Comment = string.Empty;
-        public int UserId { get; set; }
+        Language = "de-DE";
-
+        SendReminderEmails = false;
-        // TODO: * Check the Form App and remove the default value
+        FirstReminderDays = 0;
-        [Required]
+        ReminderIntervalDays = 0;
-        [Column("STATUS")]
+        CertificationType = (int)Constants.CertificationType.AdvancedElectronicSignature;
-        public int Status { get; set; } = (int)Constants.EnvelopeStatus.EnvelopeCreated;
+        UseAccessCode = false;
-
+        Documents = Enumerable.Empty<EnvelopeDocument>().ToList();
-        [NotMapped]
+        History = Enumerable.Empty<EnvelopeHistory>().ToList();
-        public string StatusName => ((Constants.EnvelopeStatus)Status).ToString();
+#endif
-
-        // TODO: The default value is set to 0. Check the Form App to remove this
-        [Required]
-        [Column("ENVELOPE_UUID", TypeName = "nvarchar(36)")]
-        public string Uuid { get; set; } = Guid.NewGuid().ToString();
-
-        // TODO: * Check the Form App and remove the default value
-        [Column("MESSAGE", TypeName = "nvarchar(max)")]
-        public string Message { get; set; } = My.Resources.Envelope.Please_read_and_sign_this_document;
-
-        [Column("EXPIRES_WHEN", TypeName = "datetime")]
-        public DateTime ExpiresWhen { get; set; }
-
-        [Column("EXPIRES_WARNING_WHEN", TypeName = "datetime")]
-        public DateTime ExpiresWarningWhen { get; set; }
-
-        [Required]
-        [Column("ADDED_WHEN", TypeName = "datetime")]
-        public DateTime AddedWhen { get; set; }
-
-        [Column("CHANGED_WHEN", TypeName = "datetime")]
-        public DateTime ChangedWhen { get; set; }
-
-        // TODO: * Check the Form App and remove the default value
-        [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; }
-
-        // TODO: * Check the Form App and remove the default value
-        [NotMapped]
-        public string ContractTypeTranslated => My.Resources.Model.ResourceManager.GetString(ContractType.ToString());
-
-        // TODO: * Check the Form App and remove the default value
-        [Column("LANGUAGE", TypeName = "nvarchar(5)")]
-        public string Language { get; set; } = "de-DE";
-
-        // TODO: * Check the Form App and remove the default value
-        [Column("SEND_REMINDER_EMAILS")]
-        public bool SendReminderEmails { get; set; } = false;
-
-        // TODO: * Check the Form App and remove the default value
-        [Column("FIRST_REMINDER_DAYS")]
-        public int FirstReminderDays { get; set; } = 0;
-
-        // TODO: * Check the Form App and remove the default value
-        [Column("REMINDER_INTERVAL_DAYS")]
-        public int ReminderIntervalDays { get; set; } = 0;
-
-        [Column("ENVELOPE_TYPE")]
-        public int EnvelopeTypeId { get; set; }
-
-        // TODO: * Check the Form App and remove the default value
-        [Column("CERTIFICATION_TYPE")]
-        public int CertificationType { get; set; } = (int)Constants.CertificationType.AdvancedElectronicSignature;
-
-        // TODO: * Check the Form App and remove the default value
-        [Column("USE_ACCESS_CODE")]
-        public bool UseAccessCode { get; set; } = false;
-
-        [Column("FINAL_EMAIL_TO_CREATOR")]
-        public int FinalEmailToCreator { get; set; }
-
-        [Column("FINAL_EMAIL_TO_RECEIVERS")]
-        public int FinalEmailToReceivers { get; set; }
-
-        [Column("EXPIRES_WHEN_DAYS")]
-        public int ExpiresWhenDays { get; set; }
-
-        [Column("EXPIRES_WARNING_WHEN_DAYS")]
-        public int ExpiresWarningWhenDays { get; set; }
-
-        // TODO: * Check the Form App and remove the default value
-        [Column("TFA_ENABLED", TypeName = "bit")]
-        public bool TFAEnabled { get; set; } = false;
-
-        [Column("DOC_RESULT", TypeName = "varbinary(max)")]
-        public byte[] DocResult { get; set; }
-
-        [NotMapped]
-        public string CURRENT_WORK_APP { get; set; } = "signFLOW GUI";
-
-        // TODO: * Check the Form App and remove the default value
-        [ForeignKey("UserId")]
-        public User User { get; set; }
-
-        [ForeignKey("EnvelopeTypeId")]
-        public EnvelopeType EnvelopeType { get; set; }
-
-        [NotMapped]
-        public string EnvelopeTypeTitle => EnvelopeType?.Title;
-
-        [NotMapped]
-        public bool IsAlreadySent => Status > (int)Constants.EnvelopeStatus.EnvelopeSaved;
-
-        [NotMapped]
-        public string StatusTranslated => My.Resources.Model.ResourceManager.GetString(((Constants.EnvelopeStatus)Status).ToString());
-
-        [NotMapped]
-        public bool TFA_Enabled { get; set; } = false;
-
-        [NotMapped]
-        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>
-        /// Validates whether the receiver and document data are complete.
-        /// </summary>
-        public List<string> ValidateReceiverDocumentData()
-        {
-            var errors = new List<string>();
-
-            if (!Documents?.Any() ?? true)
-                errors.Add(My.Resources.Envelope.Missing_Documents);
-
-            if (!Receivers?.Any() ?? true)
-                errors.Add(My.Resources.Envelope.Missing_Receivers);
-
-            if (Receivers?.Any(r => !r.HasEmailAndName) ?? false)
-                errors.Add(My.Resources.Envelope.Incomplete_Receivers);
-
-            return errors;
-        }
     }
-}
+        
+    [Key]
+    [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+    [Column("GUID")]
+    public int Id { get; set; }
+
+    [Required]
+    [Column("USER_ID")]
+    public int UserId { get; set; }
+
+    [Required]
+    [Column("STATUS")]
+    public int Status { get; set; }
+
+    [Required]
+    [Column("ENVELOPE_UUID", TypeName = "nvarchar(36)")]
+    public string Uuid { get; set; }
+
+    [Column("MESSAGE", TypeName = "nvarchar(max)")]
+    public string Message { get; set; }
+
+    [Column("EXPIRES_WHEN", TypeName = "datetime")]
+    public DateTime? ExpiresWhen { get; set; }
+
+    [Column("EXPIRES_WARNING_WHEN", TypeName = "datetime")]
+    public DateTime? ExpiresWarningWhen { get; set; }
+
+    [Required]
+    [Column("ADDED_WHEN", TypeName = "datetime")]
+    public DateTime AddedWhen { get; set; }
+
+    [Column("CHANGED_WHEN", TypeName = "datetime")]
+    public DateTime? ChangedWhen { get; set; }
+
+    [Column("TITLE", TypeName = "nvarchar(128)")]
+    public string
+#if NET
+        ?
+#endif
+        Title { get; set; }
+
+    [Column("COMMENT", TypeName = "nvarchar(128)")]
+    public string Comment { get; set; }
+
+    [Column("CONTRACT_TYPE")]
+    public int? ContractType { get; set; }
+
+#if NETFRAMEWORK
+    [NotMapped]
+    public string ContractTypeTranslated => My.Resources.Model.ResourceManager.GetString(ContractType.ToString());
+#endif
+
+    [Column("LANGUAGE", TypeName = "nvarchar(5)")]
+    public string Language { get; set; }
+
+    [Column("SEND_REMINDER_EMAILS")]
+    public bool SendReminderEmails { get; set; }
+
+    [Column("FIRST_REMINDER_DAYS")]
+    public int? FirstReminderDays { get; set; }
+
+    [Column("REMINDER_INTERVAL_DAYS")]
+    public int? ReminderIntervalDays { get; set; }
+
+    [Column("ENVELOPE_TYPE")]
+    public int? EnvelopeTypeId { get; set; }
+
+    [Column("CERTIFICATION_TYPE")]
+    public int? CertificationType { get; set; }
+
+    [Column("USE_ACCESS_CODE")]
+    public bool UseAccessCode { get; set; }
+
+    [Column("FINAL_EMAIL_TO_CREATOR")]
+    public int? FinalEmailToCreator { get; set; }
+
+    [Column("FINAL_EMAIL_TO_RECEIVERS")]
+    public int? FinalEmailToReceivers { get; set; }
+
+    [Column("EXPIRES_WHEN_DAYS")]
+    public int? ExpiresWhenDays { get; set; }
+
+    [Column("EXPIRES_WARNING_WHEN_DAYS")]
+    public int? ExpiresWarningWhenDays { get; set; }
+
+    [ForeignKey("UserId")]
+    public User User { get; set; }
+
+    [ForeignKey("EnvelopeTypeId")]
+    public virtual EnvelopeType
+#if NET
+        ?
+#endif
+        Type { get; set; }
+
+#if NETFRAMEWORK
+    [NotMapped]
+    public string CURRENT_WORK_APP { get; set; } = "signFLOW GUI";
+
+    [NotMapped]
+    public bool IsAlreadySent => Status > (int)Constants.EnvelopeStatus.EnvelopeSaved;
+
+    [NotMapped]
+    public bool TFA_Enabled { get; set; } = false;
+
+    [NotMapped]
+    public byte[] DOC_RESULT { get; set; }
+#endif
+
+    public List<EnvelopeDocument> Documents { get; set; }
+
+    public List<EnvelopeHistory> History { get; set; }
+
+    // TODO: * Check the Form App and remove the default value
+    [NotMapped]
+    public List<Receiver> Receivers { get; set; } = Enumerable.Empty<Receiver>().ToList();
+
+#if NETFRAMEWORK
+    /// <summary>
+    /// Validates whether the receiver and document data are complete.
+    /// </summary>
+    public List<string> ValidateReceiverDocumentData()
+    {
+        var errors = new List<string>();
+
+        if (!Documents?.Any() ?? true)
+            errors.Add(My.Resources.Envelope.Missing_Documents);
+
+        if (!Receivers?.Any() ?? true)
+            errors.Add(My.Resources.Envelope.Missing_Receivers);
+
+        if (Receivers?.Any(r => !r.HasEmailAndName) ?? false)
+            errors.Add(My.Resources.Envelope.Incomplete_Receivers);
+
+        return errors;
+    }
+#endif
+}
+
+#if NETFRAMEWORK
+    }
+#endif

EnvelopeGenerator.Domain/Entities/EnvelopeCertificate.cs

@@ -1,42 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-
-namespace EnvelopeGenerator.Domain.Entities
-{
-    [Table("TBSIG_ENVELOPE_CERTIFICATE", Schema = "dbo")]
-    public class EnvelopeCertificate
-    {
-        [Key]
-        [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
-        [Column("GUID")]
-        public int Id { get; set; }
-
-        [Required]
-        [Column("ENVELOPE_ID")]
-        public int EnvelopeId { get; set; }
-
-        [Required]
-        [Column("ENVELOPE_UUID", TypeName = "nvarchar(36)")]
-        public string EnvelopeUuid { get; set; }
-
-        [Required]
-        [Column("ENVELOPE_SUBJECT", TypeName = "nvarchar(512)")]
-        public string EnvelopeSubject { get; set; }
-
-        [Required]
-        [Column("CREATOR_ID")]
-        public int CreatorId { get; set; }
-
-        [Required]
-        [Column("CREATOR_NAME", TypeName = "nvarchar(128)")]
-        public string CreatorName { get; set; }
-
-        [Required]
-        [Column("CREATOR_EMAIL", TypeName = "nvarchar(128)")]
-        public string CreatorEmail { get; set; }
-
-        [Required]
-        [Column("ENVELOPE_STATUS")]
-        public int EnvelopeStatus { get; set; }
-    }
-}

EnvelopeGenerator.Domain/Entities/EnvelopeDocument.cs

@@ -1,51 +1,64 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
-using System.Drawing;
 #if NETFRAMEWORK
-using System;
+using System.Drawing;
 using System.Collections.Generic;
+using System.Linq;
 #endif
 
 namespace EnvelopeGenerator.Domain.Entities
-{
+#if NET
-    [Table("TBSIG_ENVELOPE_DOCUMENT", Schema = "dbo")]
+    ;
-    public class EnvelopeDocument
+#elif NETFRAMEWORK
     {
-        [Key]
+#endif
-        [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
-        [Column("GUID")]
-        public int Id { get; set; }
 
-        [Required]
+[Table("TBSIG_ENVELOPE_DOCUMENT", Schema = "dbo")]
-        [Column("ENVELOPE_ID")]
+public class EnvelopeDocument
-        public int EnvelopeId { get; set; } = 0;
+{
-
+    public EnvelopeDocument()
-        [Required]
+    {
-        [Column("ADDED_WHEN", TypeName = "datetime")]
+#if NETFRAMEWORK
-        public DateTime AddedWhen { get; set; }
+        Elements = Enumerable.Empty<DocumentReceiverElement>().ToList();
-
+#endif
-        [Column("BYTE_DATA", TypeName = "varbinary(max)")]
-        public byte[] ByteData { get; set; }
-
-        // TODO: * Check the Form App and remove the default value
-        public List<DocumentReceiverElement> Elements { get; set; } = new List<DocumentReceiverElement>();
-
-        [NotMapped]
-        public string FileNameOriginal { get; set; }
-
-        [NotMapped]
-        public bool IsTempFile { get; set; }
-
-        [NotMapped]
-        public string Filename { get; set; }
-
-        [NotMapped]
-        public string Filepath { get; set; }
-
-        [NotMapped]
-        public Bitmap Thumbnail { get; set; }
-
-        [NotMapped]
-        public int PageCount { get; set; }
     }
-}
+
+    [Key]
+    [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+    [Column("GUID")]
+    public int Id { get; set; }
+
+    [Required]
+    [Column("ENVELOPE_ID")]
+    public int EnvelopeId { get; set; } = 0;
+
+    [Column("BYTE_DATA", TypeName = "varbinary(max)")]
+    public byte[] ByteData { get; set; }
+
+    public List<DocumentReceiverElement> Elements { get; set; }
+
+    // TODO: * Check the Form App and remove the default value
+    [NotMapped]
+    public string Filepath { get; set; }
+
+#if NETFRAMEWORK
+    [NotMapped]
+    public string FileNameOriginal { get; set; }
+
+    [NotMapped]
+    public bool IsTempFile { get; set; }
+
+    [NotMapped]
+    public string Filename { get; set; }
+
+    [NotMapped]
+    public Bitmap Thumbnail { get; set; }
+
+    [NotMapped]
+    public int PageCount { get; set; }
+#endif
+}
+
+#if NETFRAMEWORK
+    }
+#endif

EnvelopeGenerator.Domain/Entities/EnvelopeHistory.cs

@@ -6,43 +6,53 @@ using System;
 #endif
 
 namespace EnvelopeGenerator.Domain.Entities
-{
+#if NET
-    [Table("TBSIG_ENVELOPE_HISTORY", Schema = "dbo")]
+    ;
-    public class EnvelopeHistory
+#elif NETFRAMEWORK
     {
-        [Key]
+#endif
-        [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
-        [Column("GUID")]
-        public long Id { get; set; }
 
-        [Required]
+[Table("TBSIG_ENVELOPE_HISTORY", Schema = "dbo")]
-        [Column("ENVELOPE_ID")]
+public class EnvelopeHistory
-        public int EnvelopeId { get; set; }
+{
+    [Key]
+    [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+    [Column("GUID")]
+    public long Id { get; set; }
 
-        [Required]
+    [Required]
-        [Column("USER_REFERENCE", TypeName = "nvarchar(128)")]
+    [Column("ENVELOPE_ID")]
-        public string UserReference { get; set; }
+    public int EnvelopeId { get; set; }
 
-        [Required]
+    [Required]
-        [Column("STATUS")]
+    [Column("USER_REFERENCE", TypeName = "nvarchar(128)")]
-        public Constants.EnvelopeStatus  Status { get; set; }
+    public string UserReference { get; set; }
 
-        [Required]
+    [Required]
-        [Column("ADDED_WHEN", TypeName = "datetime")]
+    [Column("STATUS")]
-        [DatabaseGenerated(DatabaseGeneratedOption.Computed)]
+    public Constants.EnvelopeStatus  Status { get; set; }
-        public DateTime AddedWhen { get; set; }
 
-        [Column("ACTION_DATE", TypeName = "datetime")]
+    [Required]
-        public DateTime ActionDate { get; set; } = DateTime.Now;
+    [Column("ADDED_WHEN", TypeName = "datetime")]
+    [DatabaseGenerated(DatabaseGeneratedOption.Computed)]
+    public DateTime AddedWhen { get; set; }
 
-        [Column("COMMENT", TypeName = "nvarchar(max)")]
+    [Column("ACTION_DATE", TypeName = "datetime")]
-        public string Comment { get; set; }
+    public DateTime ActionDate { get; set; } = DateTime.Now;
 
-        public virtual User Sender { get; set; }
+    [Column("COMMENT", TypeName = "nvarchar(max)")]
+    public string Comment { get; set; }
 
-        public virtual Receiver Receiver { get; set; }
+    public virtual User Sender { get; set; }
 
-        [NotMapped]
+    public virtual Receiver Receiver { get; set; }
-        public string StatusTranslated => My.Resources.Model.ResourceManager.GetString(Status.ToString());
+
+#if NETFRAMEWORK
+    [NotMapped]
+    public string StatusTranslated => My.Resources.Model.ResourceManager.GetString(Status.ToString());
+#endif
+}
+
+#if NETFRAMEWORK
     }
-}
+#endif

EnvelopeGenerator.Domain/Entities/EnvelopeReceiver.cs

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

EnvelopeGenerator.Domain/Entities/Receiver.cs

@@ -7,84 +7,94 @@ using System.Collections.Generic;
 #endif
 
 namespace EnvelopeGenerator.Domain.Entities
-{
+#if NET
-    [Table("TBSIG_RECEIVER", Schema = "dbo")]
+    ;
-    public class Receiver
+#elif NETFRAMEWORK
     {
-        [Key]
+#endif
-        [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
-        [Column("GUID")]
-        public int Id { get; set; }
 
-        [Required, EmailAddress]
+[Table("TBSIG_RECEIVER", Schema = "dbo")]
-        [Column("EMAIL_ADDRESS", TypeName = "nvarchar(250)")]
+public class Receiver
-        [StringLength(250)]
+{
-        public string EmailAddress { get; set; }
+    [Key]
+    [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+    [Column("GUID")]
+    public int Id { get; set; }
 
-        [Required]
+    [Required, EmailAddress]
-        [Column("SIGNATURE", TypeName = "nvarchar(64)")]
+    [Column("EMAIL_ADDRESS", TypeName = "nvarchar(250)")]
-        public string Signature { get; set; }
+    [StringLength(250)]
+    public string EmailAddress { get; set; }
 
-        [Required]
+    [Required]
-        [Column("ADDED_WHEN", TypeName = "datetime")]
+    [Column("SIGNATURE", TypeName = "nvarchar(64)")]
-        public DateTime AddedWhen { get; set; }
+    public string Signature { get; set; }
 
-        [Column("TOTP_SECRET_KEY", TypeName = "nvarchar(MAX)")]
+    [Required]
-        public string TotpSecretkey { get; set; }
+    [Column("ADDED_WHEN", TypeName = "datetime")]
+    public DateTime AddedWhen { get; set; }
 
-        [Column("TFA_REG_DEADLINE", TypeName = "datetime")]
+    [Column("TOTP_SECRET_KEY", TypeName = "nvarchar(MAX)")]
-        public DateTime TfaRegDeadline { get; set; }
+    public string TotpSecretkey { get; set; }
 
-        public List<EnvelopeReceiver> EnvelopeReceivers { get; set; }
+    [Column("TFA_REG_DEADLINE", TypeName = "datetime")]
+    public DateTime? TfaRegDeadline { get; set; }
 
-        [NotMapped]
+    public List<EnvelopeReceiver> EnvelopeReceivers { get; set; }
-        public string Name { get; set; }
 
-        [NotMapped]
+#if NETFRAMEWORK
-        public string Company { get; set; } = string.Empty;
+    [NotMapped]
+    public string Name { get; set; }
 
-        [NotMapped]
+    [NotMapped]
-        public string JobTitle { get; set; } = string.Empty;
+    public string Company { get; set; } = string.Empty;
 
-        [NotMapped]
+    [NotMapped]
-        public string PhoneNumber { get; set; } = string.Empty;
+    public string JobTitle { get; set; } = string.Empty;
 
-        [NotMapped]
+    [NotMapped]
-        public string AccessCode { get; set; } = string.Empty;
+    public string PhoneNumber { get; set; } = string.Empty;
 
-        [NotMapped]
+    [NotMapped]
-        public string PrivateMessage { get; set; } = string.Empty;
+    public string AccessCode { get; set; } = string.Empty;
 
-        [NotMapped]
+    [NotMapped]
-        public int Sequence { get; set; } = 0;
+    public string PrivateMessage { get; set; } = string.Empty;
 
-        [NotMapped]
+    [NotMapped]
-        public DateTime SignedDate { get; set; } = DateTime.MinValue;
+    public int Sequence { get; set; } = 0;
 
-        [NotMapped]
+    [NotMapped]
-        public Constants.ReceiverStatus Status { get; set; }
+    public DateTime SignedDate { get; set; } = DateTime.MinValue;
 
-        [NotMapped]
+    [NotMapped]
-        public Constants.ColorType ColorType { get; set; }
+    public Constants.ReceiverStatus Status { get; set; }
 
-        [NotMapped]
+    [NotMapped]
-        public bool HasId => Id > 0;
+    public Constants.ColorType ColorType { get; set; }
 
-        [NotMapped]
+    [NotMapped]
-        public bool HasEmailAndName =>
+    public bool HasId => Id > 0;
-            !string.IsNullOrWhiteSpace(EmailAddress) &&
-            !string.IsNullOrWhiteSpace(Name);
 
-        [NotMapped]
+    [NotMapped]
-        public string SignedDateDisplayValue =>
+    public bool HasEmailAndName =>
-            SignedDate == DateTime.MinValue ? "-" : SignedDate.ToString("G");
+        !string.IsNullOrWhiteSpace(EmailAddress) &&
+        !string.IsNullOrWhiteSpace(Name);
 
-        [NotMapped]
+    [NotMapped]
-        public Color Color => ColorType.ToColor();
+    public string SignedDateDisplayValue =>
+        SignedDate == DateTime.MinValue ? "-" : SignedDate.ToString("G");
 
-        public string GetSignature()
+    [NotMapped]
-        {
+    public Color Color => ColorType.ToColor();
-            return EmailAddress.ToUpperInvariant().GetChecksum();
+
-        }
+    public string GetSignature()
+    {
+        return EmailAddress.ToUpperInvariant().GetChecksum();
     }
-}
+#endif
+}
+
+#if NETFRAMEWORK
+    }
+#endif

EnvelopeGenerator.Domain/EnvelopeGenerator.Domain.csproj

@@ -35,7 +35,7 @@
 
   <ItemGroup>
     <PackageReference Include="DigitalData.EmailProfilerDispatcher.Abstraction.Attributes" Version="1.0.0" />
-    <PackageReference Include="UserManager.Domain" Version="3.2.1" />
+    <PackageReference Include="UserManager.Domain" Version="3.2.3" />
   </ItemGroup>
 
   <ItemGroup>

EnvelopeGenerator.Extensions/EnvelopeGenerator.Extensions.csproj

@@ -13,7 +13,7 @@
 
   <ItemGroup>
     <PackageReference Include="HtmlSanitizer" Version="8.0.865" />
-    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="9.0.4" />
+    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="8.0.1" />
     <PackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="7.0.19" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
     <PackageReference Include="Otp.NET" Version="1.4.0" />

EnvelopeGenerator.Form/Controllers/EnvelopeEditorController.vb

@@ -50,11 +50,6 @@ Public Class EnvelopeEditorController
     Public Function ValidateEnvelopeForSending(pErrors As List(Of String)) As List(Of String)
         Dim oEnvelopeErrors = pErrors
 
-        Dim requiresSignature = (Envelope.ContractType = ContractType.ReadAndSign)
-        If requiresSignature = False Then
-            Return oEnvelopeErrors
-        End If
-
         If ElementModel.ElementsExist(Envelope.Id) = False Then
             oEnvelopeErrors.Add(Resources.Envelope.Missing_Elements)
         End If

EnvelopeGenerator.Form/EnvelopeGenerator.Form.vbproj

@@ -101,8 +101,8 @@
     <Reference Include="DigitalData.Modules.Messaging, Version=1.9.8.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\DigitalData.Modules.Messaging.1.9.8\lib\net462\DigitalData.Modules.Messaging.dll</HintPath>
     </Reference>
-    <Reference Include="DigitalData.UserManager.Domain, Version=3.2.2.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="DigitalData.UserManager.Domain, Version=3.2.3.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\UserManager.Domain.3.2.2\lib\net462\DigitalData.UserManager.Domain.dll</HintPath>
+      <HintPath>..\packages\UserManager.Domain.3.2.3\lib\net462\DigitalData.UserManager.Domain.dll</HintPath>
     </Reference>
     <Reference Include="DocumentFormat.OpenXml, Version=3.2.0.0, Culture=neutral, PublicKeyToken=8fb06cb64d019a17, processorArchitecture=MSIL">
       <HintPath>..\packages\DocumentFormat.OpenXml.3.2.0\lib\net46\DocumentFormat.OpenXml.dll</HintPath>

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, 418)
+        Me.LayoutControlGroup4.Size = New System.Drawing.Size(251, 530)
         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, 418)
+        Me.LayoutControlGroup5.Size = New System.Drawing.Size(251, 530)
         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, 373)
+        Me.LayoutControlItem5.Size = New System.Drawing.Size(227, 485)
         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(796, 249)
+        Me.LayoutControlGroup2.Size = New System.Drawing.Size(899, 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(796, 249)
+        Me.LayoutControlGroup3.Size = New System.Drawing.Size(899, 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(772, 204)
+        Me.LayoutControlItem2.Size = New System.Drawing.Size(875, 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(796, 151)
+        Me.Root.Size = New System.Drawing.Size(899, 263)
         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(796, 151)
+        Me.LayoutControlGroup1.Size = New System.Drawing.Size(899, 263)
         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(770, 104)
+        Me.LayoutControlItem3.Size = New System.Drawing.Size(873, 216)
         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>1061, 132</value>
+    <value>1164, 132</value>
   </data>
   <data name="RibbonStatusBar1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 550</value>
+    <value>0, 662</value>
   </data>
   <data name="RibbonStatusBar1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1061, 22</value>
+    <value>1164, 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, 369</value>
+    <value>223, 481</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, 418</value>
+    <value>251, 530</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>54</value>
+    <value>32</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>768, 200</value>
+    <value>871, 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>796, 249</value>
+    <value>899, 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>800, 253</value>
+    <value>903, 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>750, 68</value>
+    <value>853, 180</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>796, 151</value>
+    <value>899, 263</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>800, 155</value>
+    <value>903, 267</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>800, 418</value>
+    <value>903, 530</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>1061, 418</value>
+    <value>1164, 530</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>1061, 572</value>
+    <value>1164, 684</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/frmEnvelopeMainData.vb

@@ -68,17 +68,17 @@ Public Class frmEnvelopeMainData
                 chked_2Faktor.EditValue = DEF_TF_ENABLED
 
             Else
-                If IsNothing(Envelope.EnvelopeType) Then
+                If IsNothing(Envelope.Type) Then
-                    Envelope.EnvelopeType = EnvelopeType
+                    Envelope.Type = EnvelopeType
                 End If
-                If Envelope.EnvelopeType.ContractType = 0 Then
+                If Envelope.Type.ContractType = 0 Then
                     cmbEnvelopeType.EditValue = EnvelopeType
                 Else
                     ' This will trigger loading values from the type
-                    cmbEnvelopeType.EditValue = Envelope.EnvelopeType
+                    cmbEnvelopeType.EditValue = Envelope.Type
-                    ' cmbEnvelopeType.SelectedIndex = Convert.ToInt32(Envelope.EnvelopeType) - 1
+                    ' cmbEnvelopeType.SelectedIndex = Convert.ToInt32(Envelope.Type) - 1
                     ' cmbEnvelopeType.SelectedIndex = Envelope.Type.Id - 1
-                    ' cmbEnvelopeType.SelectedItem = cmbEnvelopeType.Properties.Items.Cast(Of EnvelopeType).Where(Function(i) i.Id = Envelope.EnvelopeType.Id).SingleOrDefault()
+                    ' cmbEnvelopeType.SelectedItem = cmbEnvelopeType.Properties.Items.Cast(Of Type).Where(Function(i) i.Id = Envelope.Type.Id).SingleOrDefault()
                 End If
 
 
@@ -126,7 +126,7 @@ Public Class frmEnvelopeMainData
             oEnvelopeType = EnvelopeType
         End If
         Envelope.Title = txtTitle.EditValue.ToString
-        Envelope.EnvelopeType = oEnvelopeType
+        Envelope.Type = oEnvelopeType
         Envelope.EnvelopeTypeId = IIf(IsNothing(oEnvelopeType), 0, oEnvelopeType.Id)
         Envelope.CertificationType = cmbCertificationType.SelectedIndex + 1
         Envelope.Language = cmbLanguage.EditValue

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, 132</value>
+    <value>0, 59</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, 402</value>
+    <value>199, 600</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>577, 402</value>
+    <value>917, 600</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>786, 402</value>
+    <value>1126, 600</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>786, 132</value>
+    <value>1126, 88</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>786, 0</value>
+    <value>1126, 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, 534</value>
+    <value>0, 659</value>
   </data>
   <data name="barDockControlBottom.Size" type="System.Drawing.Size, System.Drawing">
-    <value>786, 0</value>
+    <value>1126, 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, 534</value>
+    <value>0, 659</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>786, 0</value>
+    <value>1126, 0</value>
   </data>
   <data name="barDockControlRight.Size" type="System.Drawing.Size, System.Drawing">
-    <value>0, 534</value>
+    <value>0, 659</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>786, 534</value>
+    <value>1689, 988</value>
   </data>
   <data name="$this.Font" type="System.Drawing.Font, System.Drawing">
     <value>Segoe UI, 8.25pt</value>

EnvelopeGenerator.Form/frmMain.Designer.vb

@@ -67,12 +67,10 @@ 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()
@@ -114,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()
@@ -169,7 +169,7 @@ Partial Class frmMain
         'SplitContainerControl1.Panel2
         '
         resources.ApplyResources(Me.SplitContainerControl1.Panel2, "SplitContainerControl1.Panel2")
-        Me.SplitContainerControl1.SplitterPosition = 335
+        Me.SplitContainerControl1.SplitterPosition = 272
         '
         'XtraTabControlMain
         '
@@ -181,8 +181,8 @@ Partial Class frmMain
         'XtraTabPage1
         '
         Me.XtraTabPage1.Controls.Add(Me.GridEnvelopes)
-        resources.ApplyResources(Me.XtraTabPage1, "XtraTabPage1")
         Me.XtraTabPage1.Name = "XtraTabPage1"
+        resources.ApplyResources(Me.XtraTabPage1, "XtraTabPage1")
         '
         'GridEnvelopes
         '
@@ -191,7 +191,6 @@ 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
@@ -208,7 +207,6 @@ 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
@@ -223,7 +221,6 @@ 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
         '
@@ -231,7 +228,6 @@ 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
         '
@@ -239,7 +235,6 @@ 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
         '
@@ -247,7 +242,6 @@ 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
         '
@@ -255,20 +249,17 @@ 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
@@ -281,14 +272,12 @@ 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
@@ -297,13 +286,11 @@ 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
@@ -315,28 +302,24 @@ 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
@@ -345,7 +328,6 @@ 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
@@ -354,12 +336,10 @@ 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)
@@ -367,7 +347,6 @@ Partial Class frmMain
         resources.ApplyResources(Me.RibbonControl, "RibbonControl")
         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
@@ -531,13 +510,6 @@ 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.RibbonPageGroupReceiver})
@@ -568,16 +540,6 @@ Partial Class frmMain
         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})
@@ -605,8 +567,8 @@ Partial Class frmMain
         'XtraTabPage2
         '
         Me.XtraTabPage2.Controls.Add(Me.GridCompleted)
-        resources.ApplyResources(Me.XtraTabPage2, "XtraTabPage2")
         Me.XtraTabPage2.Name = "XtraTabPage2"
+        resources.ApplyResources(Me.XtraTabPage2, "XtraTabPage2")
         '
         'GridCompleted
         '
@@ -615,7 +577,6 @@ 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
@@ -632,7 +593,6 @@ 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
@@ -647,34 +607,29 @@ 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
@@ -689,14 +644,12 @@ 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
@@ -705,13 +658,11 @@ 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.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
@@ -723,28 +674,25 @@ 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.MinWidth = 80
         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
@@ -753,7 +701,6 @@ 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
@@ -762,15 +709,14 @@ 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)
-        resources.ApplyResources(Me.XtraTabPageAdmin, "XtraTabPageAdmin")
         Me.XtraTabPageAdmin.Name = "XtraTabPageAdmin"
+        resources.ApplyResources(Me.XtraTabPageAdmin, "XtraTabPageAdmin")
         '
         'SplitContainerControl2
         '
@@ -785,12 +731,11 @@ Partial Class frmMain
         'SplitContainerControl2.Panel2
         '
         resources.ApplyResources(Me.SplitContainerControl2.Panel2, "SplitContainerControl2.Panel2")
-        Me.SplitContainerControl2.SplitterPosition = 1209
+        Me.SplitContainerControl2.SplitterPosition = 907
         '
         '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"
@@ -798,7 +743,6 @@ Partial Class frmMain
         '
         'GridViewData
         '
-        Me.GridViewData.DetailHeight = 431
         Me.GridViewData.GridControl = Me.GridControlData
         Me.GridViewData.Name = "GridViewData"
         Me.GridViewData.OptionsView.ShowAutoFilterRow = True
@@ -873,8 +817,8 @@ Partial Class frmMain
         Me.XtraTabPage3.Controls.Add(Me.Label1)
         Me.XtraTabPage3.Controls.Add(Me.Button1)
         Me.XtraTabPage3.Controls.Add(Me.txtEnvID)
-        resources.ApplyResources(Me.XtraTabPage3, "XtraTabPage3")
         Me.XtraTabPage3.Name = "XtraTabPage3"
+        resources.ApplyResources(Me.XtraTabPage3, "XtraTabPage3")
         '
         'Label1
         '
@@ -904,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")

EnvelopeGenerator.Form/frmMain.vb

@@ -269,7 +269,6 @@ 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
 
@@ -796,13 +795,10 @@ 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
@@ -825,6 +821,7 @@ 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
@@ -925,49 +922,4 @@ Public Class frmMain
         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.Form/packages.config

@@ -50,5 +50,5 @@
   <package id="System.Text.Json" version="9.0.0" targetFramework="net462" />
   <package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net462" />
   <package id="System.ValueTuple" version="4.5.0" targetFramework="net462" />
-  <package id="UserManager.Domain" version="3.2.2" targetFramework="net462" />
+  <package id="UserManager.Domain" version="3.2.3" targetFramework="net462" />
 </packages>

EnvelopeGenerator.Infrastructure/DependencyExtensions.cs

@@ -48,7 +48,6 @@ public static class DIExtensions
         services.TryAddScoped<IDocumentStatusRepository, DocumentStatusRepository>();
         services.TryAddScoped<IEmailTemplateRepository, EmailTemplateRepository>();
         services.TryAddScoped<IEnvelopeRepository, EnvelopeRepository>();
-        services.TryAddScoped<IEnvelopeCertificateRepository, EnvelopeCertificateRepository>();
         services.TryAddScoped<IEnvelopeHistoryRepository, EnvelopeHistoryRepository>();
         services.TryAddScoped<IEnvelopeReceiverRepository, EnvelopeReceiverRepository>();
         services.TryAddScoped<IEnvelopeTypeRepository, EnvelopeTypeRepository>();
@@ -61,7 +60,6 @@ public static class DIExtensions
         services.AddDbRepository<EGDbContext, DocumentStatus>(context => context.DocumentStatus).UseAutoMapper();
         services.AddDbRepository<EGDbContext, EmailTemplate>(context => context.EmailTemplate).UseAutoMapper();
         services.AddDbRepository<EGDbContext, Envelope>(context => context.Envelopes).UseAutoMapper();
-        services.AddDbRepository<EGDbContext, EnvelopeCertificate>(context => context.EnvelopeCertificates).UseAutoMapper();
         services.AddDbRepository<EGDbContext, EnvelopeHistory>(context => context.EnvelopeHistories).UseAutoMapper();
         services.AddDbRepository<EGDbContext, EnvelopeReceiver>(context => context.EnvelopeReceivers).UseAutoMapper();
         services.AddDbRepository<EGDbContext, EnvelopeType>(context => context.EnvelopeTypes).UseAutoMapper();

EnvelopeGenerator.Infrastructure/EGDbContext.cs

@@ -29,8 +29,6 @@ public class EGDbContext : DbContext, IUserManagerDbContext, IMailDbContext
 
     public DbSet<EmailTemplate> EmailTemplate { get; set; }
 
-    public DbSet<EnvelopeCertificate> EnvelopeCertificates { get; set; }
-
     public DbSet<EnvelopeDocument> EnvelopeDocument { get; set; }
 
     public DbSet<EnvelopeHistory> EnvelopeHistories { get; set; }
@@ -73,7 +71,6 @@ public class EGDbContext : DbContext, IUserManagerDbContext, IMailDbContext
         Envelopes = Set<Envelope>();
         DocumentReceiverElements = Set<DocumentReceiverElement>();
         DocumentStatus = Set<DocumentStatus>();
-        EnvelopeCertificates = Set<EnvelopeCertificate>();
         EnvelopeDocument = Set<EnvelopeDocument>();
         EnvelopeHistories = Set<EnvelopeHistory>();
         EnvelopeTypes = Set<EnvelopeType>();
@@ -101,7 +98,6 @@ public class EGDbContext : DbContext, IUserManagerDbContext, IMailDbContext
         modelBuilder.Entity<DocumentStatus>();
         modelBuilder.Entity<EmailTemplate>();
         modelBuilder.Entity<Envelope>();
-        modelBuilder.Entity<EnvelopeCertificate>();
         modelBuilder.Entity<EnvelopeHistory>();
         modelBuilder.Entity<EnvelopeType>();
         modelBuilder.Entity<Receiver>();
@@ -165,7 +161,6 @@ public class EGDbContext : DbContext, IUserManagerDbContext, IMailDbContext
         AddTrigger<DocumentStatus>();
         AddTrigger<EmailTemplate>();
         AddTrigger<Envelope>();
-        AddTrigger<EnvelopeCertificate>();
         AddTrigger<EnvelopeDocument>();
         AddTrigger<EnvelopeHistory>();
         AddTrigger<EnvelopeReceiver>();

EnvelopeGenerator.Infrastructure/EnvelopeGenerator.Infrastructure.csproj

@@ -12,7 +12,7 @@
     <PackageReference Include="DigitalData.Core.Infrastructure" Version="2.1.1" />
     <PackageReference Include="DigitalData.Core.Infrastructure.AutoMapper" Version="1.0.3" />
     <PackageReference Include="DigitalData.EmailProfilerDispatcher" Version="3.1.1" />
-	<PackageReference Include="UserManager" Version="1.1.1" />
+	<PackageReference Include="UserManager" Version="1.1.3" />
   </ItemGroup>
 
   <ItemGroup>

EnvelopeGenerator.Infrastructure/Migrations/20250701151754_InitialCreate.Designer.cs

@@ -1053,7 +1053,7 @@ namespace EnvelopeGenerator.Infrastructure.Migrations
                         });
                 });
 
-            modelBuilder.Entity("EnvelopeGenerator.Domain.Entities.EnvelopeType", b =>
+            modelBuilder.Entity("EnvelopeGenerator.Domain.Entities.Type", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -1271,7 +1271,7 @@ namespace EnvelopeGenerator.Infrastructure.Migrations
 
             modelBuilder.Entity("EnvelopeGenerator.Domain.Entities.Envelope", b =>
                 {
-                    b.HasOne("EnvelopeGenerator.Domain.Entities.EnvelopeType", "EnvelopeType")
+                    b.HasOne("EnvelopeGenerator.Domain.Entities.Type", "Type")
                         .WithMany()
                         .HasForeignKey("EnvelopeTypeId")
                         .OnDelete(DeleteBehavior.Cascade)
@@ -1283,7 +1283,7 @@ namespace EnvelopeGenerator.Infrastructure.Migrations
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
-                    b.Navigation("EnvelopeType");
+                    b.Navigation("Type");
 
                     b.Navigation("User");
                 });

EnvelopeGenerator.Infrastructure/Migrations/EGDbContextModelSnapshot.cs

@@ -1050,7 +1050,7 @@ namespace EnvelopeGenerator.Infrastructure.Migrations
                         });
                 });
 
-            modelBuilder.Entity("EnvelopeGenerator.Domain.Entities.EnvelopeType", b =>
+            modelBuilder.Entity("EnvelopeGenerator.Domain.Entities.Type", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -1268,7 +1268,7 @@ namespace EnvelopeGenerator.Infrastructure.Migrations
 
             modelBuilder.Entity("EnvelopeGenerator.Domain.Entities.Envelope", b =>
                 {
-                    b.HasOne("EnvelopeGenerator.Domain.Entities.EnvelopeType", "EnvelopeType")
+                    b.HasOne("EnvelopeGenerator.Domain.Entities.Type", "Type")
                         .WithMany()
                         .HasForeignKey("EnvelopeTypeId")
                         .OnDelete(DeleteBehavior.Cascade)
@@ -1280,7 +1280,7 @@ namespace EnvelopeGenerator.Infrastructure.Migrations
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
-                    b.Navigation("EnvelopeType");
+                    b.Navigation("Type");
 
                     b.Navigation("User");
                 });

EnvelopeGenerator.Infrastructure/Repositories/EnvelopeCertificateRepository.cs

@@ -1,13 +0,0 @@
-using DigitalData.Core.Infrastructure;
-using EnvelopeGenerator.Domain.Entities;
-using EnvelopeGenerator.Application.Contracts.Repositories;
-
-namespace EnvelopeGenerator.Infrastructure.Repositories;
-
-[Obsolete("Use IRepository")]
-public class EnvelopeCertificateRepository : CRUDRepository<EnvelopeCertificate, int, EGDbContext>, IEnvelopeCertificateRepository
-{
-    public EnvelopeCertificateRepository(EGDbContext dbContext) : base(dbContext, dbContext.EnvelopeCertificates)
-    {
-    }
-}

EnvelopeGenerator.Web/Controllers/Test/TestEnvelopeCertificateController.cs

@@ -1,14 +0,0 @@
-using EnvelopeGenerator.Application.Contracts.Services;
-using EnvelopeGenerator.Application.DTOs;
-using EnvelopeGenerator.Domain.Entities;
-
-namespace EnvelopeGenerator.Web.Controllers.Test;
-
-[Obsolete("Use MediatR")]
-public class TestEnvelopeCertificateController : TestControllerBase<IEnvelopeCertificateService, EnvelopeCertificateDto, EnvelopeCertificate, int>
-{
-    public TestEnvelopeCertificateController(ILogger<TestEnvelopeCertificateController> logger, IEnvelopeCertificateService service) : base(logger, service)
-    {
-
-    }
-}

EnvelopeGenerator.Web/appsettings.Development.json

@@ -7,8 +7,5 @@
     }
   },
   "AdminPassword": "dd",
-  "UseCSPInDev": false,
+  "UseCSPInDev": false
-  "ConnectionStrings": {
-    "Default": "Server=sDD-VMP04-SQL19\\CURSORAG;Database=DD_ECM;User Id=sa;Password=dd;Encrypt=false;TrustServerCertificate=True;"
-  }
 }