refactor(card.css): CSS der footer für Reaktionsfähigkeit bearbeitet

- CSS hinzugefügt, um die Klasse btn-desktop auszublenden, wenn die Breite weniger als 1024px beträgt.

EnvelopeGenerator.Application/Configurations/DispatcherConfig.cs

@@ -0,0 +1,13 @@
+namespace EnvelopeGenerator.Application.Configurations
+{
+    public class DispatcherConfig
+    {
+        public int SendingProfile { get; init; } = 1;
+
+        public string AddedWho { get; init; } = "DDEnvelopGenerator";
+
+        public int ReminderTypeId { get; init; } = 202377;
+
+        public string EmailAttmt1 { get; init; } = string.Empty;
+    }
+}

EnvelopeGenerator.Application/Configurations/MailConfig.cs

@@ -0,0 +1,7 @@
+namespace EnvelopeGenerator.Application.Configurations
+{
+    public class MailConfig
+    {
+        public required Dictionary<string, string> Placeholders { get; init; }
+    }
+}

EnvelopeGenerator.Application/Contracts/IConfigService.cs

@@ -5,7 +5,7 @@ using EnvelopeGenerator.Domain.Entities;
 
 namespace EnvelopeGenerator.Application.Contracts
 {
-    public interface IConfigService : IBasicCRUDService<ConfigDto, Config, int>
+    public interface IConfigService : IReadService<ConfigDto, Config, int>
     {
         Task<DataResult<ConfigDto>> ReadFirstAsync();
 

EnvelopeGenerator.Application/Contracts/IEnvelopeHistoryService.cs

@@ -1,9 +1,8 @@
 using DigitalData.Core.Abstractions.Application;
 using DigitalData.Core.DTO;
-using EnvelopeGenerator.Application.DTOs;
 using EnvelopeGenerator.Application.DTOs.EnvelopeHistory;
+using EnvelopeGenerator.Application.DTOs.Receiver;
 using EnvelopeGenerator.Domain.Entities;
-using EnvelopeGenerator.Infrastructure.Contracts;
 using static EnvelopeGenerator.Common.Constants;
 
 namespace EnvelopeGenerator.Application.Contracts
@@ -22,7 +21,7 @@ namespace EnvelopeGenerator.Application.Contracts
 
         Task<IEnumerable<EnvelopeHistoryDto>> ReadRejectedAsync(int envelopeId, string? userReference = null);
 
-        Task<IEnumerable<ReceiverDto>> ReadRejectingReceivers(int envelopeId);
+        Task<IEnumerable<ReceiverReadDto>> ReadRejectingReceivers(int envelopeId);
 
 		Task<DataResult<long>> RecordAsync(int envelopeId, string userReference, EnvelopeStatus status, string? comment = null);
     }

EnvelopeGenerator.Application/Contracts/IEnvelopeMailService.cs

@@ -1,6 +1,7 @@
 using DigitalData.Core.DTO;
 using DigitalData.EmailProfilerDispatcher.Abstraction.Contracts;
-using EnvelopeGenerator.Application.DTOs;
+using EnvelopeGenerator.Application.DTOs.EnvelopeReceiver;
+using EnvelopeGenerator.Application.DTOs.EnvelopeReceiverReadOnly;
 using EnvelopeGenerator.Common;
 
 namespace EnvelopeGenerator.Application.Contracts
@@ -8,6 +9,9 @@ namespace EnvelopeGenerator.Application.Contracts
     public interface IEnvelopeMailService : IEmailOutService
     {
         Task<DataResult<int>> SendAsync(EnvelopeReceiverDto envelopeReceiverDto, Constants.EmailTemplateType tempType);
+
+        Task<DataResult<int>> SendAsync(EnvelopeReceiverReadOnlyDto dto);
+
         Task<DataResult<int>> SendAccessCodeAsync(EnvelopeReceiverDto envelopeReceiverDto);
     }
-}
+}

EnvelopeGenerator.Application/Contracts/IEnvelopeReceiverReadOnlyService.cs

@@ -0,0 +1,10 @@
+using DigitalData.Core.Abstractions.Application;
+using EnvelopeGenerator.Application.DTOs.EnvelopeReceiverReadOnly;
+using EnvelopeGenerator.Domain.Entities;
+
+namespace EnvelopeGenerator.Application.Contracts
+{
+    public interface IEnvelopeReceiverReadOnlyService : ICRUDService<EnvelopeReceiverReadOnlyCreateDto, EnvelopeReceiverReadOnlyDto, EnvelopeReceiverReadOnlyUpdateDto, EnvelopeReceiverReadOnly, long>
+    {
+    }
+}

EnvelopeGenerator.Application/Contracts/IEnvelopeReceiverService.cs

@@ -1,15 +1,18 @@
 using DigitalData.Core.Abstractions.Application;
 using DigitalData.Core.DTO;
-using EnvelopeGenerator.Application.DTOs;
+using EnvelopeGenerator.Application.DTOs.EnvelopeReceiver;
+using EnvelopeGenerator.Application.DTOs.Receiver;
 using EnvelopeGenerator.Domain.Entities;
 
 namespace EnvelopeGenerator.Application.Contracts
 {
-    public interface IEnvelopeReceiverService : IBasicCRUDService<EnvelopeReceiverDto, EnvelopeReceiver, object>
+    public interface IEnvelopeReceiverService : IBasicCRUDService<EnvelopeReceiverDto, EnvelopeReceiver, (int Envelope, int Receiver)>
     {
 
         Task<DataResult<IEnumerable<EnvelopeReceiverDto>>> ReadByUuidAsync(string uuid, bool withEnvelope = true, bool withReceiver = false);
 
+        Task<DataResult<IEnumerable<EnvelopeReceiverSecretDto>>> ReadSecretByUuidAsync(string uuid, bool withEnvelope = false, bool withReceiver = true);
+
         Task<DataResult<IEnumerable<EnvelopeReceiverDto>>> ReadBySignatureAsync(string signature, bool withEnvelope = false, bool withReceiver = true);
 
         Task<DataResult<EnvelopeReceiverDto>> ReadByUuidSignatureAsync(string uuid, string signature, bool withEnvelope = true, bool withReceiver = true);
@@ -24,6 +27,8 @@ namespace EnvelopeGenerator.Application.Contracts
 
         Task<DataResult<bool>> IsExisting(string envelopeReceiverId);
 
-        Task<DataResult<IEnumerable<EnvelopeReceiverDto>>> ReadByUsernameAsync(string username);
+        Task<DataResult<IEnumerable<EnvelopeReceiverDto>>> ReadByUsernameAsync(string username, int? min_status = null, int? max_status = null, params int[] ignore_statuses);
+
+        Task<DataResult<string?>> ReadLastUsedReceiverNameByMail(string mail);
     }
 }

EnvelopeGenerator.Application/Contracts/IEnvelopeService.cs

@@ -2,7 +2,6 @@
 using DigitalData.Core.DTO;
 using EnvelopeGenerator.Application.DTOs;
 using EnvelopeGenerator.Domain.Entities;
-using EnvelopeGenerator.Infrastructure.Contracts;
 
 namespace EnvelopeGenerator.Application.Contracts
 {
@@ -11,5 +10,7 @@ namespace EnvelopeGenerator.Application.Contracts
         Task<DataResult<IEnumerable<EnvelopeDto>>> ReadAllWithAsync(bool documents = false, bool history = false, bool documentReceiverElement = false);
 
         Task<DataResult<EnvelopeDto>> ReadByUuidAsync(string uuid, bool withDocuments = false, bool withHistory = false, bool withDocumentReceiverElement = false, bool withUser = false, bool withAll = false);
+
+        Task<DataResult<IEnumerable<EnvelopeDto>>> ReadByUserAsync(int userId, int? min_status = null, int? max_status = null, params int[]ignore_statuses);
     }
 }

EnvelopeGenerator.Application/Contracts/IReceiverService.cs

@@ -1,10 +1,14 @@
 using DigitalData.Core.Abstractions.Application;
-using EnvelopeGenerator.Application.DTOs;
+using DigitalData.Core.DTO;
+using EnvelopeGenerator.Application.DTOs.Receiver;
 using EnvelopeGenerator.Domain.Entities;
 
 namespace EnvelopeGenerator.Application.Contracts
 {
-    public interface IReceiverService : IBasicCRUDService<ReceiverDto, Receiver, int>
+    public interface IReceiverService : ICRUDService<ReceiverCreateDto, ReceiverReadDto, ReceiverUpdateDto, Receiver, int>
     {
+        public Task<DataResult<ReceiverReadDto>> ReadByAsync(string? emailAddress = null, string? signature = null);
+
+        public Task<Result> DeleteByAsync(string? emailAddress = null, string? signature = null);
     }
 }

EnvelopeGenerator.Application/Contracts/IUserReceiverService.cs

@@ -1,7 +1,6 @@
 using DigitalData.Core.Abstractions.Application;
 using EnvelopeGenerator.Application.DTOs;
 using EnvelopeGenerator.Domain.Entities;
-using EnvelopeGenerator.Infrastructure.Contracts;
 
 namespace EnvelopeGenerator.Application.Contracts
 {

EnvelopeGenerator.Application/DIExtensions.cs

@@ -1,21 +1,18 @@
 using DigitalData.UserManager.Application.MappingProfiles;
 using EnvelopeGenerator.Application.Contracts;
 using EnvelopeGenerator.Application.MappingProfiles;
+using EnvelopeGenerator.Application.Configurations;
 using EnvelopeGenerator.Application.Services;
 using EnvelopeGenerator.Infrastructure.Contracts;
 using EnvelopeGenerator.Infrastructure.Repositories;
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace EnvelopeGenerator.Application
 {
     public static class DIExtensions
     {
-        public static IServiceCollection AddEnvelopeGenerator(this IServiceCollection services)
+        public static IServiceCollection AddEnvelopeGenerator(this IServiceCollection services, IConfiguration dispatcherConfigSection, IConfiguration mailConfigSection)
         {
             //Inject CRUD Service and repositoriesad
             services.AddScoped<IConfigRepository, ConfigRepository>();
@@ -33,6 +30,7 @@ namespace EnvelopeGenerator.Application
             services.AddScoped<IEnvelopeTypeRepository, EnvelopeTypeRepository>();
             services.AddScoped<IReceiverRepository, ReceiverRepository>();
             services.AddScoped<IUserReceiverRepository, UserReceiverRepository>();
+            services.AddScoped<IEnvelopeReceiverReadOnlyRepository, EnvelopeReceiverReadOnlyRepository>();
             services.AddScoped<IConfigService, ConfigService>();
             services.AddScoped<IDocumentReceiverElementService, DocumentReceiverElementService>();
             services.AddScoped<IEnvelopeDocumentService, EnvelopeDocumentService>();
@@ -46,12 +44,20 @@ namespace EnvelopeGenerator.Application
             services.AddScoped<IEnvelopeTypeService, EnvelopeTypeService>();
             services.AddScoped<IReceiverService, ReceiverService>();
             services.AddScoped<IUserReceiverService, UserReceiverService>();
+            services.AddScoped<IEnvelopeReceiverReadOnlyService, EnvelopeReceiverReadOnlyService>();
 
             //Auto mapping profiles
             services.AddAutoMapper(typeof(BasicDtoMappingProfile).Assembly);
             services.AddAutoMapper(typeof(UserMappingProfile).Assembly);
 
+            services.Configure<DispatcherConfig>(dispatcherConfigSection);
+            services.Configure<MailConfig>(mailConfigSection);
+
             return services;
         }
+
+        public static IServiceCollection AddEnvelopeGenerator(this IServiceCollection services, IConfiguration config) => services.AddEnvelopeGenerator(
+            dispatcherConfigSection: config.GetSection("DispatcherConfig"),
+            mailConfigSection: config.GetSection("MailConfig"));
     }
-}
+}

EnvelopeGenerator.Application/DTOs/ConfigDto.cs

@@ -1,4 +1,7 @@
-namespace EnvelopeGenerator.Application.DTOs
+using DigitalData.Core.Abstractions;
+using System.Text.Json.Serialization;
+
+namespace EnvelopeGenerator.Application.DTOs
 {
     public record ConfigDto(
         string DocumentPath,
@@ -8,5 +11,10 @@
         string ExportPath,
         string DocumentPathDmz,
         string ExportPathDmz,
-        string DocumentPathMoveAftsend);
+        string DocumentPathMoveAftsend) : IUnique<int>
+    {
+        [JsonIgnore]
+        [Obsolete("Configuration does not have an ID; it represents a single table in the database.")]
+        public int Id => throw new InvalidOperationException("This configuration does not support an ID as it represents a single row in the database.");
+    };
 }

EnvelopeGenerator.Application/DTOs/DocumentReceiverElementDto.cs

@@ -1,4 +1,6 @@
-namespace EnvelopeGenerator.Application.DTOs
+using DigitalData.Core.Abstractions;
+
+namespace EnvelopeGenerator.Application.DTOs
 {
     public record DocumentReceiverElementDto(
         int Id,
@@ -18,5 +20,5 @@
         DateTime? ChangedWhen,
         double Top,
         double Left
-        );
+        ): IUnique<int>;
 }

EnvelopeGenerator.Application/DTOs/DocumentStatusDto.cs

@@ -1,4 +1,6 @@
-namespace EnvelopeGenerator.Application.DTOs
+using DigitalData.Core.Abstractions;
+
+namespace EnvelopeGenerator.Application.DTOs
 {
     public record DocumentStatusDto(
         int Id,
@@ -8,5 +10,5 @@
         DateTime? StatusChangedWhen,
         string Value,
         DateTime AddedWhen,
-        DateTime? ChangedWhen);
+        DateTime? ChangedWhen) : IUnique<int>;
 }

EnvelopeGenerator.Application/DTOs/EmailTemplateDto.cs

@@ -1,8 +1,10 @@
-namespace EnvelopeGenerator.Application.DTOs
+using DigitalData.Core.Abstractions;
+
+namespace EnvelopeGenerator.Application.DTOs
 {
     public record EmailTemplateDto(
         int Id,
         string Name,
         string Body,
-        string Subject);
+        string Subject) : IUnique<int>;
 }

EnvelopeGenerator.Application/DTOs/EnvelopeCertificateDto.cs

@@ -1,4 +1,6 @@
-namespace EnvelopeGenerator.Application.DTOs
+using DigitalData.Core.Abstractions;
+
+namespace EnvelopeGenerator.Application.DTOs
 {
     public record EnvelopeCertificateDto(
         int Id,
@@ -8,5 +10,5 @@
         int CreatorId,
         string CreatorName,
         string CreatorEmail,
-        int EnvelopeStatus);
+        int EnvelopeStatus) : IUnique<int>;
 }

EnvelopeGenerator.Application/DTOs/EnvelopeDocumentDto.cs

@@ -1,4 +1,6 @@
-namespace EnvelopeGenerator.Application.DTOs
+using DigitalData.Core.Abstractions;
+
+namespace EnvelopeGenerator.Application.DTOs
 {
     public record EnvelopeDocumentDto
     (
@@ -6,5 +8,5 @@
         int EnvelopeId,
         DateTime AddedWhen,
         IEnumerable<DocumentReceiverElementDto>? Elements
-    );
+    ) : IUnique<int>;
 }

EnvelopeGenerator.Application/DTOs/EnvelopeDto.cs

@@ -1,10 +1,11 @@
-using DigitalData.EmailProfilerDispatcher.Abstraction.Attributes;
+using DigitalData.Core.Abstractions;
+using DigitalData.EmailProfilerDispatcher.Abstraction.Attributes;
 using DigitalData.UserManager.Application.DTOs.User;
 using EnvelopeGenerator.Domain.Entities;
 
 namespace EnvelopeGenerator.Application.DTOs
 {
-    public record EnvelopeDto()
+    public record EnvelopeDto() : IUnique<int>
     {
 		public int Id { get; set; }
 
@@ -12,7 +13,9 @@ namespace EnvelopeGenerator.Application.DTOs
 
 		public int Status { get; set; }
 
-		public string Uuid { get; set; }
+		public string StatusName { get; set; }
+
+        public string Uuid { get; set; }
 
 		[TemplatePlaceholder("[MESSAGE]")]
 		public string Message { get; set; }

EnvelopeGenerator.Application/DTOs/EnvelopeHistory/EnvelopeHistoryDto.cs

@@ -1,5 +1,7 @@
-using DigitalData.Core.DTO;
+using DigitalData.Core.Abstractions;
+using DigitalData.Core.DTO;
 using DigitalData.UserManager.Application.DTOs.User;
+using EnvelopeGenerator.Application.DTOs.Receiver;
 using static EnvelopeGenerator.Common.Constants;
 
 namespace EnvelopeGenerator.Application.DTOs.EnvelopeHistory
@@ -9,10 +11,11 @@ namespace EnvelopeGenerator.Application.DTOs.EnvelopeHistory
         int EnvelopeId,
         string UserReference,
         int Status,
+        string? StatusName,
         DateTime AddedWhen,
         DateTime? ActionDate,
         UserCreateDto? Sender,
-        ReceiverDto? Receiver,
+        ReceiverReadDto? Receiver,
         ReferenceType ReferenceType,
-        string? Comment = null) : BaseDTO<long>(Id);
+        string? Comment = null) : BaseDTO<long>(Id), IUnique<long>;
 }

EnvelopeGenerator.Application/DTOs/EnvelopeReceiver/EnvelopeReceiverBasicDto.cs

@@ -0,0 +1,29 @@
+using DigitalData.Core.Abstractions;
+using DigitalData.EmailProfilerDispatcher.Abstraction.Attributes;
+
+namespace EnvelopeGenerator.Application.DTOs.EnvelopeReceiver
+{
+    public record EnvelopeReceiverBasicDto() : IUnique<(int Envelope, int Receiver)>
+    {
+        public (int Envelope, int Receiver) Id => (Envelope: EnvelopeId, Receiver: ReceiverId);
+
+        public int EnvelopeId { get; init; }
+
+        public int ReceiverId { get; init; }
+
+        public int Sequence { get; init; }
+
+        [TemplatePlaceholder("[NAME_RECEIVER]")]
+        public string? Name { get; init; }
+
+        public string? JobTitle { get; init; }
+
+        public string? CompanyName { get; init; }
+
+        public string? PrivateMessage { get; init; }
+
+        public DateTime AddedWhen { get; init; }
+
+        public DateTime? ChangedWhen { get; init; }
+    }
+}

EnvelopeGenerator.Application/DTOs/EnvelopeReceiver/EnvelopeReceiverDto.cs

@@ -0,0 +1,11 @@
+using EnvelopeGenerator.Application.DTOs.Receiver;
+
+namespace EnvelopeGenerator.Application.DTOs.EnvelopeReceiver
+{
+    public record EnvelopeReceiverDto() : EnvelopeReceiverBasicDto()
+    {
+        public EnvelopeDto? Envelope { get; set; }
+
+        public ReceiverReadDto? Receiver { get; set; }
+    }
+}

EnvelopeGenerator.Application/DTOs/EnvelopeReceiver/EnvelopeReceiverSecretDto.cs

@@ -0,0 +1,4 @@
+namespace EnvelopeGenerator.Application.DTOs.EnvelopeReceiver
+{
+    public record EnvelopeReceiverSecretDto(string? AccessCode) : EnvelopeReceiverDto;
+}

EnvelopeGenerator.Application/DTOs/EnvelopeReceiverDto.cs

@@ -1,30 +0,0 @@
-using DigitalData.EmailProfilerDispatcher.Abstraction.Attributes;
-
-namespace EnvelopeGenerator.Application.DTOs
-{
-    public record EnvelopeReceiverDto()
-    {
-		public int EnvelopeId { get; set; }
-
-		public int ReceiverId { get; set; }
-
-		public int Sequence { get; set; }
-
-		[TemplatePlaceholder("[NAME_RECEIVER]")]
-		public string? Name { get; set; }
-
-		public string? JobTitle { get; set; }
-
-		public string? CompanyName { get; set; }
-
-		public string? PrivateMessage { get; set; }
-		
-		public DateTime AddedWhen { get; set; }
-		
-		public DateTime? ChangedWhen { get; set; }
-				
-		public EnvelopeDto? Envelope { get; set; }
-
-		public ReceiverDto? Receiver { get; set; }
-	}
-}

EnvelopeGenerator.Application/DTOs/EnvelopeReceiverReadOnly/EnvelopeReceiverReadOnlyCreateDto.cs

@@ -0,0 +1,22 @@
+using System.ComponentModel.DataAnnotations;
+using System.Text.Json.Serialization;
+
+namespace EnvelopeGenerator.Application.DTOs.EnvelopeReceiverReadOnly
+{
+    public record EnvelopeReceiverReadOnlyCreateDto(
+        DateTime DateValid)
+    {
+        [EmailAddress]
+        [Required]
+        public required string ReceiverMail { get; init; }
+
+        [JsonIgnore]
+        public long? EnvelopeId { get; set; } = null;
+
+        [JsonIgnore]
+        public string? AddedWho { get; set; }
+
+        [JsonIgnore]
+        public DateTime AddedWhen { get; } = DateTime.Now;
+    };
+}

EnvelopeGenerator.Application/DTOs/EnvelopeReceiverReadOnly/EnvelopeReceiverReadOnlyDto.cs

@@ -0,0 +1,16 @@
+using EnvelopeGenerator.Application.DTOs.Receiver;
+
+namespace EnvelopeGenerator.Application.DTOs.EnvelopeReceiverReadOnly
+{
+    public record EnvelopeReceiverReadOnlyDto(
+        long Id,
+        long EnvelopeId,
+        string ReceiverMail,
+        DateTime DateValid,
+        DateTime AddedWhen,
+        string AddedWho,
+        EnvelopeDto? Envelope = null,              
+        string? ChangedWho = null,
+        DateTime? ChangedWhen = null,
+        ReceiverReadDto? Receiver = null);
+}

EnvelopeGenerator.Application/DTOs/EnvelopeReceiverReadOnly/EnvelopeReceiverReadOnlyUpdateDto.cs

@@ -0,0 +1,12 @@
+using DigitalData.Core.Abstractions;
+
+namespace EnvelopeGenerator.Application.DTOs.EnvelopeReceiverReadOnly
+{
+    public record EnvelopeReceiverReadOnlyUpdateDto(
+        long Id,
+        DateTime DateValid,
+        string ChangedWho) : IUnique<long>
+    {
+        public DateTime ChangedWhen { get; } = DateTime.Now;
+    };
+}

EnvelopeGenerator.Application/DTOs/EnvelopeTypeDto.cs

@@ -1,4 +1,6 @@
-namespace EnvelopeGenerator.Application.DTOs
+using DigitalData.Core.Abstractions;
+
+namespace EnvelopeGenerator.Application.DTOs
 {
     public record EnvelopeTypeDto(
         int Id,
@@ -15,5 +17,5 @@
         bool? SendReminderEmails,
         int? FirstReminderDays,
         int? ReminderIntervalDays,
-        int? ContractType);
+        int? ContractType) : IUnique<int>;
 }

EnvelopeGenerator.Application/DTOs/Receiver/ReceiverCreateDto.cs

@@ -0,0 +1,21 @@
+using System.ComponentModel.DataAnnotations;
+using System.Security.Cryptography;
+using System.Text;
+
+namespace EnvelopeGenerator.Application.DTOs.Receiver
+{
+    public record ReceiverCreateDto([EmailAddress] string EmailAddress)
+    {
+        public string Signature => sha256HexOfMail.Value;
+
+        private readonly Lazy<string> sha256HexOfMail = new(() =>
+        {
+            var bytes_arr = Encoding.UTF8.GetBytes(EmailAddress.ToUpper());
+            var hash_arr = SHA256.HashData(bytes_arr);
+            var hexa_str = BitConverter.ToString(hash_arr);
+            return hexa_str.Replace("-", string.Empty);
+        });
+
+        public DateTime AddedWhen { get; } = DateTime.Now;
+    };
+}

EnvelopeGenerator.Application/DTOs/Receiver/ReceiverReadDto.cs

@@ -0,0 +1,19 @@
+using DigitalData.Core.DTO;
+using EnvelopeGenerator.Application.DTOs.EnvelopeReceiver;
+using System.Text.Json.Serialization;
+
+namespace EnvelopeGenerator.Application.DTOs.Receiver
+{
+    public record ReceiverReadDto(
+        int Id,
+        string EmailAddress,
+        string Signature,
+        DateTime AddedWhen       
+        ) : BaseDTO<int>(Id)
+    {
+        [JsonIgnore]
+        public IEnumerable<EnvelopeReceiverBasicDto>? EnvelopeReceivers { get; init; }
+
+        public string? LastUsedName => EnvelopeReceivers?.LastOrDefault()?.Name;
+    };
+}

EnvelopeGenerator.Application/DTOs/Receiver/ReceiverUpdateDto.cs

@@ -0,0 +1,6 @@
+using DigitalData.Core.Abstractions;
+
+namespace EnvelopeGenerator.Application.DTOs.Receiver
+{
+    public record ReceiverUpdateDto(int Id) : IUnique<int>;
+}

EnvelopeGenerator.Application/DTOs/ReceiverDto.cs

@@ -1,11 +0,0 @@
-using DigitalData.Core.DTO;
-
-namespace EnvelopeGenerator.Application.DTOs
-{
-    public record ReceiverDto(
-        int Id,
-        string EmailAddress,
-        string Signature,
-        DateTime AddedWhen
-        ) : BaseDTO<int>(Id);
-}

EnvelopeGenerator.Application/DTOs/UserReceiverDto.cs

@@ -1,4 +1,6 @@
-namespace EnvelopeGenerator.Application.DTOs
+using DigitalData.Core.Abstractions;
+
+namespace EnvelopeGenerator.Application.DTOs
 {
     public record UserReceiverDto(
         int Id,
@@ -7,5 +9,5 @@
         string Name,
         string CompanyName,
         string JobTitle,
-        DateTime AddedWhen);
+        DateTime AddedWhen) : IUnique<int>;
 }

EnvelopeGenerator.Application/DispatcherConfig.cs

@@ -1,13 +0,0 @@
-namespace EnvelopeGenerator.Application
-{
-	public class DispatcherConfig
-	{
-		public int SendingProfile { get; init; } = 1;
-
-		public string AddedWho { get; init; } = "DDEnvelopGenerator";
-
-		public int ReminderTypeId { get; init; } = 202377;
-
-		public string EmailAttmt1 { get; init; } = string.Empty;
-	}
-}

EnvelopeGenerator.Application/EnvelopeGenerator.Application.csproj

@@ -12,31 +12,20 @@
 
   <ItemGroup>
     <PackageReference Include="AutoMapper" Version="13.0.1" />
-    <PackageReference Include="DigitalData.Core.Abstractions" Version="1.0.1.1" />
-    <PackageReference Include="DigitalData.Core.API" Version="1.0.2.1" />
-    <PackageReference Include="DigitalData.Core.Application" Version="1.0.0" />
-    <PackageReference Include="DigitalData.Core.DTO" Version="1.0.0" />
-    <PackageReference Include="DigitalData.Core.Infrastructure" Version="1.0.1.1" />
-    <PackageReference Include="DigitalData.EmailProfilerDispatcher" Version="1.0.0" />
+    <PackageReference Include="DigitalData.Core.Abstractions" Version="2.0.0" />
+    <PackageReference Include="DigitalData.Core.Application" Version="2.0.0" />
+    <PackageReference Include="DigitalData.Core.DTO" Version="2.0.0" />
+    <PackageReference Include="DigitalData.EmailProfilerDispatcher" Version="2.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.18" />
+    <PackageReference Include="UserManager.Application" Version="2.0.0" />
+    <PackageReference Include="UserManager.Infrastructure" Version="2.0.0" />
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\EnvelopeGenerator.Extensions\EnvelopeGenerator.Extensions.csproj" />
     <ProjectReference Include="..\EnvelopeGenerator.Infrastructure\EnvelopeGenerator.Infrastructure.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Reference Include="DigitalData.UserManager.Application">
-      <HintPath>..\..\WebUserManager\DigitalData.UserManager.Application\bin\Debug\net7.0\DigitalData.UserManager.Application.dll</HintPath>
-    </Reference>
-    <Reference Include="DigitalData.UserManager.Domain">
-      <HintPath>..\..\WebUserManager\DigitalData.UserManager.Domain\bin\Debug\net7.0\DigitalData.UserManager.Domain.dll</HintPath>
-    </Reference>
-    <Reference Include="DigitalData.UserManager.Infrastructure">
-      <HintPath>..\..\WebUserManager\DigitalData.UserManager.Application\bin\Debug\net7.0\DigitalData.UserManager.Infrastructure.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-
   <ItemGroup>
     <Compile Update="Resources\Model.Designer.cs">
       <DesignTime>True</DesignTime>

EnvelopeGenerator.Application/EnvelopeGeneratorExtensions.cs

@@ -1,148 +0,0 @@
-using Microsoft.Extensions.Logging;
-using System.Text;
-
-namespace EnvelopeGenerator.Application
-{
-    /// <summary>
-    /// Provides extension methods for decoding and extracting information from an envelope receiver ID.
-    /// </summary>
-    public static class EnvelopeGeneratorExtensions
-    {
-        /// <summary>
-        /// Validates whether a given string is a correctly formatted Base-64 encoded string.
-        /// </summary>
-        /// <remarks>
-        /// This method checks the string for proper Base-64 formatting, which includes validating
-        /// the length of the string (must be divisible by 4). It also checks each character to ensure
-        /// it belongs to the Base-64 character set (A-Z, a-z, 0-9, '+', '/', and '=' for padding).
-        /// The method ensures that padding characters ('=') only appear at the end of the string and
-        /// are in a valid configuration (either one '=' at the end if the string's length % 4 is 3,
-        /// or two '==' if the length % 4 is 2).
-        /// </remarks>
-        /// <param name="input">The Base-64 encoded string to validate.</param>
-        /// <returns>
-        /// <c>true</c> if the string is a valid Base-64 encoded string; otherwise, <c>false</c>.
-        /// </returns>
-        /// <example>
-        /// <code>
-        /// string testString = "TWFuIGlzIGRpc3Rpbmd1aXNoZWQsIG5vdCBvbmx5IGJ5IGhpcyByZWFzb24sIGJ1dCBieSB0aGlzIHNpbmd1bGFyIHBhc3Npb24gZnJvbSBvdGhlciBhbmltYWxzLCB3aGljaCBpcyBhIGx1c3Qgb2YgdGhlIG1pbmQsIHRoYXQgYnk=";
-        /// bool isValid = IsValidBase64String(testString);
-        /// Console.WriteLine(isValid); // Output: true
-        /// </code>
-        /// </example>
-        public static bool IsBase64String(this string input)
-        {
-            // Check if the string is null or empty
-            if (string.IsNullOrEmpty(input))
-            {
-                return false;
-            }
-
-            // Replace valid base-64 padding
-            input = input.Trim();
-            int mod4 = input.Length % 4;
-            if (mod4 > 0)
-            {
-                // Base-64 string lengths should be divisible by 4
-                return false;
-            }
-
-            // Check each character to ensure it is valid base-64
-            foreach (char c in input)
-            {
-                if (!char.IsLetterOrDigit(c) && c != '+' && c != '/' && c != '=')
-                {
-                    // Invalid character detected
-                    return false;
-                }
-            }
-
-            // Ensure no invalid padding scenarios exist
-            if (input.EndsWith("==") && (input.Length % 4 == 0) ||
-                input.EndsWith("=") && (input.Length % 4 == 3))
-            {
-                return true;
-            }
-
-            return input.IndexOf('=') == -1; // No padding allowed except at the end
-        }
-
-        /// <summary>
-        /// Decodes the envelope receiver ID and extracts the envelope UUID and receiver signature.
-        /// </summary>
-        /// <param name="envelopeReceiverId">The base64 encoded string containing the envelope UUID and receiver signature.</param>
-        /// <returns>A tuple containing the envelope UUID and receiver signature.</returns>
-        public static (string? EnvelopeUuid, string? ReceiverSignature) DecodeEnvelopeReceiverId(this string envelopeReceiverId)
-        {
-            if (!envelopeReceiverId.IsBase64String())
-            {
-                return (null, null);
-            }
-            byte[] bytes = Convert.FromBase64String(envelopeReceiverId);
-            string decodedString = System.Text.Encoding.UTF8.GetString(bytes);
-            string[] parts = decodedString.Split(new string[] { "::" }, StringSplitOptions.None);
-
-            if (parts.Length > 1)
-                return (EnvelopeUuid: parts[0], ReceiverSignature: parts[1]);
-            else
-                return (string.Empty, string.Empty);
-        }
-
-        /// <summary>
-        /// Gets the envelope UUID from the decoded envelope receiver ID.
-        /// </summary>
-        /// <param name="envelopeReceiverId">The base64 encoded string to decode.</param>
-        /// <returns>The envelope UUID.</returns>
-        public static string? GetEnvelopeUuid(this string envelopeReceiverId) => envelopeReceiverId.DecodeEnvelopeReceiverId().EnvelopeUuid;
-
-        /// <summary>
-        /// Gets the receiver signature from the decoded envelope receiver ID.
-        /// </summary>
-        /// <param name="envelopeReceiverId">The base64 encoded string to decode.</param>
-        /// <returns>The receiver signature.</returns>
-        public static string? GetReceiverSignature(this string envelopeReceiverId) => envelopeReceiverId.DecodeEnvelopeReceiverId().ReceiverSignature;
-
-		public static string EncodeEnvelopeReceiverId(this (string envelopeUuid, string receiverSignature) input)
-		{
-			string combinedString = $"{input.envelopeUuid}::{input.receiverSignature}";
-			byte[] bytes = Encoding.UTF8.GetBytes(combinedString);
-			string base64String = Convert.ToBase64String(bytes);
-
-			return base64String;
-		}
-
-		public static void LogEnvelopeError(this ILogger logger, string envelopeReceiverId, Exception? exception = null, string? message = null, params object?[] args)
-        {
-            var sb = new StringBuilder().AppendLine(envelopeReceiverId.DecodeEnvelopeReceiverId().ToTitle());
-
-            if (message is not null)
-                sb.AppendLine(message);
-
-            if(exception is null)
-                logger.Log(LogLevel.Error, sb.ToString(), args);
-            else
-                logger.Log(LogLevel.Error, exception, sb.AppendLine(exception.Message).ToString(), args);
-        }
-
-        public static void LogEnvelopeError(this ILogger logger, string? uuid, string? signature = null, Exception? exception = null, string? message = null, params object?[] args)
-        {
-            var sb = new StringBuilder($"Envelope Uuid: {uuid}");
-
-            if(signature is not null)
-                sb.AppendLine().Append($"Receiver Signature: {signature}");
-
-            if (message is not null)
-                sb.AppendLine().Append(message);
-
-            if (exception is null)
-                logger.Log(LogLevel.Error, sb.ToString(), args);
-            else
-                logger.Log(LogLevel.Error, exception, sb.ToString(), args);
-        }
-
-        public static string ToTitle(this (string? UUID, string? Signature) envelopeReceiverTuple)
-        {
-            return $"UUID is {envelopeReceiverTuple.UUID} and signature is {envelopeReceiverTuple.Signature}";
-        }
-    }
-}

EnvelopeGenerator.Application/MappingProfiles/BasicDtoMappingProfile.cs

@@ -1,6 +1,9 @@
 using AutoMapper;
 using EnvelopeGenerator.Application.DTOs;
 using EnvelopeGenerator.Application.DTOs.EnvelopeHistory;
+using EnvelopeGenerator.Application.DTOs.EnvelopeReceiver;
+using EnvelopeGenerator.Application.DTOs.EnvelopeReceiverReadOnly;
+using EnvelopeGenerator.Application.DTOs.Receiver;
 using EnvelopeGenerator.Domain.Entities;
 
 namespace EnvelopeGenerator.Application.MappingProfiles
@@ -20,9 +23,13 @@ namespace EnvelopeGenerator.Application.MappingProfiles
             CreateMap<EnvelopeHistory, EnvelopeHistoryDto>();
             CreateMap<EnvelopeHistory, EnvelopeHistoryCreateDto>();
             CreateMap<EnvelopeReceiver, EnvelopeReceiverDto>();
+            CreateMap<EnvelopeReceiver, EnvelopeReceiverSecretDto>();
             CreateMap<EnvelopeType, EnvelopeTypeDto>();
-            CreateMap<Receiver, ReceiverDto>();
+            CreateMap<Receiver, ReceiverReadDto>();
+            CreateMap<Receiver, ReceiverCreateDto>();
+            CreateMap<Receiver, ReceiverUpdateDto>();
             CreateMap<UserReceiver, UserReceiverDto>();
+            CreateMap<EnvelopeReceiverReadOnly, EnvelopeReceiverReadOnlyDto>();
 
             // DTO to Entity mappings
             CreateMap<ConfigDto, Config>();
@@ -36,8 +43,13 @@ namespace EnvelopeGenerator.Application.MappingProfiles
             CreateMap<EnvelopeHistoryCreateDto, EnvelopeHistory>();
             CreateMap<EnvelopeReceiverDto, EnvelopeReceiver>();
             CreateMap<EnvelopeTypeDto, EnvelopeType>();
-            CreateMap<ReceiverDto, Receiver>();
+            CreateMap<ReceiverReadDto, Receiver>();
+            CreateMap<ReceiverCreateDto, Receiver>();
+            CreateMap<ReceiverUpdateDto, Receiver>();
             CreateMap<UserReceiverDto, UserReceiver>();
+            CreateMap<EnvelopeReceiverBase, EnvelopeReceiverBasicDto>();
+            CreateMap<EnvelopeReceiverReadOnlyCreateDto, EnvelopeReceiverReadOnly>();
+            CreateMap<EnvelopeReceiverReadOnlyUpdateDto, EnvelopeReceiverReadOnly>();
         }
     }
 }

EnvelopeGenerator.Application/Resources/Resource.de-DE.resx

@@ -145,10 +145,10 @@
     <value>Englisch</value>
   </data>
   <data name="EnvelopeInfo1" xml:space="preserve">
-    <value>Sie müssen {0} Vorgang unterzeichen. Bitte prüfen Sie die Seite {1}.</value>
+    <value>Sie müssen {0} Vorgang unterzeichen. &lt;span class="highlight highlight-envelope-info-1"&gt;Bitte prüfen Sie die Seite {1}&lt;/span&gt;.</value>
   </data>
   <data name="EnvelopeInfo2" xml:space="preserve">
-    <value>Erstellt am {0} von {1}. Sie können den Absender über &lt;a href="mailto:{2}?subject={3}&amp;body=Sehr%20geehrter%20{4}%20{5},%0A%0A%0A"&gt;{6}&lt;/a&gt; kontaktieren.</value>
+    <value>Erstellt am {0} von {1}. Sie können den Absender über &lt;span class="highlight highlight-envelope-info-2"&gt;&lt;a class="mail-link" href="mailto:{2}?subject={3}&amp;body=Sehr%20geehrter%20{4}%20{5},%0A%0A%0A"&gt;{6}&lt;/a&gt;&lt;/span&gt; kontaktieren.</value>
   </data>
   <data name="Finalize" xml:space="preserve">
     <value>Abschließen</value>
@@ -159,6 +159,9 @@
   <data name="LocakedOpen" xml:space="preserve">
     <value>Öffnen</value>
   </data>
+  <data name="LocationWarning" xml:space="preserve">
+    <value>Bitte überprüfen Sie die Standortinformationen. Wenn sie falsch sind, korrigieren Sie diese bitte.</value>
+  </data>
   <data name="LockedAccessCode" xml:space="preserve">
     <value>Zugriffscode</value>
   </data>
@@ -174,6 +177,9 @@
   <data name="LockedTitle" xml:space="preserve">
     <value>Dokument erfordert einen Zugriffscode</value>
   </data>
+  <data name="ReadOnlyMessage" xml:space="preserve">
+    <value>Weitergeleitet von {0}. Gültig bis {1}.</value>
+  </data>
   <data name="Reject" xml:space="preserve">
     <value>Ablehnen</value>
   </data>
@@ -201,9 +207,15 @@
   <data name="SignDoc" xml:space="preserve">
     <value>Dokument unterschreiben</value>
   </data>
+  <data name="SigningProcessTitle" xml:space="preserve">
+    <value>Titel des Unterzeichnungs-Vorgangs</value>
+  </data>
   <data name="UnexpectedError" xml:space="preserve">
     <value>Ein unerwarteter Fehler ist aufgetreten.</value>
   </data>
+  <data name="WelcomeToTheESignPortal" xml:space="preserve">
+    <value>Herzlich willkommen im eSign-Portal</value>
+  </data>
   <data name="WrongAccessCode" xml:space="preserve">
     <value>Ungültiger Zugangscode.</value>
   </data>

EnvelopeGenerator.Application/Resources/Resource.en-US.resx

@@ -145,10 +145,10 @@
     <value>English</value>
   </data>
   <data name="EnvelopeInfo1" xml:space="preserve">
-    <value>You have to sign {0} process. Please check page {1}.</value>
+    <value>You have to sign {0} process. &lt;span class="highlight highlight-envelope-info-1"&gt;Please check page {1}&lt;/span&gt;.</value>
   </data>
   <data name="EnvelopeInfo2" xml:space="preserve">
-    <value>Created on {0} by {1}. You can contact the sender via &lt;a href="mailto:{2}?subject={3}&amp;body=Dear%20{4}%20{5},%0A%0A%0A"&gt;{6}&lt;/a&gt;.</value>
+    <value>Created on {0} by {1}. You can contact the sender via &lt;span class="highlight highlight-envelope-info-2"&gt;&lt;a class="mail-link" href="mailto:{2}?subject={3}&amp;body=Dear%20{4}%20{5},%0A%0A%0A"&gt;{6}&lt;/a&gt;&lt;/span&gt;.</value>
   </data>
   <data name="Finalize" xml:space="preserve">
     <value>Finalize</value>
@@ -159,6 +159,9 @@
   <data name="LocakedOpen" xml:space="preserve">
     <value>Open</value>
   </data>
+  <data name="LocationWarning" xml:space="preserve">
+    <value>Please review the location information. If it is incorrect, kindly make the necessary corrections.</value>
+  </data>
   <data name="LockedAccessCode" xml:space="preserve">
     <value>Access Code</value>
   </data>
@@ -174,6 +177,9 @@
   <data name="LockedTitle" xml:space="preserve">
     <value>Document requires an access code</value>
   </data>
+  <data name="ReadOnlyMessage" xml:space="preserve">
+    <value>Forwarded by {0}. Valid until {1}.</value>
+  </data>
   <data name="Reject" xml:space="preserve">
     <value>Reject</value>
   </data>
@@ -201,9 +207,15 @@
   <data name="SignDoc" xml:space="preserve">
     <value>Sign document</value>
   </data>
+  <data name="SigningProcessTitle" xml:space="preserve">
+    <value>Title of the signing process</value>
+  </data>
   <data name="UnexpectedError" xml:space="preserve">
     <value>An unexpected error has occurred.</value>
   </data>
+  <data name="WelcomeToTheESignPortal" xml:space="preserve">
+    <value>Welcome to the eSign portal</value>
+  </data>
   <data name="WrongAccessCode" xml:space="preserve">
     <value>Invalid access code.</value>
   </data>

EnvelopeGenerator.Application/Services/ConfigService.cs

@@ -3,15 +3,13 @@ using DigitalData.Core.Application;
 using DigitalData.Core.DTO;
 using EnvelopeGenerator.Application.Contracts;
 using EnvelopeGenerator.Application.DTOs;
-using EnvelopeGenerator.Application.Resources;
 using EnvelopeGenerator.Domain.Entities;
 using EnvelopeGenerator.Infrastructure.Contracts;
 using Microsoft.Extensions.Caching.Memory;
-using Microsoft.Extensions.Localization;
 using Microsoft.Extensions.Logging;
 namespace EnvelopeGenerator.Application.Services
 {
-    public class ConfigService : BasicCRUDService<IConfigRepository, ConfigDto, Config, int>, IConfigService
+    public class ConfigService : ReadService<IConfigRepository, ConfigDto, Config, int>, IConfigService
     {
 		private static readonly Guid DefaultConfigCacheId = Guid.NewGuid();
 
@@ -28,7 +26,7 @@ namespace EnvelopeGenerator.Application.Services
             var config = await _repository.ReadFirstAsync();
             return config is null 
                 ? Result.Fail<ConfigDto>().Notice(LogLevel.Error, Flag.DataIntegrityIssue, "There is no configuration in DB.")
-                : Result.Success(_mapper.MapOrThrow<ConfigDto>(config));
+                : Result.Success(_mapper.Map<ConfigDto>(config));
         }
 
 		/// <summary>

EnvelopeGenerator.Application/Services/DocumentReceiverElementService.cs

@@ -2,10 +2,8 @@
 using DigitalData.Core.Application;
 using EnvelopeGenerator.Application.Contracts;
 using EnvelopeGenerator.Application.DTOs;
-using EnvelopeGenerator.Application.Resources;
 using EnvelopeGenerator.Domain.Entities;
 using EnvelopeGenerator.Infrastructure.Contracts;
-using Microsoft.Extensions.Localization;
 
 namespace EnvelopeGenerator.Application.Services
 {

EnvelopeGenerator.Application/Services/DocumentStatusService.cs

@@ -2,10 +2,8 @@
 using DigitalData.Core.Application;
 using EnvelopeGenerator.Application.Contracts;
 using EnvelopeGenerator.Application.DTOs;
-using EnvelopeGenerator.Application.Resources;
 using EnvelopeGenerator.Domain.Entities;
 using EnvelopeGenerator.Infrastructure.Contracts;
-using Microsoft.Extensions.Localization;
 
 namespace EnvelopeGenerator.Application.Services
 {

EnvelopeGenerator.Application/Services/EmailTemplateService.cs

@@ -1,11 +1,9 @@
 using AutoMapper;
 using DigitalData.Core.Application;
-using Microsoft.Extensions.Localization;
 using EnvelopeGenerator.Application.Contracts;
 using EnvelopeGenerator.Application.DTOs;
 using EnvelopeGenerator.Domain.Entities;
 using EnvelopeGenerator.Infrastructure.Contracts;
-using EnvelopeGenerator.Application.Resources;
 using static EnvelopeGenerator.Common.Constants;
 using DigitalData.Core.DTO;
 using Microsoft.Extensions.Logging;
@@ -26,7 +24,7 @@ namespace EnvelopeGenerator.Application.Services
                 ? Result.Fail<EmailTemplateDto>()
                     .Message(Key.InnerServiceError)
                     .Notice(LogLevel.Error, Flag.DataIntegrityIssue, $"EmailTemplateType '{type}' is not found in DB. Please, define required e-mail template.")
-                : Result.Success(_mapper.MapOrThrow<EmailTemplateDto>(temp));
+                : Result.Success(_mapper.Map<EmailTemplateDto>(temp));
         }
     }
 }

EnvelopeGenerator.Application/Services/EnvelopeHistoryService.cs

@@ -1,20 +1,18 @@
 using AutoMapper;
 using DigitalData.Core.Application;
-using Microsoft.Extensions.Localization;
 using EnvelopeGenerator.Application.Contracts;
 using EnvelopeGenerator.Domain.Entities;
 using EnvelopeGenerator.Infrastructure.Contracts;
 using static EnvelopeGenerator.Common.Constants;
-using EnvelopeGenerator.Application.Resources;
 using DigitalData.Core.DTO;
 using EnvelopeGenerator.Application.DTOs.EnvelopeHistory;
-using EnvelopeGenerator.Application.DTOs;
+using EnvelopeGenerator.Application.DTOs.Receiver;
 
 namespace EnvelopeGenerator.Application.Services
 {
     public class EnvelopeHistoryService : CRUDService<IEnvelopeHistoryRepository, EnvelopeHistoryCreateDto, EnvelopeHistoryDto, EnvelopeHistoryDto, EnvelopeHistory, long>, IEnvelopeHistoryService
     {
-        public EnvelopeHistoryService(IEnvelopeHistoryRepository repository, IStringLocalizer<Resource> localizer, IMapper mapper)
+        public EnvelopeHistoryService(IEnvelopeHistoryRepository repository, IMapper mapper)
             : base(repository, mapper)
         {
         }
@@ -53,7 +51,7 @@ namespace EnvelopeGenerator.Application.Services
 
         public async Task<IEnumerable<EnvelopeHistoryDto>> ReadAsync(int? envelopeId = null, string? userReference = null, ReferenceType? referenceType = null, int? status = null, bool withSender = false, bool withReceiver = false)
         {
-            var histDTOs = _mapper.MapOrThrow<IEnumerable<EnvelopeHistoryDto>>(
+            var histDTOs = _mapper.Map<IEnumerable<EnvelopeHistoryDto>>(
                         await _repository.ReadAsync(
                                     envelopeId: envelopeId,
                                     userReference: userReference,
@@ -67,11 +65,11 @@ namespace EnvelopeGenerator.Application.Services
             await ReadAsync(envelopeId: envelopeId, userReference: userReference, status: (int)EnvelopeStatus.DocumentRejected, withReceiver:true);
 
 		//TODO: use IQueryable in repository to incerease the performance
-		public async Task<IEnumerable<ReceiverDto>> ReadRejectingReceivers(int envelopeId)
+		public async Task<IEnumerable<ReceiverReadDto>> ReadRejectingReceivers(int envelopeId)
 		{
 			var envelopes = await ReadRejectedAsync(envelopeId);
             return envelopes is null
-                ? Enumerable.Empty<ReceiverDto>()
+                ? Enumerable.Empty<ReceiverReadDto>()
                 : envelopes
                     .Where(eh => eh?.Receiver != null)
                     .Select(eh => eh.Receiver!);

EnvelopeGenerator.Application/Services/EnvelopeMailService.cs

@@ -3,56 +3,68 @@ using DigitalData.Core.DTO;
 using DigitalData.EmailProfilerDispatcher.Abstraction.Contracts;
 using DigitalData.EmailProfilerDispatcher.Abstraction.DTOs.EmailOut;
 using DigitalData.EmailProfilerDispatcher.Abstraction.Services;
-using DigitalData.UserManager.Application;
 using EnvelopeGenerator.Application.Contracts;
-using EnvelopeGenerator.Application.DTOs;
+using EnvelopeGenerator.Application.DTOs.EnvelopeReceiver;
 using EnvelopeGenerator.Common;
-using Microsoft.Extensions.Localization;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using static EnvelopeGenerator.Common.Constants;
+using EnvelopeGenerator.Extensions;
+using EnvelopeGenerator.Application.DTOs.EnvelopeReceiverReadOnly;
+using EnvelopeGenerator.Application.Configurations;
 
 namespace EnvelopeGenerator.Application.Services
 {
-	public class EnvelopeMailService : EmailOutService, IEnvelopeMailService
+    public class EnvelopeMailService : EmailOutService, IEnvelopeMailService
     {
 		private readonly IEmailTemplateService _tempService;
 		private readonly IEnvelopeReceiverService _envRcvService;
 		private readonly DispatcherConfig _dConfig;
 		private readonly IConfigService _configService;
+		private readonly Dictionary<string, string> _placeholders;
 
-        public EnvelopeMailService(IEmailOutRepository repository, IStringLocalizer<Resource> localizer, IMapper mapper, IEmailTemplateService tempService, IEnvelopeReceiverService envelopeReceiverService, IOptions<DispatcherConfig> dispatcherConfigOptions, IConfigService configService) : base(repository, mapper)
+		public EnvelopeMailService(IEmailOutRepository repository, IMapper mapper, IEmailTemplateService tempService, IEnvelopeReceiverService envelopeReceiverService, IOptions<DispatcherConfig> dispatcherConfigOptions, IConfigService configService, IOptions<MailConfig> mailConfig) : base(repository, mapper)
         {
             _tempService = tempService;
 			_envRcvService = envelopeReceiverService;
 			_dConfig = dispatcherConfigOptions.Value;
 			_configService = configService;
+			_placeholders = mailConfig.Value.Placeholders;
         }
 
-		//TODO: create ioptions and implement TemplatePlaceHolderAttribute instead of this method
-		private async Task<Dictionary<string, string>> CreatePlaceholders(string? accessCode = null, EnvelopeReceiverDto? envelopeReceiverDto = null)
+		private async Task<Dictionary<string, string>> CreatePlaceholders(string? accessCode = null, EnvelopeReceiverDto? envelopeReceiverDto = null, EnvelopeReceiverReadOnlyDto? readOnlyDto = null)
 		{
-			Dictionary<string, string> placeholders = new() {
-				{ "[NAME_PORTAL]", "signFlow" },
-				{ "[SIGNATURE_TYPE]" , "signieren"},
-				{ "[REASON]", string.Empty } };
-
 			if (accessCode is not null)
-				placeholders["[DOCUMENT_ACCESS_CODE]"] = accessCode;
+                _placeholders["[DOCUMENT_ACCESS_CODE]"] = accessCode;
 
-			if(envelopeReceiverDto is not null && envelopeReceiverDto.Envelope is not null && envelopeReceiverDto.Receiver is not null)
+			if(envelopeReceiverDto?.Envelope is not null && envelopeReceiverDto.Receiver is not null)
 			{
 				var erId = (envelopeReceiverDto.Envelope.Uuid, envelopeReceiverDto.Receiver.Signature).EncodeEnvelopeReceiverId();
 				var sigHost = await _configService.ReadDefaultSignatureHost();
-				var linkToDoc = $"{sigHost}/envelope/{erId}";
-				placeholders["[LINK_TO_DOCUMENT]"] = linkToDoc;
-				placeholders["[LINK_TO_DOCUMENT_TEXT]"] = linkToDoc[..Math.Min(40, linkToDoc.Length)];
+				var linkToDoc = $"{sigHost}/EnvelopeKey/{erId}";
+				_placeholders["[LINK_TO_DOCUMENT]"] = linkToDoc;
+				_placeholders["[LINK_TO_DOCUMENT_TEXT]"] = linkToDoc[..Math.Min(40, linkToDoc.Length)] + "..";
 			}
 
-			return placeholders;
+			return _placeholders;
 		}
 
-		public async Task<DataResult<int>> SendAccessCodeAsync(EnvelopeReceiverDto dto) => await SendAsync(dto: dto, tempType: Constants.EmailTemplateType.DocumentAccessCodeReceived);
+        private async Task<Dictionary<string, string>> CreatePlaceholders(EnvelopeReceiverReadOnlyDto? readOnlyDto = null)
+        {
+            if (readOnlyDto?.Envelope is not null && readOnlyDto.Receiver is not null)
+            {
+                _placeholders["[NAME_RECEIVER]"] = await _envRcvService.ReadLastUsedReceiverNameByMail(readOnlyDto.AddedWho).ThenAsync(res => res, (msg, ntc) => string.Empty) ?? string.Empty;
+                var erReadOnlyId = (readOnlyDto.Id).EncodeEnvelopeReceiverId();
+                var sigHost = await _configService.ReadDefaultSignatureHost();
+                var linkToDoc = $"{sigHost}/EnvelopeKey/{erReadOnlyId}";
+                _placeholders["[LINK_TO_DOCUMENT]"] = linkToDoc;
+                _placeholders["[LINK_TO_DOCUMENT_TEXT]"] = linkToDoc[..Math.Min(40, linkToDoc.Length)] + "..";
+            }
+
+            return _placeholders;
+        }
+
+        public async Task<DataResult<int>> SendAccessCodeAsync(EnvelopeReceiverDto dto) => await SendAsync(dto: dto, tempType: Constants.EmailTemplateType.DocumentAccessCodeReceived);
 
         public async Task<DataResult<int>> SendAsync(EnvelopeReceiverDto dto, Constants.EmailTemplateType tempType)
         {
@@ -92,8 +104,43 @@ namespace EnvelopeGenerator.Application.Services
 			
 			var placeholders = await CreatePlaceholders(accessCode: accessCode, envelopeReceiverDto: dto);
 
+			//TODO: remove the requirement to add the models using reflections
 			return await CreateWithTemplateAsync(createDto: mail,placeholders: placeholders,
 				dto, dto.Envelope.User!, dto.Envelope);
 		}
-	}
+
+		public async Task<DataResult<int>> SendAsync(EnvelopeReceiverReadOnlyDto dto)
+		{
+            var tempSerResult = await _tempService.ReadByNameAsync(Constants.EmailTemplateType.DocumentShared);
+            if (tempSerResult.IsFailed)
+                return tempSerResult.ToFail<int>().Notice(LogLevel.Error, Flag.DataIntegrityIssue, $"The email cannot send because '{Constants.EmailTemplateType.DocumentShared}' template cannot found.");
+            var temp = tempSerResult.Data;
+
+            var mail = new EmailOutCreateDto()
+            {
+                EmailAddress = dto.ReceiverMail,
+                EmailSubj = temp.Subject,
+                EmailBody = temp.Body,
+				//TODO: remove int casting when all 
+                ReferenceId = (int) dto.EnvelopeId,			//REFERENCE_ID = ENVELOPE_ID
+                ReferenceString = dto.Envelope!.Uuid,		//REFERENCE_STRING = ENVELOPE_UUID
+                                                            //receiver_name = receiver.name,
+                                                            //receiver_access_code = receiver.access_code,
+                                                            //sender_adress = envelope.user.email,
+                                                            //sender_name = envelope.user.full_name,
+                                                            //envelope_title = envelope.title,
+                ReminderTypeId = _dConfig.ReminderTypeId,
+                SendingProfile = _dConfig.SendingProfile,
+                EntityId = null,
+                WfId = (int)EnvelopeStatus.EnvelopeShared,
+                WfReference = null,
+                AddedWho = _dConfig.AddedWho,
+                EmailAttmt1 = _dConfig.EmailAttmt1
+            };
+
+            var placeholders = await CreatePlaceholders(readOnlyDto: dto);
+
+            return await CreateWithTemplateAsync(createDto: mail, placeholders: placeholders, dto.Envelope);
+        }
+    }
 }

EnvelopeGenerator.Application/Services/EnvelopeReceiverReadOnlyService.cs

@@ -0,0 +1,16 @@
+using AutoMapper;
+using DigitalData.Core.Application;
+using EnvelopeGenerator.Application.Contracts;
+using EnvelopeGenerator.Application.DTOs.EnvelopeReceiverReadOnly;
+using EnvelopeGenerator.Domain.Entities;
+using EnvelopeGenerator.Infrastructure.Contracts;
+
+namespace EnvelopeGenerator.Application.Services
+{
+    public class EnvelopeReceiverReadOnlyService : CRUDService<IEnvelopeReceiverReadOnlyRepository, EnvelopeReceiverReadOnlyCreateDto, EnvelopeReceiverReadOnlyDto, EnvelopeReceiverReadOnlyUpdateDto, EnvelopeReceiverReadOnly, long>, IEnvelopeReceiverReadOnlyService
+    {
+        public EnvelopeReceiverReadOnlyService(IEnvelopeReceiverReadOnlyRepository repository, IMapper mapper) : base(repository, mapper)
+        {
+        }
+    }
+}

EnvelopeGenerator.Application/Services/EnvelopeReceiverService.cs

@@ -2,16 +2,17 @@
 using DigitalData.Core.Application;
 using DigitalData.Core.DTO;
 using EnvelopeGenerator.Application.Contracts;
-using EnvelopeGenerator.Application.DTOs;
+using EnvelopeGenerator.Application.DTOs.EnvelopeReceiver;
 using EnvelopeGenerator.Application.Resources;
 using EnvelopeGenerator.Domain.Entities;
 using EnvelopeGenerator.Infrastructure.Contracts;
 using Microsoft.Extensions.Localization;
 using Microsoft.Extensions.Logging;
+using EnvelopeGenerator.Extensions;
 
 namespace EnvelopeGenerator.Application.Services
 {
-    public class EnvelopeReceiverService : BasicCRUDService<IEnvelopeReceiverRepository, EnvelopeReceiverDto, EnvelopeReceiver, object>, IEnvelopeReceiverService
+    public class EnvelopeReceiverService : BasicCRUDService<IEnvelopeReceiverRepository, EnvelopeReceiverDto, EnvelopeReceiver, (int Envelope, int Receiver)>, IEnvelopeReceiverService
     {
         private readonly IStringLocalizer<Resource> _localizer;
 
@@ -24,13 +25,19 @@ namespace EnvelopeGenerator.Application.Services
         public async Task<DataResult<IEnumerable<EnvelopeReceiverDto>>> ReadBySignatureAsync(string signature, bool withEnvelope = false, bool withReceiver = true)
         {
             var env_rcvs = await _repository.ReadBySignatureAsync(signature: signature, withEnvelope: withEnvelope, withReceiver: withReceiver);
-            return Result.Success(_mapper.MapOrThrow<IEnumerable<EnvelopeReceiverDto>>(env_rcvs));
+            return Result.Success(_mapper.Map<IEnumerable<EnvelopeReceiverDto>>(env_rcvs));
         }
 
         public async Task<DataResult<IEnumerable<EnvelopeReceiverDto>>> ReadByUuidAsync(string uuid, bool withEnvelope = true, bool withReceiver = false)
         {
             var env_rcvs = await _repository.ReadByUuidAsync(uuid: uuid, withEnvelope: withEnvelope, withReceiver: withReceiver);
-            return Result.Success(_mapper.MapOrThrow<IEnumerable<EnvelopeReceiverDto>>(env_rcvs));
+            return Result.Success(_mapper.Map<IEnumerable<EnvelopeReceiverDto>>(env_rcvs));
+        }
+
+        public async Task<DataResult<IEnumerable<EnvelopeReceiverSecretDto>>> ReadSecretByUuidAsync(string uuid, bool withEnvelope = false, bool withReceiver = true)
+        {
+            var env_rcvs = await _repository.ReadByUuidAsync(uuid: uuid, withEnvelope: withEnvelope, withReceiver: withReceiver);
+            return Result.Success(_mapper.Map<IEnumerable<EnvelopeReceiverSecretDto>>(env_rcvs));
         }
 
         public async Task<DataResult<EnvelopeReceiverDto>> ReadByUuidSignatureAsync(string uuid, string signature, bool withEnvelope = true, bool withReceiver = true)
@@ -40,7 +47,7 @@ namespace EnvelopeGenerator.Application.Services
                 return Result.Fail<EnvelopeReceiverDto>()
                     .Message(Key.EnvelopeReceiverNotFound);
 
-            return Result.Success(_mapper.MapOrThrow<EnvelopeReceiverDto>(env_rcv));
+            return Result.Success(_mapper.Map<EnvelopeReceiverDto>(env_rcv));
         }
 
         public async Task<DataResult<EnvelopeReceiverDto>> ReadByEnvelopeReceiverIdAsync(string envelopeReceiverId, bool withEnvelope = true, bool withReceiver = true)
@@ -116,11 +123,17 @@ namespace EnvelopeGenerator.Application.Services
                 : Result.Success(code);
 		}
 
-        public async Task<DataResult<IEnumerable<EnvelopeReceiverDto>>> ReadByUsernameAsync(string username)
+        public async Task<DataResult<IEnumerable<EnvelopeReceiverDto>>> ReadByUsernameAsync(string username, int? min_status = null, int? max_status = null, params int[] ignore_statuses)
         {
-            var er_list = await _repository.ReadByUsernameAsync(username: username);
-            var dto_list = _mapper.MapOrThrow<IEnumerable<EnvelopeReceiverDto>>(er_list);
+            var er_list = await _repository.ReadByUsernameAsync(username: username, min_status: min_status, max_status: max_status, ignore_statuses: ignore_statuses);
+            var dto_list = _mapper.Map<IEnumerable<EnvelopeReceiverDto>>(er_list);
             return Result.Success(dto_list);
         }
+
+        public async Task<DataResult<string?>> ReadLastUsedReceiverNameByMail(string mail)
+        {
+            var er = await _repository.ReadLastByReceiver(mail);
+            return er is null ? Result.Fail<string?>().Notice(LogLevel.None, Flag.NotFound) : Result.Success(er.Name);
+        }
     }
 }

EnvelopeGenerator.Application/Services/EnvelopeService.cs

@@ -3,27 +3,22 @@ using DigitalData.Core.Application;
 using DigitalData.Core.DTO;
 using EnvelopeGenerator.Application.Contracts;
 using EnvelopeGenerator.Application.DTOs;
-using EnvelopeGenerator.Application.Resources;
 using EnvelopeGenerator.Domain.Entities;
 using EnvelopeGenerator.Infrastructure.Contracts;
-using Microsoft.Extensions.Localization;
-using Microsoft.Extensions.Logging;
 
 namespace EnvelopeGenerator.Application.Services
 {
     public class EnvelopeService : BasicCRUDService<IEnvelopeRepository, EnvelopeDto, Envelope, int>, IEnvelopeService
     {
-        private readonly ILogger _logger;
-        public EnvelopeService(IEnvelopeRepository repository, IMapper mapper, ILogger<EnvelopeService> logger)
+        public EnvelopeService(IEnvelopeRepository repository, IMapper mapper)
             : base(repository, mapper)
         {
-            _logger = logger;
         }
 
         public async Task<DataResult<IEnumerable<EnvelopeDto>>> ReadAllWithAsync(bool documents = false, bool history = false, bool documentReceiverElement = false)
         {
             var envelopes = await _repository.ReadAllWithAsync(documents: documents, history: history, documentReceiverElement: documentReceiverElement);
-            var readDto = _mapper.MapOrThrow<IEnumerable<EnvelopeDto>>(envelopes);
+            var readDto = _mapper.Map<IEnumerable<EnvelopeDto>>(envelopes);
             return Result.Success(readDto);
         }
 
@@ -34,7 +29,14 @@ namespace EnvelopeGenerator.Application.Services
             if (envelope is null)
                 return Result.Fail<EnvelopeDto>();
 
-            var readDto = _mapper.MapOrThrow<EnvelopeDto>(envelope);
+            var readDto = _mapper.Map<EnvelopeDto>(envelope);
+            return Result.Success(readDto);
+        }
+
+        public async Task<DataResult<IEnumerable<EnvelopeDto>>> ReadByUserAsync(int userId, int? min_status = null, int? max_status = null, params int[] ignore_statuses)
+        {
+            var users = await _repository.ReadByUserAsync(userId: userId, min_status: min_status, max_status: max_status, ignore_statuses: ignore_statuses);            
+            var readDto = _mapper.Map<IEnumerable<EnvelopeDto>>(users);
             return Result.Success(readDto);
         }
     }

EnvelopeGenerator.Application/Services/EnvelopeTypeService.cs

@@ -1,19 +1,30 @@
 using AutoMapper;
 using DigitalData.Core.Application;
-using Microsoft.Extensions.Localization;
 using EnvelopeGenerator.Application.Contracts;
 using EnvelopeGenerator.Application.DTOs;
 using EnvelopeGenerator.Domain.Entities;
 using EnvelopeGenerator.Infrastructure.Contracts;
-using EnvelopeGenerator.Application.Resources;
+using Microsoft.Extensions.Caching.Memory;
+using DigitalData.Core.DTO;
+using Microsoft.Extensions.Logging;
 
 namespace EnvelopeGenerator.Application.Services
 {
     public class EnvelopeTypeService : BasicCRUDService<IEnvelopeTypeRepository, EnvelopeTypeDto, EnvelopeType, int>, IEnvelopeTypeService
     {
-        public EnvelopeTypeService(IEnvelopeTypeRepository repository, IMapper mapper)
+        private static readonly Guid CacheKey = Guid.NewGuid();
+
+        private readonly IMemoryCache _cache;
+
+        public EnvelopeTypeService(IEnvelopeTypeRepository repository, IMapper mapper, IMemoryCache cache)
             : base(repository, mapper)
         {
+            _cache = cache;
         }
+
+        public override async Task<DataResult<IEnumerable<EnvelopeTypeDto>>> ReadAllAsync() 
+            => await _cache.GetOrCreateAsync(CacheKey, async entry => await base.ReadAllAsync())
+            ?? Result.Fail<IEnumerable<EnvelopeTypeDto>>().Notice(LogLevel.Error, Flag.NotFound, "No cached envelope types are available in the database. If you have added any envelope types after the server started, please restart the server.");
+        
     }
 }

EnvelopeGenerator.Application/Services/ReceiverService.cs

@@ -1,20 +1,38 @@
 using AutoMapper;
 using DigitalData.Core.Application;
-using Microsoft.Extensions.Localization;
 using EnvelopeGenerator.Application.Contracts;
-using EnvelopeGenerator.Application.DTOs;
 using EnvelopeGenerator.Domain.Entities;
 using EnvelopeGenerator.Infrastructure.Contracts;
-using EnvelopeGenerator.Application.Resources;
-using Microsoft.AspNetCore.Mvc;
+using EnvelopeGenerator.Application.DTOs.Receiver;
+using DigitalData.Core.DTO;
 
 namespace EnvelopeGenerator.Application.Services
 {
-    public class ReceiverService : BasicCRUDService<IReceiverRepository, ReceiverDto, Receiver, int>, IReceiverService
+    public class ReceiverService : CRUDService<IReceiverRepository, ReceiverCreateDto, ReceiverReadDto, ReceiverUpdateDto, Receiver, int>, IReceiverService
     {
-        public ReceiverService(IReceiverRepository repository, IStringLocalizer<Resource> localizer, IMapper mapper)
+        public ReceiverService(IReceiverRepository repository, IMapper mapper)
             : base(repository, mapper)
         {
         }
+
+        public async Task<DataResult<ReceiverReadDto>> ReadByAsync(string? emailAddress = null, string? signature = null)
+        {
+            var rcv = await _repository.ReadByAsync(emailAddress: emailAddress, signature: signature);
+
+            if (rcv is null)
+                return Result.Fail<ReceiverReadDto>();
+
+            return Result.Success(_mapper.Map<ReceiverReadDto>(rcv));
+        }
+
+        public async Task<Result> DeleteByAsync(string? emailAddress = null, string? signature = null)
+        {
+            var rcv = await _repository.ReadByAsync(emailAddress: emailAddress, signature: signature);
+
+            if (rcv is null)
+                return Result.Fail();
+
+            return await _repository.DeleteAsync(rcv) ? Result.Success() : Result.Fail();
+        }
     }
 }

EnvelopeGenerator.Application/Services/UserReceiverService.cs

@@ -1,17 +1,15 @@
 using AutoMapper;
 using DigitalData.Core.Application;
-using Microsoft.Extensions.Localization;
 using EnvelopeGenerator.Application.Contracts;
 using EnvelopeGenerator.Application.DTOs;
 using EnvelopeGenerator.Domain.Entities;
 using EnvelopeGenerator.Infrastructure.Contracts;
-using EnvelopeGenerator.Application.Resources;
 
 namespace EnvelopeGenerator.Application.Services
 {
     public class UserReceiverService : BasicCRUDService<IUserReceiverRepository, UserReceiverDto, UserReceiver, int>, IUserReceiverService
     {
-        public UserReceiverService(IUserReceiverRepository repository, IStringLocalizer<Resource> localizer, IMapper mapper)
+        public UserReceiverService(IUserReceiverRepository repository, IMapper mapper)
             : base(repository, mapper)
         {
         }

EnvelopeGenerator.Common/Constants.vb

@@ -1,6 +1,7 @@
 Public Class Constants
 
 #Region "Status Fields"
+    'http://wiki.dd/xwiki13/bin/view/Anwendungen/Produkt-Handbuch/Sonstiges/SignFlow/Envelope%20Status/
     Public Enum EnvelopeStatus
         Invalid = 0
         EnvelopeCreated = 1001
@@ -19,6 +20,8 @@
         DocumentSigned = 2005
         SignatureConfirmed = 2006
         DocumentRejected = 2007
+        EnvelopeShared = 2008
+        EnvelopeViewed = 2009
         MessageInvitationSent = 3001        ' Wird von Trigger verwendet
         MessageAccessCodeSent = 3002
         MessageConfirmationSent = 3003
@@ -26,6 +29,7 @@
         MessageCompletionSent = 3005
     End Enum
 
+    'TODO: standardize in xwiki
     Public Enum ReferenceType
         Receiver
         Sender
@@ -93,6 +97,13 @@
         DocumentDeleted
         DocumentCompleted
         DocumentAccessCodeReceived
+        DocumentShared
+    End Enum
+
+    Public Enum EncodeType
+        EnvelopeReceiver
+        EnvelopeReceiverReadOnly
+        Undefined
     End Enum
 
 #End Region
@@ -102,6 +113,7 @@
     Public Const DATABASE = "DATABASE"
     Public Const LOGCONFIG = "LOGCONFIG"
     Public Const GDPICTURE = "GDPICTURE"
+    Public Const IGNORED_LABELS = "IgnoredLabels"
 
     Public Const GREEN_300 = "#bbf7d0"
     Public Const RED_300 = "#fecaca"

EnvelopeGenerator.Common/EnvelopeGenerator.Common.vbproj

@@ -13,6 +13,8 @@
     <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <Deterministic>true</Deterministic>
     <TargetFrameworkProfile />
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -63,22 +65,20 @@
     <Reference Include="DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
     <Reference Include="DevExpress.XtraGauges.v21.2.Core, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
     <Reference Include="DevExpress.XtraReports.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DigitalData.Modules.Base, Version=1.3.4.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\DDModules\Base\bin\Debug\DigitalData.Modules.Base.dll</HintPath>
+    <Reference Include="DigitalData.Modules.Base">
+      <HintPath>..\..\2_DLL Projekte\DDModules\Base\bin\Debug\DigitalData.Modules.Base.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.Config">
-      <HintPath>..\..\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll</HintPath>
+      <HintPath>..\..\2_DLL Projekte\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.Database">
-      <HintPath>..\..\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
+      <HintPath>..\..\2_DLL Projekte\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
     </Reference>
-    <Reference Include="DigitalData.Modules.Logging, Version=2.6.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
+    <Reference Include="DigitalData.Modules.Logging">
+      <HintPath>..\..\2_DLL Projekte\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
     </Reference>
-    <Reference Include="GdPicture.NET.14">
-      <HintPath>D:\ProgramFiles\GdPicture.NET 14\Redist\GdPicture.NET (.NET Framework 4.5)\GdPicture.NET.14.dll</HintPath>
+    <Reference Include="GdPicture.NET.14, Version=14.2.89.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.2.89\lib\net462\GdPicture.NET.14.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
@@ -243,11 +243,13 @@
       <Generator>PublicResXFileCodeGenerator</Generator>
       <LastGenOutput>Envelope.en.Designer.vb</LastGenOutput>
       <CustomToolNamespace>My.Resources</CustomToolNamespace>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
     <EmbeddedResource Include="Strings\Envelope.resx">
       <Generator>PublicResXFileCodeGenerator</Generator>
       <LastGenOutput>Envelope1.Designer.vb</LastGenOutput>
       <CustomToolNamespace>My.Resources</CustomToolNamespace>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
     <EmbeddedResource Include="Strings\Email.resx">
       <Generator>PublicResXFileCodeGenerator</Generator>
@@ -287,4 +289,11 @@
   </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
+  <Import Project="..\packages\GdPicture.runtimes.windows.14.2.89\build\net462\GdPicture.runtimes.windows.targets" Condition="Exists('..\packages\GdPicture.runtimes.windows.14.2.89\build\net462\GdPicture.runtimes.windows.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>Dieses Projekt verweist auf mindestens ein NuGet-Paket, das auf diesem Computer fehlt. Verwenden Sie die Wiederherstellung von NuGet-Paketen, um die fehlenden Dateien herunterzuladen. Weitere Informationen finden Sie unter "http://go.microsoft.com/fwlink/?LinkID=322105". Die fehlende Datei ist "{0}".</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\GdPicture.runtimes.windows.14.2.89\build\net462\GdPicture.runtimes.windows.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\GdPicture.runtimes.windows.14.2.89\build\net462\GdPicture.runtimes.windows.targets'))" />
+  </Target>
 </Project>

EnvelopeGenerator.Common/Jobs/FinalizeDocument/FinalizeDocumentJob.vb

@@ -7,17 +7,9 @@ Imports System.Security.Cryptography
 Imports System.IO
 Imports EnvelopeGenerator.Common.Jobs.FinalizeDocument.FinalizeDocumentExceptions
 Imports EnvelopeGenerator.Common.Jobs.FinalizeDocument
-Imports EnvelopeGenerator.Common.My.Resources
 Imports EnvelopeGenerator.Common.Constants
-Imports DevExpress.XtraBars.Docking
-Imports System.ServiceModel
-Imports DevExpress.XtraRichEdit.Export
-Imports DevExpress.Pdf.Native.BouncyCastle.Asn1.Cms
-Imports DevExpress.DataAccess.Sql
 Imports DevExpress.DataProcessing
-Imports Quartz.Logging.OperationName
 Imports System.Data.SqlClient
-Imports System.Windows.Forms
 
 Namespace Jobs
     Public Class FinalizeDocumentJob
@@ -41,7 +33,7 @@ Namespace Jobs
         Private PDFMerger As PDFMerger
         Private ReportCreator As ReportCreator
 
-        Private ReadOnly CompleteWaitTime As Integer = 5
+        Private ReadOnly CompleteWaitTime As Integer = 1
         Private ParentFolderUID As String = ""
         Private myTempFiles As TempFiles
 
@@ -82,7 +74,8 @@ Namespace Jobs
                 InitializeServices(oState)
 
                 Logger.Debug("Loading PDFBurner..")
-                PDFBurner = New PDFBurner(LogConfig, oGdPictureKey)
+                Dim ignoredLabels As List(Of String) = pContext.MergedJobDataMap.Item(Constants.IGNORED_LABELS)
+                PDFBurner = New PDFBurner(LogConfig, oGdPictureKey, ignoredLabels)
 
                 Logger.Debug("Loading PDFMerger..")
                 PDFMerger = New PDFMerger(LogConfig, oGdPictureKey)
@@ -151,76 +144,81 @@ Namespace Jobs
                 For Each oId In oEnvelopeIds
                     Logger.Info("Finalizing Envelope [{0}] ({1}/{2})", oId, oCurrent, oTotal)
                     Logger.Debug("Loading Envelope..")
-                    Dim oEnvelope = EnvelopeModel.GetById(oId)
-                    If oEnvelope Is Nothing Then
-                        Logger.Warn("Envelope could not be loaded for Id [{0}]!", oId)
-                        Throw New ArgumentNullException("EnvelopeData")
-                    End If
-                    Logger.Debug("Loading Envelope Data..")
-                    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
-                    If Config.DOCUMENT_PATH_MOVE_AFTSEND <> String.Empty Then
-                        oEnvelopeData.DocumentPath.Replace(Config.DocumentPathOrigin, Config.DOCUMENT_PATH_MOVE_AFTSEND)
-                        Logger.Debug("Replaced Path in oEnvelopeData.DocumentPath!")
-                    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!")
-                        Throw New ApplicationException("Document could not be finalized")
-                    End If
-
-                    If ActionService.CreateReport(oEnvelope) = False Then
-                        Logger.Warn("Document Report could not be created!")
-                        Throw New ApplicationException("Document Report could not be created")
-                    End If
-
-                    Logger.Debug("Creating report..")
-                    Dim oReport As Byte() = ReportCreator.CreateReport(oEnvelope)
-                    Logger.Debug("Report created!")
-
-                    Logger.Debug("Merging documents ...")
-                    Dim oMergedDocument As Byte() = PDFMerger.MergeDocuments(oBurnedDocument, oReport)
-                    Logger.Debug("Documents merged!")
-
-                    Dim oOutputDirectoryPath = Path.Combine(Config.ExportPath, ParentFolderUID)
-                    If Not Directory.Exists(oOutputDirectoryPath) Then
-                        Directory.CreateDirectory(oOutputDirectoryPath)
-                    End If
-                    Dim oOutputFilePath = Path.Combine(oOutputDirectoryPath, $"{oEnvelope.Uuid}.pdf")
-                    Logger.Info("Writing finalized Pdf to disk..")
-                    Logger.Info("Output path is [{0}]", oOutputFilePath)
-
                     Try
-                        File.WriteAllBytes(oOutputFilePath, oMergedDocument)
-                    Catch ex As Exception
-                        Logger.Warn("Could not export final document to disk!")
-                        Throw New ExportDocumentException("Could not export final document to disk!", ex)
-                    End Try
+                        Dim oEnvelope = EnvelopeModel.GetById(oId)
+                        If oEnvelope Is Nothing Then
+                            Logger.Warn("Envelope could not be loaded for Id [{0}]!", oId)
+                            Throw New ArgumentNullException("EnvelopeData")
+                        End If
+                        Logger.Debug("Loading Envelope Data..")
+                        Dim oEnvelopeData = GetEnvelopeData(oId)
 
-                    If Config.NetUse_Finish = True Then
-                        If Config.FINISHED_PATH_EX_DMZ <> String.Empty Then
-                            If My.Settings.NetUse_PW <> String.Empty And My.Settings.NetUse_Usr <> String.Empty Then
-                                Clean_DNZ_PAth(Config.FINISHED_PATH_EX_DMZ)
+                        If oEnvelopeData Is Nothing Then
+                            Logger.Warn("EnvelopeData could not be loaded for Id [{0}]!", oId)
+                            Throw New ArgumentNullException("EnvelopeData")
+                        End If
+                        If Config.DOCUMENT_PATH_MOVE_AFTSEND <> String.Empty Then
+                            oEnvelopeData.DocumentPath.Replace(Config.DocumentPathOrigin, Config.DOCUMENT_PATH_MOVE_AFTSEND)
+                            Logger.Debug("Replaced Path in oEnvelopeData.DocumentPath!")
+                        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!")
+                            Throw New ApplicationException("Document could not be finalized")
+                        End If
+
+                        If ActionService.CreateReport(oEnvelope) = False Then
+                            Logger.Warn("Document Report could not be created!")
+                            Throw New ApplicationException("Document Report could not be created")
+                        End If
+
+                        Logger.Debug("Creating report..")
+                        Dim oReport As Byte() = ReportCreator.CreateReport(oEnvelope)
+                        Logger.Debug("Report created!")
+
+                        Logger.Debug("Merging documents ...")
+                        Dim oMergedDocument As Byte() = PDFMerger.MergeDocuments(oBurnedDocument, oReport)
+                        Logger.Debug("Documents merged!")
+
+                        Dim oOutputDirectoryPath = Path.Combine(Config.ExportPath, ParentFolderUID)
+                        If Not Directory.Exists(oOutputDirectoryPath) Then
+                            Directory.CreateDirectory(oOutputDirectoryPath)
+                        End If
+                        Dim oOutputFilePath = Path.Combine(oOutputDirectoryPath, $"{oEnvelope.Uuid}.pdf")
+                        Logger.Info("Writing finalized Pdf to disk..")
+                        Logger.Info("Output path is [{0}]", oOutputFilePath)
+
+                        Try
+                            File.WriteAllBytes(oOutputFilePath, oMergedDocument)
+                        Catch ex As Exception
+                            Logger.Warn("Could not export final document to disk!")
+                            Throw New ExportDocumentException("Could not export final document to disk!", ex)
+                        End Try
+
+                        If Config.NetUse_Finish = True Then
+                            If Config.FINISHED_PATH_EX_DMZ <> String.Empty Then
+                                If My.Settings.NetUse_PW <> String.Empty And My.Settings.NetUse_Usr <> String.Empty Then
+                                    Clean_DNZ_PAth(Config.FINISHED_PATH_EX_DMZ)
+                                End If
                             End If
                         End If
-                    End If
-                    Logger.Info("Writing EB-bytes to database...")
-                    Update_File_DB(oOutputFilePath, oEnvelope.Id)
+                        Logger.Info("Writing EB-bytes to database...")
+                        Update_File_DB(oOutputFilePath, oEnvelope.Id)
+
+                        Logger.Info("Sending finalized report-mails..")
+                        If SendFinalEmails(oEnvelope) = False Then ', oOutputFilePath
+                            Throw New ApplicationException("Final emails could not be sent!")
+                        End If
+                        Logger.Debug("Setting envelope status..")
+                        If ActionService.FinalizeEnvelope(oEnvelope) = False Then
+                            Logger.Warn("Envelope could not be finalized!")
+                            Throw New ApplicationException("Envelope could not be finalized")
+                        End If
+                    Catch ex As Exception
+                        Logger.Warn($"Unhandled exception while working envelope [{oId}] - [{ex.Message}]")
+                    End Try
 
-                    Logger.Info("Sending finalized report-mails..")
-                    If SendFinalEmails(oEnvelope) = False Then ', oOutputFilePath
-                        Throw New ApplicationException("Final emails could not be sent!")
-                    End If
-                    Logger.Debug("Setting envelope status..")
-                    If ActionService.FinalizeEnvelope(oEnvelope) = False Then
-                        Logger.Warn("Envelope could not be finalized!")
-                        Throw New ApplicationException("Envelope could not be finalized")
-                    End If
 
                     oCurrent += 1
                     Logger.Info("Envelope finalized!")

EnvelopeGenerator.Common/Jobs/FinalizeDocument/PDFBurner.vb

@@ -16,14 +16,17 @@ 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 Property _ignoredLabels As List(Of String)
 
-        Public Sub New(pLogConfig As LogConfig, pGDPictureLicenseKey As String)
+        Public Sub New(pLogConfig As LogConfig, pGDPictureLicenseKey As String, ignoredLabels As List(Of String))
             MyBase.New(pLogConfig)
 
             LicenseManager = New LicenseManager()
             LicenseManager.RegisterKEY(pGDPictureLicenseKey)
 
             Manager = New AnnotationManager()
+
+            _ignoredLabels = ignoredLabels
         End Sub
 
         Public Function BurnInstantJSONAnnotationsToPDF(pSourceBuffer As Byte(), pInstantJSONList As List(Of String)) As Byte()
@@ -82,7 +85,7 @@ Namespace Jobs.FinalizeDocument
                         Case ANNOTATION_TYPE_WIDGET
                             'Add form field values
                             Dim formFieldValue = oAnnotationData.formFieldValues.FirstOrDefault(Function(fv) fv.name = oAnnotation.id)
-                            If formFieldValue IsNot Nothing Then
+                            If formFieldValue IsNot Nothing AndAlso Not _ignoredLabels.Contains(formFieldValue.value) Then
                                 AddFormFieldValue(oAnnotation, formFieldValue)
                             End If
                     End Select

EnvelopeGenerator.Common/Models/HistoryModel.vb

@@ -10,7 +10,7 @@ Public Class HistoryModel
 
     Private Function ToEnvelopeHistoryEntry(pRow As DataRow) As EnvelopeHistoryEntry
         Return New EnvelopeHistoryEntry() With {
-            .ActionDate = pRow.Item("ACTION_DATE"),
+            .ActionDate = pRow.ItemEx(Of Date)("ACTION_DATE", Nothing),
             .EnvelopeId = pRow.Item("ENVELOPE_ID"),
             .Status = pRow.Item("STATUS"),
             .UserReference = pRow.ItemEx("USER_REFERENCE", "")
@@ -18,7 +18,7 @@ Public Class HistoryModel
     End Function
 
     Public Function List(pEnvelopeId As Integer) As List(Of EnvelopeHistoryEntry)
-        Dim oSql = $"SELECT * FROM TBSIG_ENVELOPE_HISTORY WHERE ENVELOPE_ID = {pEnvelopeId} ORDER BY GUID DESC"
+        Dim oSql = $"SELECT * FROM TBSIG_ENVELOPE_HISTORY WHERE ENVELOPE_ID = {pEnvelopeId} AND ACTION_DATE IS NOT NULL ORDER BY GUID DESC"
         Dim oTable = Database.GetDatatable(oSql)
         Return oTable?.Rows.
             Cast(Of DataRow).

EnvelopeGenerator.Common/My Project/AssemblyInfo.vb

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' indem Sie "*" wie unten gezeigt eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("1.8.0.0")>
-<Assembly: AssemblyFileVersion("1.8.0.0")>
+<Assembly: AssemblyVersion("1.9.3.0")>
+<Assembly: AssemblyFileVersion("1.9.3.0")>

EnvelopeGenerator.Common/Services/ActionService.vb

@@ -1,5 +1,6 @@
 Imports DevExpress.DataAccess.Native.Web
 Imports DigitalData.Modules.Base
+Imports EnvelopeGenerator.Common.My.Resources
 
 Public Class ActionService
     Inherits BaseService
@@ -33,6 +34,20 @@ Public Class ActionService
 
         Return True
     End Function
+    Public Function Resend_Receiver(pEnvelope As Envelope, pmail As String) As Boolean
+        If HistoryService.SetEnvelopeStatus(pEnvelope, Constants.EnvelopeStatus.EnvelopeQueued, pEnvelope.User.Email) = False Then
+            Return False
+        End If
+        Dim oSendResult As Boolean = False
+        For Each oReceiver In pEnvelope.Receivers
+            EmailService.SendDocumentReceivedEmail(pEnvelope, oReceiver)
+        Next
+        Return oSendResult
+    End Function
+    Public Function ResendReceiver(pEnvelope As Envelope, pReceiver As EnvelopeReceiver) As Boolean
+        EmailService.SendDocumentReceivedEmail(pEnvelope, pReceiver)
+    End Function
+
 
     Public Function DeleteEnvelope(pEnvelope As Envelope, pReason As String) As Boolean
         If HistoryService.SetEnvelopeStatus(pEnvelope, Constants.EnvelopeStatus.EnvelopeDeleted, pEnvelope.User.Email) = False Then

EnvelopeGenerator.Common/Services/EmailService.vb

@@ -1,6 +1,7 @@
 
 Imports DigitalData.Modules.Base
 Imports DigitalData.Modules.Logging
+Imports EnvelopeGenerator.Common.My.Resources
 
 Public Class EmailService
     Inherits BaseService
@@ -49,6 +50,15 @@ Public Class EmailService
         Return True
     End Function
 
+    Public Function GetReceiverUrl(pEnvelope As Envelope, pReceiver As EnvelopeReceiver) As String
+        Dim oEmailData As New EmailData(pEnvelope, pReceiver, Constants.EnvelopeStatus.MessageInvitationSent) With
+        {
+          .SignatureLink = Helpers.GetEnvelopeURL(State.DbConfig.SignatureHost, pEnvelope.Uuid, pReceiver.Signature)
+        }
+        Return oEmailData.SignatureLink
+    End Function
+
+
     Public Function SendDocumentAccessCodeReceivedEmail(pEnvelope As Envelope, pReceiver As EnvelopeReceiver) As Boolean
         Logger.Debug("Creating email data object.")
         Dim oEmailData As New EmailData(pEnvelope, pReceiver, Constants.EnvelopeStatus.MessageAccessCodeSent) With

EnvelopeGenerator.Common/Strings/Envelope.en.resx

@@ -154,7 +154,7 @@
     <value>Envelope could not be sent!</value>
   </data>
   <data name="Envelope Invitations Sent" xml:space="preserve">
-    <value>Envelope Invitations Sent</value>
+    <value>The invitations have been scheduled for dispatch.s</value>
   </data>
   <data name="Envelope Overview" xml:space="preserve">
     <value>Overview</value>
@@ -186,6 +186,9 @@
   <data name="Invalid Email Address" xml:space="preserve">
     <value>Receiver {0} has an invalid Email Address.</value>
   </data>
+  <data name="Invitation successfully resend" xml:space="preserve">
+    <value>Invitation has been send once again!</value>
+  </data>
   <data name="Missing Documents" xml:space="preserve">
     <value>Missing Documents</value>
   </data>

EnvelopeGenerator.Common/Strings/Envelope.resx

@@ -154,7 +154,7 @@
     <value>Umschlag konnte nicht gesendet werden!</value>
   </data>
   <data name="Envelope Invitations Sent" xml:space="preserve">
-    <value>Die Einladungen wurden versendet</value>
+    <value>Die Einladungen zum Signieren wurden zum Versand eingereiht.</value>
   </data>
   <data name="Envelope Overview" xml:space="preserve">
     <value>Übersicht</value>
@@ -186,6 +186,9 @@
   <data name="Invalid Email Address" xml:space="preserve">
     <value>Empfänger {0} hat keine gültige Email Addresse.</value>
   </data>
+  <data name="Invitation successfully resend" xml:space="preserve">
+    <value>Die Einladung wurde nochmal versendet!</value>
+  </data>
   <data name="Missing Documents" xml:space="preserve">
     <value>Fehlendes Dokument</value>
   </data>

EnvelopeGenerator.Common/Strings/Envelope1.Designer.vb

@@ -182,7 +182,7 @@ Namespace My.Resources
         End Property
         
         '''<summary>
-        '''  Sucht eine lokalisierte Zeichenfolge, die Die Einladungen wurden versendet ähnelt.
+        '''  Sucht eine lokalisierte Zeichenfolge, die Die Einladungen zum Signieren wurden zum Versand eingereiht. ähnelt.
         '''</summary>
         Public Shared ReadOnly Property Envelope_Invitations_Sent() As String
             Get
@@ -271,6 +271,15 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Sucht eine lokalisierte Zeichenfolge, die Die Einladung wurde nochmal versendet! ähnelt.
+        '''</summary>
+        Public Shared ReadOnly Property Invitation_successfully_resend() As String
+            Get
+                Return ResourceManager.GetString("Invitation successfully resend", resourceCulture)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Sucht eine lokalisierte Zeichenfolge, die Fehlendes Dokument ähnelt.
         '''</summary>

EnvelopeGenerator.Common/packages.config

@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="GdPicture" version="14.2.89" targetFramework="net462" />
+  <package id="GdPicture.runtimes.windows" version="14.2.89" targetFramework="net462" />
   <package id="Microsoft.Extensions.Logging.Abstractions" version="2.1.1" targetFramework="net462" />
   <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net462" />
   <package id="Quartz" version="3.8.0" targetFramework="net462" />

EnvelopeGenerator.Domain/Entities/Config.cs

@@ -1,43 +1,41 @@
-using System.ComponentModel;
+using DigitalData.Core.Abstractions;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
 namespace EnvelopeGenerator.Domain.Entities
 {
     [Table("TBSIG_CONFIG", Schema = "dbo")]
-    public class Config
+    public class Config : IUnique<int>
     {
         [Column("DOCUMENT_PATH", TypeName = "nvarchar(256)")]
-        public string DocumentPath { get; set; }
+        public string? DocumentPath { get; init; }
 
         [Column("SENDING_PROFILE", TypeName = "int")]
         [Required]
-        [DatabaseGenerated(DatabaseGeneratedOption.None)] // Assuming SENDING_PROFILE is manually entered or controlled by the application logic
-        [DefaultValue(0)] // This sets the default value for SENDING_PROFILE
-        public int SendingProfile { get; set; }
+        public required int SendingProfile { get; init; }
 
         [Column("SIGNATURE_HOST", TypeName = "nvarchar(128)")]
-        public string SignatureHost { get; set; }
+        public string? SignatureHost { get; init; }
 
         [Column("EXTERNAL_PROGRAM_NAME", TypeName = "nvarchar(30)")]
-        public string ExternalProgramName { get; set; }
+        public string? ExternalProgramName { get; init; }
 
         [Column("EXPORT_PATH", TypeName = "nvarchar(256)")]
-        public string ExportPath { get; set; }
+        public string? ExportPath { get; init; }
 
         [Column("DOCUMENT_PATH_DMZ", TypeName = "nvarchar(512)")]
         [Required]
-        [DefaultValue("")] // This sets the default value for DOCUMENT_PATH_DMZ
-        public string DocumentPathDmz { get; set; }
+        public string? DocumentPathDmz { get; init; }
 
         [Column("EXPORT_PATH_DMZ", TypeName = "nvarchar(512)")]
         [Required]
-        [DefaultValue("")] // This sets the default value for EXPORT_PATH_DMZ
-        public string ExportPathDmz { get; set; }
+        public required string ExportPathDmz { get; init; }
 
         [Column("DOCUMENT_PATH_MOVE_AFTSEND", TypeName = "nvarchar(512)")]
         [Required]
-        [DefaultValue("")] // This sets the default value for DOCUMENT_PATH_MOVE_AFTSEND
-        public string DocumentPathMoveAftsend { get; set; }
+        public required string DocumentPathMoveAftsend { get; init; }
+
+        [Obsolete("Configuration does not have an ID; it represents a single table in the database.")]
+        public int Id => throw new InvalidOperationException("This configuration does not support an ID as it represents a single table in the database.");
     }
 }

EnvelopeGenerator.Domain/Entities/DocumentReceiverElement.cs

@@ -1,11 +1,12 @@
-using System.ComponentModel;
+using DigitalData.Core.Abstractions;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
 namespace EnvelopeGenerator.Domain.Entities
 {
     [Table("TBSIG_DOCUMENT_RECEIVER_ELEMENT", Schema = "dbo")]
-    public class DocumentReceiverElement
+    public class DocumentReceiverElement : IUnique<int>
     {
         [Key]
         [DatabaseGenerated(DatabaseGeneratedOption.Identity)]

EnvelopeGenerator.Domain/Entities/DocumentStatus.cs

@@ -1,10 +1,11 @@
-using System.ComponentModel.DataAnnotations;
+using DigitalData.Core.Abstractions;
+using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
 namespace EnvelopeGenerator.Domain.Entities
 {
     [Table("TBSIG_DOCUMENT_STATUS", Schema = "dbo")]
-    public class DocumentStatus
+    public class DocumentStatus : IUnique<int>
     {
         [Key]
         [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
@@ -27,7 +28,7 @@ namespace EnvelopeGenerator.Domain.Entities
         public DateTime? StatusChangedWhen { get; set; }
 
         [Column("VALUE", TypeName = "nvarchar(max)")]
-        public string Value { get; set; }
+        public string? Value { get; set; }
 
         [Required]
         [Column("ADDED_WHEN", TypeName = "datetime")]
@@ -42,4 +43,4 @@ namespace EnvelopeGenerator.Domain.Entities
         [ForeignKey("ReceiverId")]
         public virtual Receiver? Receiver { get; set; }
     }
-}
+}

EnvelopeGenerator.Domain/Entities/EmailTemplate.cs

@@ -1,10 +1,11 @@
-using System.ComponentModel.DataAnnotations;
+using DigitalData.Core.Abstractions;
+using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
 namespace EnvelopeGenerator.Domain.Entities
 {
     [Table("TBSIG_EMAIL_TEMPLATE", Schema = "dbo")]
-    public class EmailTemplate
+    public class EmailTemplate : IUnique<int>
     {
         [Key]
         [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
@@ -12,12 +13,12 @@ namespace EnvelopeGenerator.Domain.Entities
         public int Id { get; set; }
 
         [Column("NAME", TypeName = "nvarchar(64)")]
-        public string Name { get; set; }
+        public string? Name { get; set; }
 
         [Column("BODY", TypeName = "nvarchar(max)")]
-        public string Body { get; set; }
+        public string? Body { get; set; }
 
         [Column("SUBJECT", TypeName = "nvarchar(512)")]
-        public string Subject { get; set; }
+        public string? Subject { get; set; }
     }
 }

EnvelopeGenerator.Domain/Entities/Envelope.cs

@@ -1,12 +1,12 @@
-using EnvelopeGenerator.Common;
-using EnvelopeGenerator.Common.My.Resources;
+using DigitalData.Core.Abstractions;
+using EnvelopeGenerator.Common;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
 namespace EnvelopeGenerator.Domain.Entities
 {
     [Table("TBSIG_ENVELOPE", Schema = "dbo")]
-    public class Envelope
+    public class Envelope : IUnique<int>
     {
         [Key]
         [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
@@ -21,13 +21,16 @@ namespace EnvelopeGenerator.Domain.Entities
         [Column("STATUS")]
         public int Status { get; set; }
 
+        [NotMapped]
+        public string StatusName  => ((Constants.EnvelopeStatus)Status).ToString();
+
         [Required]
         [Column("ENVELOPE_UUID", TypeName = "nvarchar(36)")]
-        public string Uuid { get; set; }
+        public required string Uuid { get; init; }
 
         [Required]
         [Column("MESSAGE", TypeName = "nvarchar(max)")]
-        public string Message { get; set; }
+        public string? Message { get; set; }
 
         [Column("EXPIRES_WHEN", TypeName = "datetime")]
         public DateTime? ExpiresWhen { get; set; }
@@ -43,13 +46,13 @@ namespace EnvelopeGenerator.Domain.Entities
         public DateTime? ChangedWhen { get; set; }
 
         [Column("TITLE", TypeName = "nvarchar(128)")]
-        public string Title { get; set; }
+        public string? Title { get; set; }
 
         [Column("CONTRACT_TYPE")]
         public int? ContractType { get; set; }
 
         [Column("LANGUAGE", TypeName = "nvarchar(5)")]
-        public string Language { get; set; }
+        public required string Language { get; set; }
 
         [Column("SEND_REMINDER_EMAILS")]
         public bool? SendReminderEmails { get; set; }

EnvelopeGenerator.Domain/Entities/EnvelopeCertificate.cs

@@ -1,10 +1,11 @@
-using System.ComponentModel.DataAnnotations;
+using DigitalData.Core.Abstractions;
+using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
 namespace EnvelopeGenerator.Domain.Entities
 {
     [Table("TBSIG_ENVELOPE_CERTIFICATE", Schema = "dbo")]
-    public class EnvelopeCertificate
+    public class EnvelopeCertificate : IUnique<int>
     {
         [Key]
         [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
@@ -17,11 +18,11 @@ namespace EnvelopeGenerator.Domain.Entities
 
         [Required]
         [Column("ENVELOPE_UUID", TypeName = "nvarchar(36)")]
-        public string EnvelopeUuid { get; set; }
+        public required string EnvelopeUuid { get; set; }
 
         [Required]
         [Column("ENVELOPE_SUBJECT", TypeName = "nvarchar(512)")]
-        public string EnvelopeSubject { get; set; }
+        public required string EnvelopeSubject { get; set; }
 
         [Required]
         [Column("CREATOR_ID")]
@@ -29,11 +30,11 @@ namespace EnvelopeGenerator.Domain.Entities
 
         [Required]
         [Column("CREATOR_NAME", TypeName = "nvarchar(128)")]
-        public string CreatorName { get; set; }
+        public required string CreatorName { get; set; }
 
         [Required]
         [Column("CREATOR_EMAIL", TypeName = "nvarchar(128)")]
-        public string CreatorEmail { get; set; }
+        public required string CreatorEmail { get; set; }
 
         [Required]
         [Column("ENVELOPE_STATUS")]

EnvelopeGenerator.Domain/Entities/EnvelopeDocument.cs

@@ -1,10 +1,11 @@
-using System.ComponentModel.DataAnnotations;
+using DigitalData.Core.Abstractions;
+using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
 namespace EnvelopeGenerator.Domain.Entities
 {
     [Table("TBSIG_ENVELOPE_DOCUMENT", Schema = "dbo")]
-    public class EnvelopeDocument
+    public class EnvelopeDocument : IUnique<int>
     {
         [Key]
         [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
@@ -17,18 +18,18 @@ namespace EnvelopeGenerator.Domain.Entities
 
         [Required]
         [Column("FILENAME", TypeName = "nvarchar(256)")]
-        public string Filename { get; set; }
+        public required string Filename { get; set; }
 
         [Required]
         [Column("FILEPATH", TypeName = "nvarchar(256)")]
-        public string Filepath { get; set; }
+        public required string Filepath { get; set; }
 
         [Required]
         [Column("ADDED_WHEN", TypeName = "datetime")]
-        public DateTime AddedWhen { get; set; }
+        public required DateTime AddedWhen { get; set; }
 
         [Column("FILENAME_ORIGINAL", TypeName = "nvarchar(256)")]
-        public string FilenameOriginal { get; set; }
+        public required string FilenameOriginal { get; set; }
 
         public IEnumerable<DocumentReceiverElement>? Elements { get; set; }
     }

EnvelopeGenerator.Domain/Entities/EnvelopeHistory.cs

@@ -1,4 +1,5 @@
-using DigitalData.UserManager.Domain.Entities;
+using DigitalData.Core.Abstractions;
+using DigitalData.UserManager.Domain.Entities;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using static EnvelopeGenerator.Common.Constants;
@@ -6,7 +7,7 @@ using static EnvelopeGenerator.Common.Constants;
 namespace EnvelopeGenerator.Domain.Entities
 {
     [Table("TBSIG_ENVELOPE_HISTORY", Schema = "dbo")]
-    public class EnvelopeHistory
+    public class EnvelopeHistory : IUnique<long>
     {
         [Key]
         [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
@@ -19,7 +20,7 @@ namespace EnvelopeGenerator.Domain.Entities
 
         [Required]
         [Column("USER_REFERENCE", TypeName = "nvarchar(128)")]
-        public string UserReference { get; set; }
+        public required string UserReference { get; init; }
 
         [Required]
         [Column("STATUS")]
@@ -43,11 +44,17 @@ namespace EnvelopeGenerator.Domain.Entities
         public virtual Receiver? Receiver { get; set; }
 
         [NotMapped]
-        public ReferenceType ReferenceType => (Status / 3) switch
+        public ReferenceType ReferenceType => (Status / 1000) switch
         {
             1 => ReferenceType.Sender,
             2 or 3 => ReferenceType.Receiver,
             _ => ReferenceType.Unknown,
         };
+
+        [NotMapped]
+        public string? StatusName
+            => (Enum.IsDefined(typeof(EnvelopeStatus), Status)) 
+                ? Enum.GetName(typeof(EnvelopeStatus), Status) 
+                : null;            
     }
 }

EnvelopeGenerator.Domain/Entities/EnvelopeReceiver.cs

@@ -1,45 +1,10 @@
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
+using System.ComponentModel.DataAnnotations.Schema;
 
 namespace EnvelopeGenerator.Domain.Entities
 {
     [Table("TBSIG_ENVELOPE_RECEIVER", Schema = "dbo")]
-    public class EnvelopeReceiver
+    public class EnvelopeReceiver : EnvelopeReceiverBase
     {
-        [Key]
-        [Column("ENVELOPE_ID")]
-        public int EnvelopeId { get; set; }
-
-        [Key]
-        [Column("RECEIVER_ID")]
-        public int ReceiverId { get; set; }
-
-        [Required]
-        [Column("SEQUENCE")]
-        public int Sequence { get; set; }
-
-        [Column("NAME", TypeName = "nvarchar(128)")]
-        public string? Name { get; set; }
-
-        [Column("JOB_TITLE", TypeName = "nvarchar(128)")]
-        public string? JobTitle { get; set; }
-
-        [Column("COMPANY_NAME", TypeName = "nvarchar(128)")]
-        public string? CompanyName { get; set; }
-
-        [Column("PRIVATE_MESSAGE", TypeName = "nvarchar(max)")]
-        public string? PrivateMessage { get; set; }
-
-        [Column("ACCESS_CODE", TypeName = "nvarchar(64)")]
-        public string? AccessCode { get; set; }
-
-        [Required]
-        [Column("ADDED_WHEN", TypeName = "datetime")]
-        public DateTime AddedWhen { get; set; }
-
-        [Column("CHANGED_WHEN", TypeName = "datetime")]
-        public DateTime? ChangedWhen { get; set; }
-
         [ForeignKey("EnvelopeId")]
         public Envelope? Envelope { get; set; }
 

EnvelopeGenerator.Domain/Entities/EnvelopeReceiverBase.cs

@@ -0,0 +1,46 @@
+using DigitalData.Core.Abstractions;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace EnvelopeGenerator.Domain.Entities
+{
+    [Table("TBSIG_ENVELOPE_RECEIVER", Schema = "dbo")]
+    public class EnvelopeReceiverBase : IUnique<(int Envelope, int Receiver)>
+    {
+        [Key]
+        [Column("ENVELOPE_ID")]
+        public int EnvelopeId { get; set; }
+
+        [Key]
+        [Column("RECEIVER_ID")]
+        public int ReceiverId { get; set; }
+
+        [Required]
+        [Column("SEQUENCE")]
+        public int Sequence { get; set; }
+
+        [Column("NAME", TypeName = "nvarchar(128)")]
+        public string? Name { get; set; }
+
+        [Column("JOB_TITLE", TypeName = "nvarchar(128)")]
+        public string? JobTitle { get; set; }
+
+        [Column("COMPANY_NAME", TypeName = "nvarchar(128)")]
+        public string? CompanyName { get; set; }
+
+        [Column("PRIVATE_MESSAGE", TypeName = "nvarchar(max)")]
+        public string? PrivateMessage { get; set; }
+
+        [Column("ACCESS_CODE", TypeName = "nvarchar(64)")]
+        public string? AccessCode { get; set; }
+
+        [Required]
+        [Column("ADDED_WHEN", TypeName = "datetime")]
+        public DateTime AddedWhen { get; set; }
+
+        [Column("CHANGED_WHEN", TypeName = "datetime")]
+        public DateTime? ChangedWhen { get; set; }
+
+        public (int Envelope, int Receiver) Id => (Envelope: EnvelopeId, Receiver: ReceiverId);
+    }
+}

EnvelopeGenerator.Domain/Entities/EnvelopeReceiverReadOnly.cs

@@ -0,0 +1,52 @@
+using System.ComponentModel.DataAnnotations.Schema;
+using System.ComponentModel.DataAnnotations;
+using DigitalData.Core.Abstractions;
+using DigitalData.EmailProfilerDispatcher.Abstraction.Attributes;
+
+namespace EnvelopeGenerator.Domain.Entities
+{
+    [Table("TBSIG_ENVELOPE_RECEIVER_READ_ONLY")]
+    public class EnvelopeReceiverReadOnly : IUnique<long>
+    {
+        [Key]
+        [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+        [Column("GUID")]
+        public long Id { get; init; }
+
+        [Column("ENVELOPE_ID")]
+        [Required]
+        public long EnvelopeId { get; init; }
+
+        //TODO: remove NotMapped attribute when EnvelopeId data type is standardized
+        [NotMapped]
+        public Envelope? Envelope { get; set; }
+
+        [Column("RECEIVER_MAIL")]
+        [Required]
+        [StringLength(250)]
+        [TemplatePlaceholder("NAME_RECEIVER")]
+        public required string ReceiverMail { get; init; }
+
+        [Column("DATE_VALID")]
+        [Required]
+        public DateTime DateValid { get; init; }
+
+        [Column("ADDED_WHO")]
+        [Required]
+        [StringLength(100)]
+        public required string AddedWho { get; init; }
+
+        public Receiver? Receiver { get; init; }
+
+        [Column("ADDED_WHEN")]
+        [Required]
+        public DateTime AddedWhen { get; init; }
+
+        [Column("CHANGED_WHO")]
+        [StringLength(100)]
+        public string? ChangedWho { get; init; }
+
+        [Column("CHANGED_WHEN")]
+        public DateTime? ChangedWhen { get; init; }
+    }
+}

EnvelopeGenerator.Domain/Entities/EnvelopeType.cs

@@ -1,12 +1,11 @@
-using System;
+using DigitalData.Core.Abstractions;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
-using EnvelopeGenerator.Domain.Entities;
 
 namespace EnvelopeGenerator.Domain.Entities
 {
     [Table("TBSIG_ENVELOPE_TYPE", Schema = "dbo")]
-    public class EnvelopeType
+    public class EnvelopeType : IUnique<int>
     {
         [Key]
         [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
@@ -15,10 +14,10 @@ namespace EnvelopeGenerator.Domain.Entities
 
         [Required]
         [Column("TITLE", TypeName = "nvarchar(128)")]
-        public string Title { get; set; }
+        public required string Title { get; set; }
 
         [Column("LANGUAGE", TypeName = "nvarchar(5)")]
-        public string Language { get; set; }
+        public string? Language { get; set; }
 
         [Column("EXPIRES_DAYS")]
         public int? ExpiresDays { get; set; }

EnvelopeGenerator.Domain/Entities/Receiver.cs

@@ -1,26 +1,29 @@
-using System.ComponentModel.DataAnnotations;
+using DigitalData.Core.Abstractions;
+using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
 namespace EnvelopeGenerator.Domain.Entities
 {
     [Table("TBSIG_RECEIVER", Schema = "dbo")]
-    public class Receiver
+    public class Receiver : IUnique<int>
     {
         [Key]
         [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
         [Column("GUID")]
         public int Id { get; set; }
-
-        [Required]
+        
+        [Required, EmailAddress]
         [Column("EMAIL_ADDRESS", TypeName = "nvarchar(128)")]
-        public string EmailAddress { get; set; }
+        public required string EmailAddress { get; set; }
 
         [Required]
         [Column("SIGNATURE", TypeName = "nvarchar(64)")]
-        public string Signature { get; set; }
+        public required string Signature { get; set; }
 
         [Required]
         [Column("ADDED_WHEN", TypeName = "datetime")]
         public DateTime AddedWhen { get; set; }
+
+        public IEnumerable<EnvelopeReceiver>? EnvelopeReceivers { get; init; }
     }
 }

EnvelopeGenerator.Domain/Entities/UserReceiver.cs

@@ -1,10 +1,11 @@
-using System.ComponentModel.DataAnnotations;
+using DigitalData.Core.Abstractions;
+using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
 namespace EnvelopeGenerator.Domain.Entities
 {
     [Table("TBSIG_USER_RECEIVER", Schema = "dbo")]
-    public class UserReceiver
+    public class UserReceiver : IUnique<int>
     {
         [Key]
         [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
@@ -21,16 +22,16 @@ namespace EnvelopeGenerator.Domain.Entities
 
         [Required]
         [Column("NAME", TypeName = "nvarchar(128)")]
-        public string Name { get; set; }
+        public required string Name { get; set; }
 
         [Column("COMPANY_NAME", TypeName = "nvarchar(128)")]
-        public string CompanyName { get; set; }
+        public string? CompanyName { get; set; }
 
         [Column("JOB_TITLE", TypeName = "nvarchar(128)")]
-        public string JobTitle { get; set; }
+        public string? JobTitle { get; set; }
 
         [Required]
         [Column("ADDED_WHEN", TypeName = "datetime")]
-        public DateTime AddedWhen { get; set; }
+        public required DateTime AddedWhen { get; init; }
     }
 }

EnvelopeGenerator.Domain/EnvelopeGenerator.Domain.csproj

@@ -7,22 +7,13 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="DigitalData.Core.Abstractions" Version="1.0.1.1" />
-    <PackageReference Include="DigitalData.Core.API" Version="1.0.2.1" />
-    <PackageReference Include="DigitalData.Core.Application" Version="1.0.0" />
-    <PackageReference Include="DigitalData.Core.DTO" Version="1.0.0" />
-    <PackageReference Include="DigitalData.Core.Infrastructure" Version="1.0.1.1" />
+    <PackageReference Include="DigitalData.Core.Abstractions" Version="2.0.0" />
     <PackageReference Include="DigitalData.EmailProfilerDispatcher.Abstraction" Version="1.0.0" />
+    <PackageReference Include="UserManager.Domain" Version="1.0.0" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\EnvelopeGenerator.Common\EnvelopeGenerator.Common.vbproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Reference Include="DigitalData.UserManager.Domain">
-      <HintPath>..\..\WebUserManager\DigitalData.UserManager.Domain\bin\Debug\net7.0\DigitalData.UserManager.Domain.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-
 </Project>

EnvelopeGenerator.Extensions/DecodingExtensions.cs

@@ -0,0 +1,152 @@
+using System.Text;
+using static EnvelopeGenerator.Common.Constants;
+
+namespace EnvelopeGenerator.Extensions
+{
+    public static class DecodingExtensions
+    {
+        /// <summary>
+        /// Validates whether a given string is a correctly formatted Base-64 encoded string.
+        /// </summary>
+        /// <remarks>
+        /// This method checks the string for proper Base-64 formatting, which includes validating
+        /// the length of the string (must be divisible by 4). It also checks each character to ensure
+        /// it belongs to the Base-64 character set (A-Z, a-z, 0-9, '+', '/', and '=' for padding).
+        /// The method ensures that padding characters ('=') only appear at the end of the string and
+        /// are in a valid configuration (either one '=' at the end if the string's length % 4 is 3,
+        /// or two '==' if the length % 4 is 2).
+        /// </remarks>
+        /// <param name="input">The Base-64 encoded string to validate.</param>
+        /// <returns>
+        /// <c>true</c> if the string is a valid Base-64 encoded string; otherwise, <c>false</c>.
+        /// </returns>
+        /// <example>
+        /// <code>
+        /// string testString = "TWFuIGlzIGRpc3Rpbmd1aXNoZWQsIG5vdCBvbmx5IGJ5IGhpcyByZWFzb24sIGJ1dCBieSB0aGlzIHNpbmd1bGFyIHBhc3Npb24gZnJvbSBvdGhlciBhbmltYWxzLCB3aGljaCBpcyBhIGx1c3Qgb2YgdGhlIG1pbmQsIHRoYXQgYnk=";
+        /// bool isValid = IsValidBase64String(testString);
+        /// Console.WriteLine(isValid); // Output: true
+        /// </code>
+        /// </example>
+        public static bool IsBase64String(this string input)
+        {
+            // Check if the string is null or empty
+            if (string.IsNullOrEmpty(input))
+            {
+                return false;
+            }
+
+            // Replace valid base-64 padding
+            input = input.Trim();
+            int mod4 = input.Length % 4;
+            if (mod4 > 0)
+            {
+                // Base-64 string lengths should be divisible by 4
+                return false;
+            }
+
+            // Check each character to ensure it is valid base-64
+            foreach (char c in input)
+            {
+                if (!char.IsLetterOrDigit(c) && c != '+' && c != '/' && c != '=')
+                {
+                    // Invalid character detected
+                    return false;
+                }
+            }
+
+            // Ensure no invalid padding scenarios exist
+            if (input.EndsWith("==") && (input.Length % 4 == 0) ||
+                input.EndsWith("=") && (input.Length % 4 == 3))
+            {
+                return true;
+            }
+
+            return input.IndexOf('=') == -1; // No padding allowed except at the end
+        }
+
+        public static bool TryDecode(this string encodedKey, out string[] decodedKeys)
+        {
+            try
+            {
+                byte[] bytes = Convert.FromBase64String(encodedKey);
+                string decodedString = Encoding.UTF8.GetString(bytes);
+                decodedKeys = decodedString.Split(new string[] { "::" }, StringSplitOptions.None);
+                return true;
+            }
+            catch(ArgumentNullException) { }
+            catch (FormatException) { }
+            catch(ArgumentException) { }
+
+            decodedKeys = Array.Empty<string>();
+            return false;
+        }
+
+        public static EncodeType GetEncodeType(this string[] decodedKeys) => decodedKeys.Length switch
+        {
+            2 => EncodeType.EnvelopeReceiver,
+            3 => long.TryParse(decodedKeys[1], out var _) ? EncodeType.EnvelopeReceiverReadOnly : EncodeType.Undefined,
+            _ => EncodeType.Undefined,
+        };
+
+        public static (string? EnvelopeUuid, string? ReceiverSignature) ParseEnvelopeReceiverId(this string[] decodedKeys)
+            => decodedKeys.GetEncodeType() == EncodeType.EnvelopeReceiver
+            ? (EnvelopeUuid: decodedKeys[0], ReceiverSignature: decodedKeys[1])
+            : throw new InvalidOperationException("Attempted to convert a decoded other than type EnvelopeReceiver to EnvelopeReceiver.");
+
+        public static long ParseReadOnlyId(this string[] decodedKeys)
+            => decodedKeys.GetEncodeType() == EncodeType.EnvelopeReceiverReadOnly
+            ? long.Parse(decodedKeys[1])
+            : throw new InvalidOperationException("Attempted to convert a decoded other than type EnvelopeReceiver to EnvelopeReceiver. ");
+
+        /// <summary>
+        /// Decodes the envelope receiver ID and extracts the envelope UUID and receiver signature.
+        /// </summary>
+        /// <param name="envelopeReceiverId">The base64 encoded string containing the envelope UUID and receiver signature.</param>
+        /// <returns>A tuple containing the envelope UUID and receiver signature.</returns>
+        public static (string? EnvelopeUuid, string? ReceiverSignature) DecodeEnvelopeReceiverId(this string envelopeReceiverId)
+        {
+            if (!envelopeReceiverId.IsBase64String())
+            {
+                return (null, null);
+            }
+            byte[] bytes = Convert.FromBase64String(envelopeReceiverId);
+            string decodedString = Encoding.UTF8.GetString(bytes);
+            string[] parts = decodedString.Split(new string[] { "::" }, StringSplitOptions.None);
+
+            if (parts.Length > 1)
+                return (EnvelopeUuid: parts[0], ReceiverSignature: parts[1]);
+            else
+                return (string.Empty, string.Empty);
+        }
+
+        public static long? DecodeEnvelopeReceiverReadOnlyId(this string envelopeReceiverReadOnlyId)
+        {
+            if (!envelopeReceiverReadOnlyId.IsBase64String())
+            {
+                return null;
+            }
+            byte[] bytes = Convert.FromBase64String(envelopeReceiverReadOnlyId);
+            string decodedString = System.Text.Encoding.UTF8.GetString(bytes);
+            string[] parts = decodedString.Split(new string[] { "::" }, StringSplitOptions.None);
+
+            if (parts.Length > 2)
+                return long.TryParse(parts[1], out long readOnlyId) ? readOnlyId : null;
+            else
+                return null;
+        }
+
+        /// <summary>
+        /// Gets the envelope UUID from the decoded envelope receiver ID.
+        /// </summary>
+        /// <param name="envelopeReceiverId">The base64 encoded string to decode.</param>
+        /// <returns>The envelope UUID.</returns>
+        public static string? GetEnvelopeUuid(this string envelopeReceiverId) => envelopeReceiverId.DecodeEnvelopeReceiverId().EnvelopeUuid;
+
+        /// <summary>
+        /// Gets the receiver signature from the decoded envelope receiver ID.
+        /// </summary>
+        /// <param name="envelopeReceiverId">The base64 encoded string to decode.</param>
+        /// <returns>The receiver signature.</returns>
+        public static string? GetReceiverSignature(this string envelopeReceiverId) => envelopeReceiverId.DecodeEnvelopeReceiverId().ReceiverSignature;
+    }
+}

EnvelopeGenerator.Extensions/EncodingExtensions.cs

@@ -0,0 +1,30 @@
+using Microsoft.Extensions.Logging;
+using System.Text;
+
+namespace EnvelopeGenerator.Extensions
+{
+    /// <summary>
+    /// Provides extension methods for decoding and extracting information from an envelope receiver ID.
+    /// </summary>
+    public static class EncodingExtensions
+    {
+        public static string EncodeEnvelopeReceiverId(this long readOnlyId)
+        {
+            //The random number is used as a salt to increase security but it is not saved in the database.
+            string combinedString = $"{Random.Shared.Next()}::{readOnlyId}::{Random.Shared.Next()}";
+            byte[] bytes = Encoding.UTF8.GetBytes(combinedString);
+            string base64String = Convert.ToBase64String(bytes);
+
+            return base64String;
+        }
+
+        public static string EncodeEnvelopeReceiverId(this (string envelopeUuid, string receiverSignature) input)
+        {
+            string combinedString = $"{input.envelopeUuid}::{input.receiverSignature}";
+            byte[] bytes = Encoding.UTF8.GetBytes(combinedString);
+            string base64String = Convert.ToBase64String(bytes);
+
+            return base64String;
+        }
+    }
+}

EnvelopeGenerator.Extensions/EnvelopeGenerator.Extensions.csproj

@@ -0,0 +1,19 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net7.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="HtmlSanitizer" Version="8.0.865" />
+    <PackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="7.0.19" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\EnvelopeGenerator.Common\EnvelopeGenerator.Common.vbproj" />
+  </ItemGroup>
+
+</Project>

EnvelopeGenerator.Extensions/LoggerExtensions.cs

@@ -0,0 +1,42 @@
+using Microsoft.Extensions.Logging;
+using System.Text;
+
+namespace EnvelopeGenerator.Extensions
+{
+    public static class LoggerExtensions
+    {
+        public static void LogEnvelopeError(this ILogger logger, string envelopeReceiverId, Exception? exception = null, string? message = null, params object?[] args)
+        {
+            var sb = new StringBuilder().AppendLine(envelopeReceiverId.DecodeEnvelopeReceiverId().ToTitle());
+
+            if (message is not null)
+                sb.AppendLine(message);
+
+            if (exception is null)
+                logger.Log(LogLevel.Error, sb.ToString(), args);
+            else
+                logger.Log(LogLevel.Error, exception, sb.AppendLine(exception.Message).ToString(), args);
+        }
+
+        public static void LogEnvelopeError(this ILogger logger, string? uuid, string? signature = null, Exception? exception = null, string? message = null, params object?[] args)
+        {
+            var sb = new StringBuilder($"Envelope Uuid: {uuid}");
+
+            if (signature is not null)
+                sb.AppendLine().Append($"Receiver Signature: {signature}");
+
+            if (message is not null)
+                sb.AppendLine().Append(message);
+
+            if (exception is null)
+                logger.Log(LogLevel.Error, sb.ToString(), args);
+            else
+                logger.Log(LogLevel.Error, exception, sb.ToString(), args);
+        }
+
+        public static string ToTitle(this (string? UUID, string? Signature) envelopeReceiverTuple)
+        {
+            return $"UUID is {envelopeReceiverTuple.UUID} and signature is {envelopeReceiverTuple.Signature}";
+        }
+    }
+}

EnvelopeGenerator.Extensions/XSSExtensions.cs

@@ -0,0 +1,17 @@
+using Ganss.Xss;
+using Microsoft.Extensions.Localization;
+using System.Text.Encodings.Web;
+
+namespace EnvelopeGenerator.Extensions
+{
+    public static class XSSExtensions
+    {
+        public static string? TryEncode(this string? value, UrlEncoder encoder) => value is null ? value : encoder.Encode(value);
+
+        public static string? TryEncode(this LocalizedString? value, UrlEncoder encoder) => value is null ? null : encoder.Encode(value);
+
+        public static string? TrySanitize(this string? html, HtmlSanitizer sanitizer) => html is null ? html : sanitizer.Sanitize(html);
+
+        public static string? TrySanitize(this LocalizedString? html, HtmlSanitizer sanitizer) => html is null ? null : sanitizer.Sanitize(html);
+    }
+}

EnvelopeGenerator.Form/Controllers/EnvelopeEditorController.vb

@@ -38,6 +38,9 @@ Public Class EnvelopeEditorController
     Public Function SendEnvelope() As Boolean
         Return ActionService.SendEnvelope(Envelope)
     End Function
+    Public Function ResendReceiverInvitation(pEnvelope As Envelope, pReceiver As EnvelopeReceiver) As Boolean
+        Return ActionService.ResendReceiver(pEnvelope, pReceiver)
+    End Function
 
     Public Function ValidateEnvelopeForSending(pErrors As List(Of String)) As List(Of String)
         Dim oEnvelopeErrors = pErrors

EnvelopeGenerator.Form/EnvelopeGenerator.Form.vbproj

@@ -14,6 +14,8 @@
     <OptionCompare>Binary</OptionCompare>
     <OptionStrict>Off</OptionStrict>
     <OptionInfer>On</OptionInfer>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -41,7 +43,10 @@
     <StartupObject>EnvelopeGenerator.Form.My.MyApplication</StartupObject>
   </PropertyGroup>
   <PropertyGroup>
-    <ApplicationIcon>DD_signFLOW_icon_256.ico</ApplicationIcon>
+    <ApplicationIcon>DD_signFLOW_ICON.ico</ApplicationIcon>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Accessibility" />
@@ -75,17 +80,27 @@
     <Reference Include="DigitalData.Modules.Base">
       <HintPath>..\..\DDModules\Base\bin\Debug\DigitalData.Modules.Base.dll</HintPath>
     </Reference>
-    <Reference Include="DigitalData.Modules.Config">
-      <HintPath>..\..\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll</HintPath>
+    <Reference Include="DigitalData.Modules.Config, Version=1.2.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\2_DLL Projekte\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll</HintPath>
     </Reference>
-    <Reference Include="DigitalData.Modules.Database">
-      <HintPath>..\..\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
+    <Reference Include="DigitalData.Modules.Database, Version=2.3.5.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\2_DLL Projekte\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
     </Reference>
-    <Reference Include="DigitalData.Modules.Logging">
-      <HintPath>..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
+    <Reference Include="DigitalData.Modules.Logging, Version=2.6.3.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\2_DLL Projekte\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
     </Reference>
-    <Reference Include="GdPicture.NET.14">
-      <HintPath>D:\ProgramFiles\GdPicture.NET 14\Redist\GdPicture.NET (.NET Framework 4.5)\GdPicture.NET.14.dll</HintPath>
+    <Reference Include="DigitalData.Modules.Messaging">
+      <HintPath>..\..\2_DLL Projekte\DDModules\Messaging\bin\Debug\DigitalData.Modules.Messaging.dll</HintPath>
+    </Reference>
+    <Reference Include="EnvelopeGenerator.Common, Version=1.8.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\EnvelopeGenerator.Common\bin\Debug\EnvelopeGenerator.Common.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14, Version=14.2.89.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.2.89\lib\net462\GdPicture.NET.14.dll</HintPath>
     </Reference>
     <Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
       <HintPath>..\packages\NLog.5.0.5\lib\net46\NLog.dll</HintPath>
@@ -176,6 +191,7 @@
     <Compile Include="My Project\AssemblyInfo.vb" />
     <EmbeddedResource Include="frmEnvelopeEditor.en.resx">
       <DependentUpon>frmEnvelopeEditor.vb</DependentUpon>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
     <EmbeddedResource Include="frmEnvelopeEditor.resx">
       <DependentUpon>frmEnvelopeEditor.vb</DependentUpon>
@@ -190,6 +206,7 @@
     </EmbeddedResource>
     <EmbeddedResource Include="frmFieldEditor.en.resx">
       <DependentUpon>frmFieldEditor.vb</DependentUpon>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
     <EmbeddedResource Include="frmFieldEditor.resx">
       <DependentUpon>frmFieldEditor.vb</DependentUpon>
@@ -240,6 +257,7 @@
     </None>
   </ItemGroup>
   <ItemGroup>
+    <Content Include="DD_signFLOW_ICON.ico" />
     <Content Include="DD_signFLOW_icon_256.ico" />
     <Content Include="DD_signFLOW_Preloader.png" />
     <Content Include="MailLicense.xml">
@@ -253,6 +271,13 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
+  <Import Project="..\packages\GdPicture.runtimes.windows.14.2.89\build\net462\GdPicture.runtimes.windows.targets" Condition="Exists('..\packages\GdPicture.runtimes.windows.14.2.89\build\net462\GdPicture.runtimes.windows.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>Dieses Projekt verweist auf mindestens ein NuGet-Paket, das auf diesem Computer fehlt. Verwenden Sie die Wiederherstellung von NuGet-Paketen, um die fehlenden Dateien herunterzuladen. Weitere Informationen finden Sie unter "http://go.microsoft.com/fwlink/?LinkID=322105". Die fehlende Datei ist "{0}".</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\GdPicture.runtimes.windows.14.2.89\build\net462\GdPicture.runtimes.windows.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\GdPicture.runtimes.windows.14.2.89\build\net462\GdPicture.runtimes.windows.targets'))" />
+  </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

EnvelopeGenerator.Form/app.config

@@ -14,10 +14,10 @@
         <value>True</value>
       </setting>
       <setting name="DefaultAppSkin" serializeAs="String">
-        <value>Skin/The Bezier</value>
+        <value>Skin/Office 2019 White</value>
       </setting>
       <setting name="DefaultPalette" serializeAs="String">
-        <value>VS 2019 Blue</value>
+        <value></value>
       </setting>
       <setting name="TouchUI" serializeAs="String">
         <value></value>
@@ -68,4 +68,12 @@
       <!--<add name="EventLog" type="System.Diagnostics.EventLogTraceListener" initializeData="APPLICATION_NAME"/> -->
     </sharedListeners>
   </system.diagnostics>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="GdPicture.NET.14" publicKeyToken="f52a2e60ad468dbb" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-14.2.89.0" newVersion="14.2.89.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
 </configuration>

EnvelopeGenerator.Form/frmEnvelopeEditor.Designer.vb

@@ -398,7 +398,7 @@ Partial Public Class frmEnvelopeEditor
         Me.LayoutControlGroup4.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlGroup5})
         Me.LayoutControlGroup4.Name = "LayoutControlGroup4"
         Me.LayoutControlGroup4.Padding = New DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0)
-        Me.LayoutControlGroup4.Size = New System.Drawing.Size(251, 526)
+        Me.LayoutControlGroup4.Size = New System.Drawing.Size(251, 530)
         Me.LayoutControlGroup4.TextVisible = False
         '
         'LayoutControlGroup5
@@ -406,7 +406,7 @@ Partial Public Class frmEnvelopeEditor
         Me.LayoutControlGroup5.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem5})
         Me.LayoutControlGroup5.Location = New System.Drawing.Point(0, 0)
         Me.LayoutControlGroup5.Name = "LayoutControlGroup5"
-        Me.LayoutControlGroup5.Size = New System.Drawing.Size(251, 526)
+        Me.LayoutControlGroup5.Size = New System.Drawing.Size(251, 530)
         resources.ApplyResources(Me.LayoutControlGroup5, "LayoutControlGroup5")
         '
         'LayoutControlItem5
@@ -414,7 +414,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, 477)
+        Me.LayoutControlItem5.Size = New System.Drawing.Size(227, 485)
         Me.LayoutControlItem5.TextSize = New System.Drawing.Size(0, 0)
         Me.LayoutControlItem5.TextVisible = False
         '
@@ -578,7 +578,7 @@ Partial Public Class frmEnvelopeEditor
         Me.LayoutControlItem2.Control = Me.GridReceivers
         Me.LayoutControlItem2.Location = New System.Drawing.Point(0, 0)
         Me.LayoutControlItem2.Name = "LayoutControlItem2"
-        Me.LayoutControlItem2.Size = New System.Drawing.Size(875, 200)
+        Me.LayoutControlItem2.Size = New System.Drawing.Size(875, 204)
         Me.LayoutControlItem2.TextSize = New System.Drawing.Size(0, 0)
         Me.LayoutControlItem2.TextVisible = False
         '
@@ -611,7 +611,7 @@ Partial Public Class frmEnvelopeEditor
         Me.Root.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlGroup1})
         Me.Root.Name = "Root"
         Me.Root.Padding = New DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0)
-        Me.Root.Size = New System.Drawing.Size(899, 259)
+        Me.Root.Size = New System.Drawing.Size(899, 263)
         Me.Root.TextVisible = False
         '
         'LayoutControlGroup1
@@ -620,7 +620,7 @@ Partial Public Class frmEnvelopeEditor
         Me.LayoutControlGroup1.Location = New System.Drawing.Point(0, 0)
         Me.LayoutControlGroup1.Name = "LayoutControlGroup1"
         Me.LayoutControlGroup1.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10)
-        Me.LayoutControlGroup1.Size = New System.Drawing.Size(899, 259)
+        Me.LayoutControlGroup1.Size = New System.Drawing.Size(899, 263)
         resources.ApplyResources(Me.LayoutControlGroup1, "LayoutControlGroup1")
         '
         'LayoutControlItem3
@@ -629,7 +629,7 @@ Partial Public Class frmEnvelopeEditor
         Me.LayoutControlItem3.Location = New System.Drawing.Point(0, 0)
         Me.LayoutControlItem3.Name = "LayoutControlItem3"
         Me.LayoutControlItem3.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10)
-        Me.LayoutControlItem3.Size = New System.Drawing.Size(873, 208)
+        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(49, 13)

EnvelopeGenerator.Form/frmEnvelopeEditor.en.resx

@@ -384,6 +384,6 @@
 </value>
   </data>
   <data name="$this.Text" xml:space="preserve">
-    <value>Sign Flow - Envelope-Editor</value>
+    <value>signFLOW - Envelope-Editor</value>
   </data>
 </root>

EnvelopeGenerator.Form/frmEnvelopeEditor.resx

@@ -126,7 +126,7 @@
     <value>0, 132</value>
   </data>
   <data name="GridDocuments.Location" type="System.Drawing.Point, System.Drawing">
-    <value>14, 39</value>
+    <value>14, 35</value>
   </data>
   <data name="colFilename.Caption" xml:space="preserve">
     <value>Dateiname</value>
@@ -439,10 +439,10 @@
     <value>1164, 132</value>
   </data>
   <data name="RibbonStatusBar1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 658</value>
+    <value>0, 662</value>
   </data>
   <data name="RibbonStatusBar1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1164, 26</value>
+    <value>1164, 22</value>
   </data>
   <data name="&gt;&gt;RibbonStatusBar1.Name" xml:space="preserve">
     <value>RibbonStatusBar1</value>
@@ -469,7 +469,7 @@
     <value>2</value>
   </data>
   <data name="GridDocuments.Size" type="System.Drawing.Size, System.Drawing">
-    <value>223, 473</value>
+    <value>223, 481</value>
   </data>
   <data name="GridDocuments.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
@@ -496,7 +496,7 @@
     <value>Ihre Dokumente</value>
   </data>
   <data name="LayoutControl3.Size" type="System.Drawing.Size, System.Drawing">
-    <value>251, 526</value>
+    <value>251, 530</value>
   </data>
   <data name="LayoutControl3.TabIndex" type="System.Int32, mscorlib">
     <value>1</value>
@@ -541,7 +541,7 @@
     <value>334, 17</value>
   </metadata>
   <data name="GridReceivers.Location" type="System.Drawing.Point, System.Drawing">
-    <value>14, 39</value>
+    <value>14, 35</value>
   </data>
   <data name="colColor.Caption" xml:space="preserve">
     <value> </value>
@@ -635,7 +635,7 @@
     <value>Combo</value>
   </data>
   <data name="GridReceivers.Size" type="System.Drawing.Size, System.Drawing">
-    <value>871, 196</value>
+    <value>871, 200</value>
   </data>
   <data name="GridReceivers.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
@@ -728,13 +728,13 @@
     <value>0</value>
   </data>
   <data name="txtMessage.Location" type="System.Drawing.Point, System.Drawing">
-    <value>23, 64</value>
+    <value>23, 60</value>
   </data>
   <data name="txtMessage.Properties.Appearance.Font" type="System.Drawing.Font, System.Drawing">
     <value>Segoe UI, 9.75pt</value>
   </data>
   <data name="txtMessage.Size" type="System.Drawing.Size, System.Drawing">
-    <value>853, 172</value>
+    <value>853, 180</value>
   </data>
   <data name="txtMessage.TabIndex" type="System.Int32, mscorlib">
     <value>2</value>
@@ -764,7 +764,7 @@
     <value>Ihre Nachricht</value>
   </data>
   <data name="LayoutControl1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>899, 259</value>
+    <value>899, 263</value>
   </data>
   <data name="LayoutControl1.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
@@ -794,7 +794,7 @@
     <value>0, 0, 0, 0</value>
   </data>
   <data name="PanelControl2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>903, 263</value>
+    <value>903, 267</value>
   </data>
   <data name="PanelControl2.TabIndex" type="System.Int32, mscorlib">
     <value>1</value>
@@ -827,7 +827,7 @@
     <value>1</value>
   </data>
   <data name="SplitContainerControl2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>903, 526</value>
+    <value>903, 530</value>
   </data>
   <data name="SplitContainerControl2.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
@@ -860,7 +860,7 @@
     <value>1</value>
   </data>
   <data name="SplitContainerControl1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1164, 526</value>
+    <value>1164, 530</value>
   </data>
   <data name="SplitContainerControl1.TabIndex" type="System.Int32, mscorlib">
     <value>1</value>
@@ -878,7 +878,7 @@
     <value>0</value>
   </data>
   <metadata name="FrmEditorBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>792, 17</value>
+    <value>17, 54</value>
   </metadata>
   <metadata name="EnvelopeDocumentBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>557, 17</value>
@@ -948,7 +948,7 @@
     <value>CenterScreen</value>
   </data>
   <data name="$this.Text" xml:space="preserve">
-    <value>Sign Flow - Umschlag-Editor</value>
+    <value>signFLOW - Umschlag-Editor</value>
   </data>
   <data name="&gt;&gt;SplashScreenManager1.Name" xml:space="preserve">
     <value>SplashScreenManager1</value>

EnvelopeGenerator.Form/frmFieldEditor.en.resx

@@ -299,6 +299,6 @@
 </value>
   </data>
   <data name="$this.Text" xml:space="preserve">
-    <value>Sign Flow - Signature-Editor</value>
+    <value>signFLOW - Signature-Editor</value>
   </data>
 </root>

EnvelopeGenerator.Form/frmFieldEditor.resx

@@ -538,7 +538,7 @@
     <value>CenterScreen</value>
   </data>
   <data name="$this.Text" xml:space="preserve">
-    <value>Sign Flow - Signatur-Editor</value>
+    <value>signFLOW - Signatur-Editor</value>
   </data>
   <data name="&gt;&gt;BarButtonItem1.Name" xml:space="preserve">
     <value>BarButtonItem1</value>

EnvelopeGenerator.Form/frmMain.Designer.vb

@@ -27,7 +27,7 @@ Partial Class frmMain
         Dim GridLevelNode3 As DevExpress.XtraGrid.GridLevelNode = New DevExpress.XtraGrid.GridLevelNode()
         Dim GridLevelNode4 As DevExpress.XtraGrid.GridLevelNode = New DevExpress.XtraGrid.GridLevelNode()
         Me.SplitContainerControl1 = New DevExpress.XtraEditors.SplitContainerControl()
-        Me.XtraTabControl1 = New DevExpress.XtraTab.XtraTabControl()
+        Me.XtraTabControlMain = New DevExpress.XtraTab.XtraTabControl()
         Me.XtraTabPage1 = New DevExpress.XtraTab.XtraTabPage()
         Me.GridEnvelopes = New DevExpress.XtraGrid.GridControl()
         Me.ViewReceivers = New DevExpress.XtraGrid.Views.Grid.GridView()
@@ -59,6 +59,9 @@ Partial Class frmMain
         Me.btnOpenLogDirectory = New DevExpress.XtraBars.BarButtonItem()
         Me.BarCheckItem1 = New DevExpress.XtraBars.BarCheckItem()
         Me.bsitmInfo = New DevExpress.XtraBars.BarStaticItem()
+        Me.bbtnitmEB = New DevExpress.XtraBars.BarButtonItem()
+        Me.bbtnitmInfoMail = 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()
@@ -84,15 +87,13 @@ Partial Class frmMain
         Me.GridColumn7 = New DevExpress.XtraGrid.Columns.GridColumn()
         Me.RefreshTimer = New System.Windows.Forms.Timer(Me.components)
         Me.SaveFileDialog1 = New System.Windows.Forms.SaveFileDialog()
-        Me.RibbonPageGroup4 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
-        Me.bbtnitmEB = New DevExpress.XtraBars.BarButtonItem()
         CType(Me.SplitContainerControl1, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.SplitContainerControl1.Panel1, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SplitContainerControl1.Panel1.SuspendLayout()
         CType(Me.SplitContainerControl1.Panel2, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SplitContainerControl1.SuspendLayout()
-        CType(Me.XtraTabControl1, System.ComponentModel.ISupportInitialize).BeginInit()
-        Me.XtraTabControl1.SuspendLayout()
+        CType(Me.XtraTabControlMain, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.XtraTabControlMain.SuspendLayout()
         Me.XtraTabPage1.SuspendLayout()
         CType(Me.GridEnvelopes, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.ViewReceivers, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -120,7 +121,7 @@ Partial Class frmMain
         '
         'SplitContainerControl1.Panel1
         '
-        Me.SplitContainerControl1.Panel1.Controls.Add(Me.XtraTabControl1)
+        Me.SplitContainerControl1.Panel1.Controls.Add(Me.XtraTabControlMain)
         resources.ApplyResources(Me.SplitContainerControl1.Panel1, "SplitContainerControl1.Panel1")
         '
         'SplitContainerControl1.Panel2
@@ -128,12 +129,12 @@ Partial Class frmMain
         resources.ApplyResources(Me.SplitContainerControl1.Panel2, "SplitContainerControl1.Panel2")
         Me.SplitContainerControl1.SplitterPosition = 272
         '
-        'XtraTabControl1
+        'XtraTabControlMain
         '
-        resources.ApplyResources(Me.XtraTabControl1, "XtraTabControl1")
-        Me.XtraTabControl1.Name = "XtraTabControl1"
-        Me.XtraTabControl1.SelectedTabPage = Me.XtraTabPage1
-        Me.XtraTabControl1.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.XtraTabPage1, Me.XtraTabPage2})
+        resources.ApplyResources(Me.XtraTabControlMain, "XtraTabControlMain")
+        Me.XtraTabControlMain.Name = "XtraTabControlMain"
+        Me.XtraTabControlMain.SelectedTabPage = Me.XtraTabPage1
+        Me.XtraTabControlMain.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.XtraTabPage1, Me.XtraTabPage2})
         '
         'XtraTabPage1
         '
@@ -291,9 +292,9 @@ Partial Class frmMain
         Me.RibbonControl.ExpandCollapseItem.Id = 0
         Me.RibbonControl.ExpandCollapseItem.ImageOptions.ImageIndex = CType(resources.GetObject("RibbonControl.ExpandCollapseItem.ImageOptions.ImageIndex"), Integer)
         Me.RibbonControl.ExpandCollapseItem.ImageOptions.LargeImageIndex = CType(resources.GetObject("RibbonControl.ExpandCollapseItem.ImageOptions.LargeImageIndex"), Integer)
-        Me.RibbonControl.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl.ExpandCollapseItem, Me.RibbonControl.SearchEditItem, Me.btnCreateEnvelope, Me.btnEditEnvelope, Me.btnDeleteEnvelope, Me.BarButtonItem1, Me.txtRefreshLabel, Me.btnShowDocument, Me.btnContactReceiver, Me.txtEnvelopeIdLabel, Me.btnOpenLogDirectory, Me.BarCheckItem1, Me.bsitmInfo, Me.bbtnitmEB})
+        Me.RibbonControl.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl.ExpandCollapseItem, Me.RibbonControl.SearchEditItem, Me.btnCreateEnvelope, Me.btnEditEnvelope, Me.btnDeleteEnvelope, Me.BarButtonItem1, Me.txtRefreshLabel, Me.btnShowDocument, Me.btnContactReceiver, Me.txtEnvelopeIdLabel, Me.btnOpenLogDirectory, Me.BarCheckItem1, Me.bsitmInfo, Me.bbtnitmEB, Me.bbtnitmInfoMail, Me.BarButtonItem2})
         resources.ApplyResources(Me.RibbonControl, "RibbonControl")
-        Me.RibbonControl.MaxItemId = 15
+        Me.RibbonControl.MaxItemId = 17
         Me.RibbonControl.Name = "RibbonControl"
         Me.RibbonControl.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1, Me.RibbonPage2})
         Me.RibbonControl.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False]
@@ -401,9 +402,31 @@ Partial Class frmMain
         Me.bsitmInfo.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph
         Me.bsitmInfo.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
         '
+        'bbtnitmEB
+        '
+        resources.ApplyResources(Me.bbtnitmEB, "bbtnitmEB")
+        Me.bbtnitmEB.Enabled = False
+        Me.bbtnitmEB.Id = 14
+        Me.bbtnitmEB.ImageOptions.SvgImage = CType(resources.GetObject("bbtnitmEB.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
+        Me.bbtnitmEB.Name = "bbtnitmEB"
+        '
+        'bbtnitmInfoMail
+        '
+        resources.ApplyResources(Me.bbtnitmInfoMail, "bbtnitmInfoMail")
+        Me.bbtnitmInfoMail.Id = 15
+        Me.bbtnitmInfoMail.ImageOptions.SvgImage = CType(resources.GetObject("bbtnitmInfoMail.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
+        Me.bbtnitmInfoMail.Name = "bbtnitmInfoMail"
+        '
+        'BarButtonItem2
+        '
+        resources.ApplyResources(Me.BarButtonItem2, "BarButtonItem2")
+        Me.BarButtonItem2.Id = 16
+        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.RibbonPageGroup2, Me.RibbonPageGroup4})
+        Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageEnvelopeActions, Me.RibbonPageGroup1, Me.RibbonPageGroup2})
         Me.RibbonPage1.Name = "RibbonPage1"
         resources.ApplyResources(Me.RibbonPage1, "RibbonPage1")
         '
@@ -426,7 +449,9 @@ Partial Class frmMain
         '
         Me.RibbonPageGroup2.ItemLinks.Add(Me.btnShowDocument)
         Me.RibbonPageGroup2.ItemLinks.Add(Me.btnContactReceiver)
+        Me.RibbonPageGroup2.ItemLinks.Add(Me.bbtnitmInfoMail)
         Me.RibbonPageGroup2.ItemLinks.Add(Me.bbtnitmEB)
+        Me.RibbonPageGroup2.ItemLinks.Add(Me.BarButtonItem2)
         Me.RibbonPageGroup2.Name = "RibbonPageGroup2"
         resources.ApplyResources(Me.RibbonPageGroup2, "RibbonPageGroup2")
         '
@@ -589,19 +614,6 @@ Partial Class frmMain
         '
         resources.ApplyResources(Me.SaveFileDialog1, "SaveFileDialog1")
         '
-        'RibbonPageGroup4
-        '
-        Me.RibbonPageGroup4.Name = "RibbonPageGroup4"
-        resources.ApplyResources(Me.RibbonPageGroup4, "RibbonPageGroup4")
-        '
-        'bbtnitmEB
-        '
-        resources.ApplyResources(Me.bbtnitmEB, "bbtnitmEB")
-        Me.bbtnitmEB.Enabled = False
-        Me.bbtnitmEB.Id = 14
-        Me.bbtnitmEB.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem2.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
-        Me.bbtnitmEB.Name = "bbtnitmEB"
-        '
         'frmMain
         '
         resources.ApplyResources(Me, "$this")
@@ -618,8 +630,8 @@ Partial Class frmMain
         CType(Me.SplitContainerControl1.Panel2, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.SplitContainerControl1, System.ComponentModel.ISupportInitialize).EndInit()
         Me.SplitContainerControl1.ResumeLayout(False)
-        CType(Me.XtraTabControl1, System.ComponentModel.ISupportInitialize).EndInit()
-        Me.XtraTabControl1.ResumeLayout(False)
+        CType(Me.XtraTabControlMain, System.ComponentModel.ISupportInitialize).EndInit()
+        Me.XtraTabControlMain.ResumeLayout(False)
         Me.XtraTabPage1.ResumeLayout(False)
         CType(Me.GridEnvelopes, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.ViewReceivers, System.ComponentModel.ISupportInitialize).EndInit()
@@ -653,7 +665,7 @@ Partial Class frmMain
     Friend WithEvents ColEmail As DevExpress.XtraGrid.Columns.GridColumn
     Friend WithEvents ColReceiverStatus As DevExpress.XtraGrid.Columns.GridColumn
     Friend WithEvents SplitContainerControl1 As DevExpress.XtraEditors.SplitContainerControl
-    Friend WithEvents XtraTabControl1 As DevExpress.XtraTab.XtraTabControl
+    Friend WithEvents XtraTabControlMain As DevExpress.XtraTab.XtraTabControl
     Friend WithEvents XtraTabPage1 As DevExpress.XtraTab.XtraTabPage
     Friend WithEvents XtraTabPage2 As DevExpress.XtraTab.XtraTabPage
     Friend WithEvents GridCompleted As DevExpress.XtraGrid.GridControl
@@ -694,6 +706,7 @@ Partial Class frmMain
     Friend WithEvents BarCheckItem1 As DevExpress.XtraBars.BarCheckItem
     Friend WithEvents bsitmInfo As DevExpress.XtraBars.BarStaticItem
     Friend WithEvents SaveFileDialog1 As SaveFileDialog
-    Friend WithEvents RibbonPageGroup4 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
     Friend WithEvents bbtnitmEB As DevExpress.XtraBars.BarButtonItem
+    Friend WithEvents bbtnitmInfoMail As DevExpress.XtraBars.BarButtonItem
+    Friend WithEvents BarButtonItem2 As DevExpress.XtraBars.BarButtonItem
 End Class

EnvelopeGenerator.Form/frmMain.resx

@@ -123,12 +123,12 @@
   </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, 162</value>
+    <value>0, 160</value>
   </data>
-  <data name="XtraTabControl1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+  <data name="XtraTabControlMain.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
     <value>Fill</value>
   </data>
-  <data name="XtraTabControl1.Location" type="System.Drawing.Point, System.Drawing">
+  <data name="XtraTabControlMain.Location" type="System.Drawing.Point, System.Drawing">
     <value>0, 0</value>
   </data>
   <data name="GridEnvelopes.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
@@ -684,7 +684,7 @@
   <data name="bbtnitmEB.Caption" xml:space="preserve">
     <value>Ergebnisbericht anzeigen</value>
   </data>
-  <data name="BarButtonItem2.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="bbtnitmEB.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
         LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
@@ -709,6 +709,50 @@
         My40LTMuOWgtMi4xdjhoMi4yYzEuMSwwLDEuOS0wLjQsMi41LTEuMUMyMC45LDIwLjIsMjEuMiwxOS4y
         LDIxLjIsMTcuOXogICAgTTI2LDE0aC0zLjd2OGgxLjZ2LTMuMWgydi0xLjNoLTJ2LTIuMkgyNlYxNHoi
         IGNsYXNzPSJSZWQiIC8+DQogIDwvZz4NCjwvc3ZnPgs=
+</value>
+  </data>
+  <data name="bbtnitmInfoMail.Caption" xml:space="preserve">
+    <value>Support Mail</value>
+  </data>
+  <data name="bbtnitmInfoMail.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
+        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
+        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAKQCAAAC77u/
+        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
+        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
+        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
+        Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
+        MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cgku
+        WWVsbG93e2ZpbGw6I0ZGQjExNTt9CgkuQmx1ZXtmaWxsOiMxMTc3RDc7fQoJLlJlZHtmaWxsOiNEMTFD
+        MUM7fQoJLldoaXRle2ZpbGw6I0ZGRkZGRjt9CgkuR3JlZW57ZmlsbDojMDM5QzIzO30KCS5zdDB7Zmls
+        bDojNzI3MjcyO30KCS5zdDF7b3BhY2l0eTowLjU7fQoJLnN0MntvcGFjaXR5OjAuNzU7fQo8L3N0eWxl
+        Pg0KICA8ZyBpZD0iTWFpbCI+DQogICAgPHBhdGggZD0iTTE2LDE4LjNsMTQtOFYyNWMwLDAuNS0wLjUs
+        MS0xLDFIM2MtMC41LDAtMS0wLjUtMS0xVjEwLjNMMTYsMTguM3ogTTI5LDZIM0MyLjUsNiwyLDYuNSwy
+        LDd2MWwxNCw4bDE0LThWNyAgIEMzMCw2LjUsMjkuNSw2LDI5LDZ6IiBjbGFzcz0iQmxhY2siIC8+DQog
+        IDwvZz4NCjwvc3ZnPgs=
+</value>
+  </data>
+  <data name="BarButtonItem2.Caption" xml:space="preserve">
+    <value>Einladung erneut versenden</value>
+  </data>
+  <data name="BarButtonItem2.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
+        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
+        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAKQCAAAC77u/
+        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
+        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
+        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
+        Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
+        MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cgku
+        WWVsbG93e2ZpbGw6I0ZGQjExNTt9CgkuQmx1ZXtmaWxsOiMxMTc3RDc7fQoJLlJlZHtmaWxsOiNEMTFD
+        MUM7fQoJLldoaXRle2ZpbGw6I0ZGRkZGRjt9CgkuR3JlZW57ZmlsbDojMDM5QzIzO30KCS5zdDB7Zmls
+        bDojNzI3MjcyO30KCS5zdDF7b3BhY2l0eTowLjU7fQoJLnN0MntvcGFjaXR5OjAuNzU7fQo8L3N0eWxl
+        Pg0KICA8ZyBpZD0iTWFpbCI+DQogICAgPHBhdGggZD0iTTE2LDE4LjNsMTQtOFYyNWMwLDAuNS0wLjUs
+        MS0xLDFIM2MtMC41LDAtMS0wLjUtMS0xVjEwLjNMMTYsMTguM3ogTTI5LDZIM0MyLjUsNiwyLDYuNSwy
+        LDd2MWwxNCw4bDE0LThWNyAgIEMzMCw2LjUsMjkuNSw2LDI5LDZ6IiBjbGFzcz0iQmxhY2siIC8+DQog
+        IDwvZz4NCjwvc3ZnPgs=
 </value>
   </data>
   <data name="RibbonControl.Location" type="System.Drawing.Point, System.Drawing">
@@ -723,9 +767,6 @@
   <data name="RibbonPageGroup2.Text" xml:space="preserve">
     <value>Funktionen</value>
   </data>
-  <data name="RibbonPageGroup4.Text" xml:space="preserve">
-    <value>RibbonPageGroup4</value>
-  </data>
   <data name="RibbonPage1.Text" xml:space="preserve">
     <value>Start</value>
   </data>
@@ -736,13 +777,13 @@
     <value>Einstellungen</value>
   </data>
   <data name="RibbonControl.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1090, 162</value>
+    <value>1090, 160</value>
   </data>
   <data name="RibbonStatusBar.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 656</value>
+    <value>0, 660</value>
   </data>
   <data name="RibbonStatusBar.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1090, 26</value>
+    <value>1090, 22</value>
   </data>
   <data name="&gt;&gt;RibbonStatusBar.Name" xml:space="preserve">
     <value>RibbonStatusBar</value>
@@ -769,7 +810,7 @@
     <value>2</value>
   </data>
   <data name="GridEnvelopes.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1088, 455</value>
+    <value>1088, 467</value>
   </data>
   <data name="GridEnvelopes.TabIndex" type="System.Int32, mscorlib">
     <value>2</value>
@@ -787,7 +828,7 @@
     <value>0</value>
   </data>
   <data name="XtraTabPage1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1088, 455</value>
+    <value>1088, 467</value>
   </data>
   <data name="XtraTabPage1.Text" xml:space="preserve">
     <value>Offene Umschläge</value>
@@ -799,15 +840,15 @@
     <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;XtraTabPage1.Parent" xml:space="preserve">
-    <value>XtraTabControl1</value>
+    <value>XtraTabControlMain</value>
   </data>
   <data name="&gt;&gt;XtraTabPage1.ZOrder" xml:space="preserve">
     <value>0</value>
   </data>
-  <data name="XtraTabControl1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1090, 484</value>
+  <data name="XtraTabControlMain.Size" type="System.Drawing.Size, System.Drawing">
+    <value>1090, 490</value>
   </data>
-  <data name="XtraTabControl1.TabIndex" type="System.Int32, mscorlib">
+  <data name="XtraTabControlMain.TabIndex" type="System.Int32, mscorlib">
     <value>3</value>
   </data>
   <data name="GridCompleted.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
@@ -949,7 +990,7 @@
     <value>195</value>
   </data>
   <data name="GridCompleted.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1088, 455</value>
+    <value>1088, 467</value>
   </data>
   <data name="GridCompleted.TabIndex" type="System.Int32, mscorlib">
     <value>3</value>
@@ -967,7 +1008,7 @@
     <value>0</value>
   </data>
   <data name="XtraTabPage2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1088, 455</value>
+    <value>1088, 467</value>
   </data>
   <data name="XtraTabPage2.Text" xml:space="preserve">
     <value>Abgeschlossene Umschläge</value>
@@ -979,21 +1020,21 @@
     <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;XtraTabPage2.Parent" xml:space="preserve">
-    <value>XtraTabControl1</value>
+    <value>XtraTabControlMain</value>
   </data>
   <data name="&gt;&gt;XtraTabPage2.ZOrder" xml:space="preserve">
     <value>1</value>
   </data>
-  <data name="&gt;&gt;XtraTabControl1.Name" xml:space="preserve">
-    <value>XtraTabControl1</value>
+  <data name="&gt;&gt;XtraTabControlMain.Name" xml:space="preserve">
+    <value>XtraTabControlMain</value>
   </data>
-  <data name="&gt;&gt;XtraTabControl1.Type" xml:space="preserve">
+  <data name="&gt;&gt;XtraTabControlMain.Type" xml:space="preserve">
     <value>DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
-  <data name="&gt;&gt;XtraTabControl1.Parent" xml:space="preserve">
+  <data name="&gt;&gt;XtraTabControlMain.Parent" xml:space="preserve">
     <value>SplitContainerControl1.Panel1</value>
   </data>
-  <data name="&gt;&gt;XtraTabControl1.ZOrder" xml:space="preserve">
+  <data name="&gt;&gt;XtraTabControlMain.ZOrder" xml:space="preserve">
     <value>0</value>
   </data>
   <data name="SplitContainerControl1.Panel1.Text" xml:space="preserve">
@@ -1027,7 +1068,7 @@
     <value>1</value>
   </data>
   <data name="SplitContainerControl1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1090, 494</value>
+    <value>1090, 500</value>
   </data>
   <data name="SplitContainerControl1.TabIndex" type="System.Int32, mscorlib">
     <value>5</value>
@@ -1056,6 +1097,9 @@
   <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>263</value>
+  </metadata>
   <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
     <value>6, 13</value>
   </data>
@@ -1064,89 +1108,90 @@
   </data>
   <data name="frmMain.IconOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        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
+        iVBORw0KGgoAAAANSUhEUgAAAQAAAAEACAYAAABccqhmAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAACxEAAAsRAX9kX5EAABGASURBVHhe7d2/rhxJFcfxfQQ/BA+w5gXwA/AAhA7I2ZzE
+        CblzEicbESAiRIBkQUICWgkJiQgHRCRsQkJyqZ89bfq2z8z0dNepOqfqG3ykde+903+m63TVOVV9v3p6
+        egrp2x+8fFG8Kt4U74r3xYfiCQhM96juVd2zund1D7+w7vEIzI096CIVrwtdOBo6RqN7Wve27vEwAcHc
+        2IouRPFN8V1hXTRgVLrnuwcDc6O3ctLqFikaWhcGmI3awiurrXgzN3opJ6mIR/cesKltvLbajhdzY206
+        qcvJWScN4LlmgcDcWEs5ia8LZUStkwRwm9rO11bbqsXceFY5aCX33l5OAsA5aksuyUJz4xnlQJXgo7sP
+        1KU2VT1RaG48qhygJj5YBw+gjjdW2zvK3PioclDq8jPWB9pQW6syJDA3PqIciBJ9dPmBttTmTicIzY17
+        6QCK7y8HBKAttb1TQcDcuId2fDkA68AAtHEqCJgb79EOLzu2DghAW4eDgLnxFu3oskPrQAD0cSgImBuv
+        0Q4uO7IOAEBfDwcBc6OlfLBKfWT7gdjURneXCM2NlvKh1PmBHN5bbdhibtwqH8gMPyCXXTMGzY1r5YM0
+        t9/aAYDY7q4dMDcuygcw7gfyupsPMDcuyi+zpBfI7a3VthfmRim/qJKf9YEAcrlaGjQ3Svklsv7AGK5W
+        BcyN5Rf0Dj/rgwDkZL5j8IsNUn6YxB8wlg9WW/9iQ/lBnv7AmL7oBTz7h5Qf4ukPjOmLXsCzf5QfYNIP
+        MLZnk4O2AYA/1wWM7d26za8bv2b9Wb8AYCyfZweuAwDJP2AOn5OB6wDAn+gG5vDdswBQNtD9B+bycRiw
+        BAC6/8BcPg4DlgBA9h+Yy8dqwBIAmPwDzOXjpCDG/8C8XigAMPsPmNMrBQBe+AnM6Q0JQGBe7xQAePMP
+        MKf3CgBUAIL4zY9ePv3+J2PTOVrnji4+KABY/wMN/eqHL5/++ouXT09/m4POVedsXQu0RQDoTE/F//zR
+        bigj0znr3K1rgnYIAJ3oCfiPX9qNYya6BvQG+iEAdPCHn758+u+f7QYxI10LXRPrWsEXAaAhJcD+9Wu7
+        EeDTtSFJ2BYBoJG//Jyn/h66RrpW1jVEfQQAZ7/98cunf//Ovtlxna6Zrp11TVEPAcDJbKU9L5QMfREA
+        HMxa2vNCydAPAaAiSnu+KBnWRwCohNJeG5QM6yIAnERprw9KhnUQAE6gtNcXJcPzCAAHUNqLhZLhcQSA
+        B1Hai0vfjfWd4ToCwE6U9nKgZPgYAsAdKjv9/a19syEufWeUDO8jANxAaS83Sob3EQAMKi/981v7pkI+
+        +i4pGdoIABuU9sZEydBGALhQGSnyhB4dWybWOUSgY6Nk+H8EgCJyaS9rjTv6XAlKhp9MHQAil/ZG6bJG
+        HlJRMpw0AEQv7ambOlLSKvp6iZlLhtMFgMilPR3XyGUrrn080wSA6KW9Wda66xwjvzNhtpLhFAGAcWg8
+        5F9iGDoARC/tzf6+O5175ArMDCXDYQNA5BtLdHNZxz2jyEFaRi4ZDhcAInctt6hFxw/Ui1GHasMEAHUn
+        M67am3lWms7duiaRjVYyHCIARC4v3aMny4x5AJ1zlp7a1kglw9QBIHppby+dg3V+Ixvle8teMkwbACKX
+        9o7408/s8xyRztW6BhllLxmmCwDRp5UepRtphgkoOseRAvdC92TG7y9VAMiSMT5Kq+es8x7J6G9TzlbZ
+        SREAoi8trWnk0uDoAXyRaQl3igCgrpV1oUc1Yr1Z52Sd66iyDAfSDAFGyBrvNVppMHPJ74hMVZ00AUB1
+        V+tij2qk0uBMwVsyzRFIlQTsmT1epoK2nL02QmmwZclP303vqeC6R63rEFWqANBrqu92+merZFb20mDL
+        kt86earvque9sr4G0aUKAK2Tgbeyua3mImQuDbaq3FxbWdmjepQtYKcKANLiC9VT6145rtfTLYtIvSQd
+        S4vvKmOwThcAvMeUj8zoapmYzFQabFny25tw03fq3WvLmLNJFwA0vvOK5kcieKv322UpDbYs+enaW8dw
+        i1cPUvdkhu9nK10AEM9G9+iX2PKGz1AabFXyOxIQ9fPWZ9VwJBhFkDIAeHYxj6zsojT4SeuSn3UMt+i7
+        tT6rhkxDtLWUAUC8nrr6XGt/93jeXGvqah65+b3pmFok2uTo8tto90wEaQOAZ5b5aAObuTTYojoj10p+
+        93j20jJWaRZpA4CyutaXUcPR8ZzGmK2egpEmnLSadHMm0eaZN9pbNYoobQAQr4TTmRttttJgxJLflmdg
+        zr5mI3UA8Ew6nUm2ZXgi1pClxxP1PokgdQAQrxvw6FhT1DBajYl7PoFalfx0Lc8EOq/cjO49a3+ZpA8A
+        nk/bM2M7z6TTVo+XUraqesiZqodnrihSHuao9AHAs6Gd/YJHLQ1qX626/meDm+cDouU195I+AIhXd7tG
+        fXfE0mD0kt+aV+2/5fX2NEQA8EzynH27S5ZE2V6eT9Q1XbOzCU7Pikz25N9iiACgG8X6kmqokWQbpTSY
+        oeS35pmkPBucohgiAEikBUKWTE9Oiz4zU0/G86GQdeGPZZgA4Pl0qpFl1w3ZauzsURrMUvJbeCZgI0zA
+        qmWYACDRF3t4Viy2agStRatqhtTKrEe/F6IYKgBEXCC01aoxqbte45j1Ga26/rWClmegzbzwxzJUAIi4
+        QMiSqTSYqeS3YOHPfkMFAPEaq9ZMrmVJqGVMXHpeW4/cSm/DBYAsCz9algb1dD3C+iwPNUp+iyzffxTD
+        BQDxegKoUVj7O6rVEzayGiW/Na/ApXvK2l92QwYAz4ZVewzYaowdUY0cxRoLfx43ZADIlAVumWWPROdc
+        o0qxlqEKFM2QAUC8nqwedeCWdfYoas5TWHjV/mv3VCIZNgB4JoNqJq0WrWbaReCRTfdMqo6Y/FsMGwBU
+        DrK+zBo85oK3LA32pHOsVfJbi74WJKphA4BkuylarrbrxWMefbZgH8nQAcCzW+gxhpWRS4NemXTPHIrH
+        cC+SoQOAZEwMjVgazHi9Rlv4Yxk+AGQsDY1WGvQo+S30udY+axht4Y9l+ACQZYHQmsa0Xj2XHnQuXok0
+        zzzPaAt/LMMHAMk2PXTEkqDXQhqvnlLtad9RTREAMi0Q8Ryy9Fa7S53pe41qigAgGZ4Unjd0FDUbFgt/
+        zpsmAEQfK46W+LtG51gjIZgxtxPRNAEgcrZ4tKTfPTWSghmrOxFNEwAkar14xLr/PWfnBXgFTM/5ChFN
+        FQAizhjzHJpEd7SrnXGGZ1RTBYBoc8ZnSPrdcyQp6Bk0veYrRDVVAJAoN88MC3/2emSBULQgnt10ASBC
+        91EZ7Bky/nvpWuytpLDwp67pAoD0TCDpCdYq6af9KFt+Rstj3dOD8jqes4ncrKYMALqxrZughnslJM8h
+        yNreBnVPy4B1rwseuZSb1ZQBoNckEs/As1Zrss1Cn9VqyHKrIXoGzxqTuTKaMgBI62mknrmHLY+xbITj
+        9wpCsyz8sUwbADxLcNvSVssnqGcd2zMBt2b1YFp+XzOZNgCIV6NcL33VGNor6bjVoozVKoeha7bOYXgt
+        kb7WY5vF1AGgxZjSa6ixVSvpd0/LpODSNe+Vs5nB1AHAO6vc6mmpp1iLxr/QvloNaXQNe1ZtRjd1ABCv
+        p1mrBiI9bmLP4LnldS313VvnNpPpA0CrxJaXngksz8RcC54J0yymDwDqzlo3RwYRxq+thjkeWg6bopo+
+        AEjGl3BGql23SnTW5PWS0mwIAEXLSS41bEtkvelYWpU6a/GYLJURAeAiyw2shFjEzLWOqWXi8wx919Y5
+        zIgAcJHlb/JFfnJl6Ul5/Y3CjAgAF56TTWrJsGKt1YKnM2Zd+GMhAKxETmZlmrEWuTIQKXkaAQFgJWpd
+        u9U031p0rK2mCz9q5oU/FgLAim7caIksHU/GLquOOeK1zBRIWyAAbETrvj7ywsxoor34NNMwqhUCwEbL
+        Oe73jNBdjTSsilg+7Y0AYIgwJ2Ckp1WEXhW1fxsBwNB7gdCIq9R6JwVZ+GMjABiUKLJuohb0pBoxUaVz
+        6tmzIvlnIwBc0WOBkLLUI49Te00XZuHPdQSAK3pMa52hRt0jKcjCn+sIADe07LJmmOZbS8vpwiT/biMA
+        3NBqgdCMXdRWQywW/txGALihxQKhUZN+97RKCrLw5zYCwB0tFgjNOEOtxdwAFv7cRwC4o1XSKtuCn6N0
+        jq3mBMyQVD2LAHCHbthWpSvKgPVoPzMOrR5FANih5VRW3bgjPrl0Tq0av8w4rDqCALCDnlzWTeZppOx1
+        j9etjdyTqokAsFOPaaxKYmXuxurYe7xlidr/fgSAnXotENLNnPFppmPuETSFhT/7EQB20tPMutla0Ng5
+        03RWHWvL8f4Wyb/9CAAP6LFAaI23At/Hwp/HEAAeEOG997rBIz7hdEy9A6Sw8OcxBIAH9ezaLjSRJlJe
+        QMfS+4Ufou/GOj5cRwB4kG72CEFAxxDhhaE6hijXI2OytDcCwAHq7kZ44knPjHfvV6ctZplG7YEAcEKE
+        l12KjqNlA9C+Ip27dYzYhwBwUo833Fj0FGyx9FX7iNL7YbHPeQSACiLlBTzHwbOc50wIAJVEygt4PBkj
+        9XQY79dDAKhsxLEx4/1xEQAcjPK0HL1XAwKAm+zjZcb7cyAAOIryBFUjeuQJqp+N0PgZ7/sjADQQZQy9
+        5yUjPV7eYWG83wYBoJEoeYFrLxnRth4v77Aw3m+HANBQlHH19iUj+u9eL+9YY7zfHgGgsUh5AS2d7f3y
+        jgXj/T4IAJ1EyQtEwHi/HwJAR1HyAj0x3u+LANBZlLxAa4z3YyAABBAlL9AK4/04CACBzJAXYLwfCwEg
+        mJHzAoz34yEABDRaXoDxflwEgKBGyQsw3o+NABBc5rwA4/34CAAJZMwLMN7PgQCQRJa8AOP9XAgAiUTP
+        CzDez4cAkFDEvADj/ZwIAElFygsw3s+LAJBY77wA4/38CADJ9coLMN4fAwFgEC3zAoz3x0EAGEiLvADj
+        /bEQAAbjlRdgvD8mAsCAaucFGO+PiwAwsBp5Acb7YyMADO5MXoDx/vgIABN4NC/AeH8eBIBJ7M0LMN6f
+        CwFgMrfyAoz350MAmJCVF2C8PycCwKSWvADj/bkpAHzYbsQcNNZnvD+1DwoA7zcbAczhvQLAu81GAHN4
+        pwDwZrMRwBzeKAC82mwEMIdXCgAvNhsBzOHFV09PVAKACX1Q218CAIlAYC7v1gHg9eZ/Ahjb63UAIA8A
+        zOXF5wBwCQLfbX4AwJi+W9r9OgB8s/khAGP62P3fBgCGAcAcPnb/nwWASxCgGgCM7WP2f7ENAMwKBMb2
+        at3mnwUAKT/ApCBgTB8n/6w9+4eUH2JOADCmz8m/xbN/LMoP0gsAxvLF01++2CDlh+kFAGP54ukvX2xY
+        lF/gTUHAGN5bbVzMjVJ+6evNhwDI6WurjYu5cVF+8e3mgwDk8tZq2wtz46L8smYHkhAEclLb/Tzrz2Ju
+        XCsfwOQgIKdnk34s5sat8kG8OBTI5Y3VlrfMjZbygVQFgByuZv23zI2W8qHkA4D47o7718yN15QPVmnw
+        +8uOAMSitnm15GcxN96iHVx2ZB0AgD4ebvxibrxHO7rs0DoQAG0davxibtxDO7zs2DogAG0cbvxibtxL
+        O74cgHVgAHydavxibnyEDqCgOgC0pTZ3qvGLufFR5UBUImSeANCG2truUt8t5sajykExYxDwtWuG317m
+        xjPKAWrtAEMCoC61qbtz+x9lbjyrHKiGBCwlBupQW6rS5d8yN9ZSDloJQnIDwDFqO6cTfbeYG2srJ6F3
+        DDIsAPZRWzHf4VebudGLTupyctZJA7Nr1vAX5kZv5SSVKOTPkAGfqC1UT/DtYW5spZy0koXqFfCnyTEb
+        3fO6912Se3uZG3vQhbhcEEVDhgkYje5p3dvdG/2auTECXaRCQwVNLtKFU0aUwIDodI/qXtU9q3tX93CY
+        Bv/c01f/A4y2+8cc2/IPAAAAAElFTkSuQmCC
 </value>
   </data>
   <data name="$this.StartPosition" type="System.Windows.Forms.FormStartPosition, System.Windows.Forms">
     <value>CenterScreen</value>
   </data>
   <data name="$this.Text" xml:space="preserve">
-    <value>Sign Flow</value>
+    <value>signFLOW</value>
   </data>
   <data name="&gt;&gt;SplashScreenManager1.Name" xml:space="preserve">
     <value>SplashScreenManager1</value>
@@ -1322,6 +1367,24 @@
   <data name="&gt;&gt;bsitmInfo.Type" xml:space="preserve">
     <value>DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
+  <data name="&gt;&gt;bbtnitmEB.Name" xml:space="preserve">
+    <value>bbtnitmEB</value>
+  </data>
+  <data name="&gt;&gt;bbtnitmEB.Type" xml:space="preserve">
+    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="&gt;&gt;bbtnitmInfoMail.Name" xml:space="preserve">
+    <value>bbtnitmInfoMail</value>
+  </data>
+  <data name="&gt;&gt;bbtnitmInfoMail.Type" xml:space="preserve">
+    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="&gt;&gt;BarButtonItem2.Name" xml:space="preserve">
+    <value>BarButtonItem2</value>
+  </data>
+  <data name="&gt;&gt;BarButtonItem2.Type" xml:space="preserve">
+    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
   <data name="&gt;&gt;RibbonPage1.Name" xml:space="preserve">
     <value>RibbonPage1</value>
   </data>
@@ -1454,18 +1517,6 @@
   <data name="&gt;&gt;SaveFileDialog1.Type" xml:space="preserve">
     <value>System.Windows.Forms.SaveFileDialog, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="&gt;&gt;RibbonPageGroup4.Name" xml:space="preserve">
-    <value>RibbonPageGroup4</value>
-  </data>
-  <data name="&gt;&gt;RibbonPageGroup4.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
-  <data name="&gt;&gt;bbtnitmEB.Name" xml:space="preserve">
-    <value>bbtnitmEB</value>
-  </data>
-  <data name="&gt;&gt;bbtnitmEB.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
   <data name="&gt;&gt;$this.Name" xml:space="preserve">
     <value>frmMain</value>
   </data>

EnvelopeGenerator.Form/frmMain.vb

@@ -10,6 +10,8 @@ Imports DigitalData.Modules.Base
 Imports DigitalData.Modules.Logging
 Imports EnvelopeGenerator.Common
 Imports EnvelopeGenerator.Common.My
+Imports System.Diagnostics
+Imports System.ComponentModel
 
 Public Class frmMain
     Private ReadOnly LogConfig As LogConfig
@@ -44,7 +46,7 @@ Public Class frmMain
         Controller = New EnvelopeListController(State)
         Try
             Me.LookAndFeel.UseDefaultLookAndFeel = False
-            LookAndFeel.SetSkinStyle(SkinStyle.Office2019Colorful, SkinSvgPalette.DefaultSkin)
+            LookAndFeel.SetSkinStyle(SkinStyle.Office2019White, SkinSvgPalette.DefaultSkin)
         Catch ex As Exception
 
         End Try
@@ -55,8 +57,12 @@ Public Class frmMain
     Private Sub LoadEnvelopeData()
         Try
             RefreshHelper.SaveViewInfo()
-            LoadEnvelopes()
-            LoadCompletedEnvelopes()
+            If XtraTabControlMain.SelectedTabPageIndex = 0 Then
+                LoadEnvelopes()
+            ElseIf XtraTabControlMain.SelectedTabPageIndex = 1 Then
+                LoadCompletedEnvelopes()
+            End If
+
             RefreshHelper.LoadViewInfo()
 
             'LoadCharts()
@@ -183,20 +189,23 @@ Public Class frmMain
         TempFiles.CleanUp()
     End Sub
 
-    Private Sub XtraTabControl1_SelectedPageChanged(sender As Object, e As DevExpress.XtraTab.TabPageChangedEventArgs) Handles XtraTabControl1.SelectedPageChanged
-        Select Case XtraTabControl1.SelectedTabPageIndex
+    Private Sub XtraTabControl1_SelectedPageChanged(sender As Object, e As DevExpress.XtraTab.TabPageChangedEventArgs) Handles XtraTabControlMain.SelectedPageChanged
+        Select Case XtraTabControlMain.SelectedTabPageIndex
             Case 1
                 btnEditEnvelope.Enabled = False
                 btnDeleteEnvelope.Enabled = False
                 btnContactReceiver.Enabled = False
                 btnShowDocument.Enabled = False
                 bbtnitmEB.Enabled = True
+                LoadEnvelopeData()
             Case 0
                 btnEditEnvelope.Enabled = True
                 btnDeleteEnvelope.Enabled = True
                 btnContactReceiver.Enabled = True
                 btnShowDocument.Enabled = True
                 bbtnitmEB.Enabled = False
+                LoadEnvelopeData()
+                txtEnvelopeIdLabel.Caption = "No Envelope selected"
         End Select
     End Sub
 
@@ -220,30 +229,35 @@ Public Class frmMain
         End If
     End Sub
     Private Sub bbtnitmEB_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles bbtnitmEB.ItemClick
-        If ViewEnvelopes.FocusedRowHandle < 0 Then
-            Exit Sub
-        End If
-        Me.Cursor = Cursors.WaitCursor
-        Dim oEnvelope As Envelope = ViewCompleted.GetRow(ViewCompleted.FocusedRowHandle)
-        GetResRepFileStreamByte(oEnvelope.Id)
-        Dim oTempFolder = TempFiles.TempPath
-        Dim oTempFilename = String.Concat(oTempFolder, "\", $"ViewEnvResReport_{oEnvelope.Id}.pdf")
-        If File.Exists(oTempFilename) Then
-            Try
-                File.OpenWrite(oTempFilename)
-            Catch ex As Exception
-                MsgBox("File might already be open?", MsgBoxStyle.Exclamation)
+        Try
+            If IsNothing(ViewEnvelopes.FocusedRowHandle) Then
+                bsitmInfo.Caption = "No row selected"
                 Exit Sub
-            End Try
+            End If
+            bsitmInfo.Caption = ""
+            Me.Cursor = Cursors.WaitCursor
+            Dim oEnvelope As Envelope = ViewCompleted.GetRow(ViewCompleted.FocusedRowHandle)
+            GetResRepFileStreamByte(oEnvelope.Id)
+            Dim oTempFolder = TempFiles.TempPath
+            If Not Directory.Exists(oTempFolder) Then
+                Directory.CreateDirectory(oTempFolder)
+            End If
+            Dim oFilename = "ViewEnvResReport"
+            Dim oVersion As Integer = 0
+            Dim oTempFilename = String.Concat(oTempFolder, "\", $"{oFilename}_{oEnvelope.Id}.pdf")
+            Do While File.Exists(oTempFilename)
+                oVersion += 1
+                oTempFilename = String.Concat(oTempFolder, "\", $"{oFilename}_{oEnvelope.Id}_", oVersion.ToString, ".pdf")
+            Loop
+            downloadResFile(oTempFilename)
 
-
-            File.Delete(oTempFilename)
-        End If
-        downloadResFile(oTempFilename)
+        Catch ex As Exception
+            MsgBox(ex.Message, MsgBoxStyle.Exclamation)
+        End Try
         Me.Cursor = Cursors.Default
     End Sub
     Private Sub ViewEnvelopes_CustomDrawCell(sender As Object, e As DevExpress.XtraGrid.Views.Base.RowCellCustomDrawEventArgs) Handles ViewEnvelopes.CustomDrawCell
-        If e.RowHandle < 0 Or XtraTabControl1.SelectedTabPageIndex = 1 Then
+        If e.RowHandle < 0 Or XtraTabControlMain.SelectedTabPageIndex = 1 Then
             Exit Sub
         End If
 
@@ -388,10 +402,12 @@ Public Class frmMain
                 If Not fileData Is Nothing Then
                     myResFileData = fileData
                 Else
+                    bsitmInfo.Caption = "FileStream 1 is nothing - check data!"
                     myResFileData = Nothing
                 End If
             Else
                 myResFileData = Nothing
+                bsitmInfo.Caption = "FileStream 2 is nothing - check data!"
             End If
 
 
@@ -421,11 +437,9 @@ Public Class frmMain
         End Try
     End Sub
     Private Sub downloadResFile(ByVal sFileName As String)
-
-        Dim strSql As String
-        'For Document
         Try
             If Not myResFileData Is Nothing Then
+                Logger.Debug("working myResFileData in downloadResFile")
                 'Read image data into a file stream 
                 Using fs As New FileStream(sFileName, FileMode.OpenOrCreate, FileAccess.Write)
                     fs.Write(myResFileData, 0, myResFileData.Length)
@@ -433,6 +447,7 @@ Public Class frmMain
                     fs.Flush()
                     fs.Close()
                 End Using
+                Logger.Debug($"Trying to open {sFileName}...")
                 'Open File
                 Process.Start(sFileName)
             Else
@@ -487,5 +502,84 @@ Public Class frmMain
         RefreshTimer.Start()
     End Sub
 
+    Private Sub bbtnitmInfoMail_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles bbtnitmInfoMail.ItemClick
+        If ViewEnvelopes.FocusedRowHandle < 0 Then
+            Exit Sub
+        End If
+        Try
+            Dim oEnvelope As Envelope = ViewEnvelopes.GetRow(ViewEnvelopes.FocusedRowHandle)
+            Dim oView As GridView = GridEnvelopes.FocusedView
+            If oView.Name = ViewReceivers.Name Then
+                Dim oReceiver As EnvelopeReceiver = oView.GetRow(oView.FocusedRowHandle)
+                Dim oEnvelopeTitle As String = Net.WebUtility.UrlEncode(oEnvelope.Title)
+                Dim oCode = oReceiver.AccessCode
+                Dim oUID = oEnvelope.Uuid
 
+                ' E-Mail-Details konfigurieren
+                Dim mailto As String = "support-flow@digitaldata.works"
+                Dim subject As String = "signFLOW - Envelope issue"
+                Dim body As String = $"<html><body>Dear Digital Data Team, <br> There is an error or misbehavin with following envelope and Receiver: <p> Envelope: <b>{oUID}</b> <br> Receiver: <b>{oReceiver.Email}</b> 
+<p>Issue/Description: Please describe the issue in Your own words...</p></body></html>"
+
+                ' URL-encoding für Betreff und Inhalt der E-Mail
+                'Dim encodedSubject As String = Uri.EscapeDataString(subject)
+                'Dim encodedBody As String = Uri.EscapeDataString(body)
+
+                ' mailto-Link erstellen
+                Dim mailtoLink As String = $"{mailto}?subject={subject}&body={body}"
+                Try
+                    Process.Start(mailtoLink)
+                Catch ex1 As Exception
+                    MsgBox(ex1.Message, MsgBoxStyle.Critical, Text)
+                End Try
+                ' E-Mail-Client öffnen
+
+
+                Process.Start($"mailto:{oReceiver.Email}?subject={oEnvelopeTitle}")
+            Else
+                MsgBox(Resources.Envelope.Please_select_a_recipient_from_the_Recipients_tab, MsgBoxStyle.Information, Text)
+            End If
+        Catch ex As Exception
+            MsgBox(ex.Message, MsgBoxStyle.Critical, Text)
+        End Try
+
+    End Sub
+
+    Private Sub BarButtonItem2_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem2.ItemClick
+        Dim oView As GridView = GridEnvelopes.FocusedView
+        Dim selReceiver As EnvelopeReceiver
+        If oView.Name = ViewReceivers.Name Then
+            selReceiver = oView.GetRow(oView.FocusedRowHandle)
+        Else
+            MsgBox(Resources.Envelope.Please_select_a_recipient_from_the_Recipients_tab, MsgBoxStyle.Information, Text)
+        End If
+        If ViewEnvelopes.FocusedRowHandle < 0 Or IsNothing(selReceiver) Then
+            Exit Sub
+        End If
+        Dim oEnvelope As Envelope = ViewEnvelopes.GetRow(ViewEnvelopes.FocusedRowHandle)
+
+        Dim oController = New EnvelopeEditorController(State, oEnvelope)
+        Dim Documents As New BindingList(Of EnvelopeDocument)
+        Dim Receivers As New BindingList(Of EnvelopeReceiver)
+        Receivers = New BindingList(Of EnvelopeReceiver)(oController.Envelope.Receivers)
+        For Each oReceiver As EnvelopeReceiver In Receivers
+            If oReceiver.Email = selReceiver.Email Then
+                If oController.ActionService.ResendReceiver(oEnvelope, oReceiver) = True Then
+                    MsgBox(Resources.Envelope.Invitation_successfully_resend, MsgBoxStyle.Information, Text)
+                End If
+            End If
+        Next
+
+
+    End Sub
+
+    Private Sub ViewEnvelopes_Click(sender As Object, e As EventArgs) Handles ViewEnvelopes.Click
+        If ViewEnvelopes.FocusedRowHandle < 0 Then
+            Exit Sub
+        End If
+        Dim oEnvelope As Envelope = ViewEnvelopes.GetRow(ViewEnvelopes.FocusedRowHandle)
+
+        txtEnvelopeIdLabel.Caption = String.Format(txtEnvelopeIdLabel.Tag, oEnvelope.Id)
+
+    End Sub
 End Class

EnvelopeGenerator.Form/packages.config

@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="GdPicture" version="14.2.89" targetFramework="net462" />
+  <package id="GdPicture.runtimes.windows" version="14.2.89" targetFramework="net462" />
   <package id="NLog" version="5.0.5" targetFramework="net462" />
 </packages>

EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/angular.json

@@ -31,9 +31,14 @@
             ],
             "styles": [
               "@angular/material/prebuilt-themes/indigo-pink.css",
-              "src/styles.scss"
+              "src/styles.scss",
+              "node_modules/bootstrap/dist/css/bootstrap.min.css"
+            ],
+            "scripts": [
+              "node_modules/jquery/dist/jquery.min.js",
+              "node_modules/@popperjs/core/dist/umd/popper.min.js",
+              "node_modules/bootstrap/dist/js/bootstrap.min.js"
             ],
-            "scripts": [],
             "server": "src/main.server.ts",
             "prerender": true,
             "ssr": {
@@ -106,7 +111,7 @@
             ],
             "scripts": [
               "node_modules/jquery/dist/jquery.min.js",
-              "node_modules/popper.js/dist/umd/popper.min.js",
+              "node_modules/@popperjs/core/dist/umd/popper.min.js",
               "node_modules/bootstrap/dist/js/bootstrap.min.js"
             ]
           }

EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "envelope-generator-ui",
-  "version": "0.0.0",
+  "version": "1.0.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "envelope-generator-ui",
-      "version": "0.0.0",
+      "version": "1.0.0",
       "dependencies": {
         "@angular/animations": "^17.3.0",
         "@angular/cdk": "^17.3.10",
@@ -24,11 +24,12 @@
         "@generic-ui/hermes": "^0.21.0",
         "@generic-ui/ngx-grid": "^0.21.0",
         "@ng-bootstrap/ng-bootstrap": "^16.0.0",
-        "@popperjs/core": "^2.11.8",
         "bootstrap": "^5.3.3",
         "express": "^4.18.2",
+        "jquery": "^3.7.1",
         "rxjs": "~7.8.0",
         "tslib": "^2.3.0",
+        "uuid": "^10.0.0",
         "zone.js": "~0.14.3"
       },
       "devDependencies": {
@@ -39,6 +40,7 @@
         "@types/express": "^4.17.17",
         "@types/jasmine": "~5.1.0",
         "@types/node": "^18.18.0",
+        "@types/uuid": "^10.0.0",
         "jasmine-core": "~5.1.0",
         "karma": "~6.4.0",
         "karma-chrome-launcher": "~3.2.0",
@@ -4259,6 +4261,7 @@
       "version": "2.11.8",
       "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.8.tgz",
       "integrity": "sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==",
+      "peer": true,
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/popperjs"
@@ -4871,6 +4874,12 @@
         "@types/node": "*"
       }
     },
+    "node_modules/@types/uuid": {
+      "version": "10.0.0",
+      "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-10.0.0.tgz",
+      "integrity": "sha512-7gqG38EyHgyP1S+7+xomFtL+ZNHcKv6DwNaCZmJmo1vgMugyF3TCnXVg4t1uk89mLNwnLtnY3TpOpCOyp1/xHQ==",
+      "dev": true
+    },
     "node_modules/@types/ws": {
       "version": "8.5.10",
       "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.10.tgz",
@@ -8448,6 +8457,11 @@
         "jiti": "bin/jiti.js"
       }
     },
+    "node_modules/jquery": {
+      "version": "3.7.1",
+      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.7.1.tgz",
+      "integrity": "sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg=="
+    },
     "node_modules/js-tokens": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
@@ -11617,6 +11631,15 @@
         "websocket-driver": "^0.7.4"
       }
     },
+    "node_modules/sockjs/node_modules/uuid": {
+      "version": "8.3.2",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
+      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
+      "dev": true,
+      "bin": {
+        "uuid": "dist/bin/uuid"
+      }
+    },
     "node_modules/socks": {
       "version": "2.8.3",
       "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.3.tgz",
@@ -12396,10 +12419,13 @@
       }
     },
     "node_modules/uuid": {
-      "version": "8.3.2",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
-      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
-      "dev": true,
+      "version": "10.0.0",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-10.0.0.tgz",
+      "integrity": "sha512-8XkAphELsDnEGrDxUOHB3RGvXz6TeuYSGEZBOjtTtPm2lwhGBjLgOzLHB63IUWfBpNucQjND6d3AOudO+H3RWQ==",
+      "funding": [
+        "https://github.com/sponsors/broofa",
+        "https://github.com/sponsors/ctavan"
+      ],
       "bin": {
         "uuid": "dist/bin/uuid"
       }

EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "envelope-generator-ui",
-  "version": "0.0.0",
+  "version": "1.0.0",
   "scripts": {
     "ng": "ng",
     "start": "ng serve",
@@ -27,11 +27,12 @@
     "@generic-ui/hermes": "^0.21.0",
     "@generic-ui/ngx-grid": "^0.21.0",
     "@ng-bootstrap/ng-bootstrap": "^16.0.0",
-    "@popperjs/core": "^2.11.8",
     "bootstrap": "^5.3.3",
     "express": "^4.18.2",
+    "jquery": "^3.7.1",
     "rxjs": "~7.8.0",
     "tslib": "^2.3.0",
+    "uuid": "^10.0.0",
     "zone.js": "~0.14.3"
   },
   "devDependencies": {
@@ -42,6 +43,7 @@
     "@types/express": "^4.17.17",
     "@types/jasmine": "~5.1.0",
     "@types/node": "^18.18.0",
+    "@types/uuid": "^10.0.0",
     "jasmine-core": "~5.1.0",
     "karma": "~6.4.0",
     "karma-chrome-launcher": "~3.2.0",

EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/app.config.ts

@@ -1,4 +1,4 @@
-import { ApplicationConfig } from '@angular/core';
+import { ApplicationConfig, APP_INITIALIZER } from '@angular/core';
 import { provideRouter } from '@angular/router';
 import { routes } from './app.routes';
 import { provideClientHydration } from '@angular/platform-browser';
@@ -8,6 +8,7 @@ import { UrlService } from './services/url.service';
 import { API_URL } from './tokens/index'
 import { HTTP_INTERCEPTORS, provideHttpClient, withFetch } from '@angular/common/http';
 import { HttpRequestInterceptor } from './http.interceptor';
+import { ConfigurationService } from './services/configuration.service';
 
 export const appConfig: ApplicationConfig = {
   providers: [
@@ -29,6 +30,12 @@ export const appConfig: ApplicationConfig = {
       provide: HTTP_INTERCEPTORS,
       useClass: HttpRequestInterceptor,
       multi: true
+    },
+    {
+      provide: APP_INITIALIZER,
+      useFactory: (configService: ConfigurationService) => async () => await configService.ngOnInit(),
+      deps: [ConfigurationService],
+      multi: true
     }
   ]
 };

EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/app.routes.ts

@@ -2,9 +2,11 @@ import { Routes } from '@angular/router';
 import { HomeComponent } from '../app/pages/home/home.component'
 import { authGuard } from './guards/auth.guard'
 import { EnvelopeComponent } from './pages/envelope/envelope.component';
+import { EnvelopeCreationComponent } from './pages/envelope-creation/envelope-creation.component';
 
 export const routes: Routes = [
-  { path: '', component: HomeComponent },
+  { path: '', component: EnvelopeComponent, canActivate: [authGuard] },
   { path: 'login', component: HomeComponent },
-  { path: 'envelope', component: EnvelopeComponent, canActivate: [authGuard] }
+  { path: 'envelope', component: EnvelopeComponent, canActivate: [authGuard] },
+  { path: 'envelope-creation', component: EnvelopeCreationComponent, canActivate: [authGuard] }
 ];