feat: Separate CSS for Cursor company created

Eine separate CSS-Datei für das Unternehmen Cursor wurde erstellt. Die site.css wurde angepasst, um das Layout entsprechend dem Cursor-Logo responsiv zu gestalten.

EnvelopeGenerator.Application/Contracts/IConfigService.cs

@@ -1,12 +1,11 @@
-using DigitalData.Core.Contracts.Application;
+using DigitalData.Core.Abstractions.Application;
 using DigitalData.Core.DTO;
 using EnvelopeGenerator.Application.DTOs;
 using EnvelopeGenerator.Domain.Entities;
-using EnvelopeGenerator.Infrastructure.Contracts;
 
 namespace EnvelopeGenerator.Application.Contracts
 {
-    public interface IConfigService : IBasicCRUDService<IConfigRepository, ConfigDto, Config, int>
+    public interface IConfigService : IBasicCRUDService<ConfigDto, Config, int>
     {
         Task<DataResult<ConfigDto>> ReadFirstAsync();
 

EnvelopeGenerator.Application/Contracts/IDocumentReceiverElementService.cs

@@ -1,11 +1,10 @@
-using DigitalData.Core.Contracts.Application;
+using DigitalData.Core.Abstractions.Application;
 using EnvelopeGenerator.Application.DTOs;
 using EnvelopeGenerator.Domain.Entities;
-using EnvelopeGenerator.Infrastructure.Contracts;
 
 namespace EnvelopeGenerator.Application.Contracts
 {
-    public interface IDocumentReceiverElementService : IBasicCRUDService<IDocumentReceiverElementRepository, DocumentReceiverElementDto, DocumentReceiverElement, int>
+    public interface IDocumentReceiverElementService : IBasicCRUDService<DocumentReceiverElementDto, DocumentReceiverElement, int>
     {
     }
 }

EnvelopeGenerator.Application/Contracts/IDocumentStatusService.cs

@@ -1,11 +1,9 @@
-using DigitalData.Core.Contracts.Application;
+using DigitalData.Core.Abstractions.Application;
 using EnvelopeGenerator.Application.DTOs;
 using EnvelopeGenerator.Domain.Entities;
-using EnvelopeGenerator.Infrastructure.Contracts;
-
 namespace EnvelopeGenerator.Application.Contracts
 {
-    public interface IDocumentStatusService : IBasicCRUDService<IDocumentStatusRepository, DocumentStatusDto, DocumentStatus, int>
+    public interface IDocumentStatusService : IBasicCRUDService<DocumentStatusDto, DocumentStatus, int>
     {
     }
 }

EnvelopeGenerator.Application/Contracts/IEmailTemplateService.cs

@@ -1,13 +1,12 @@
-using DigitalData.Core.Contracts.Application;
+using DigitalData.Core.Abstractions.Application;
 using DigitalData.Core.DTO;
 using EnvelopeGenerator.Application.DTOs;
 using EnvelopeGenerator.Domain.Entities;
-using EnvelopeGenerator.Infrastructure.Contracts;
 using static EnvelopeGenerator.Common.Constants;
 
 namespace EnvelopeGenerator.Application.Contracts
 {
-    public interface IEmailTemplateService : IBasicCRUDService<IEmailTemplateRepository, EmailTemplateDto, EmailTemplate, int>
+    public interface IEmailTemplateService : IBasicCRUDService<EmailTemplateDto, EmailTemplate, int>
     {
         Task<DataResult<EmailTemplateDto>> ReadByNameAsync(EmailTemplateType type);
     }

EnvelopeGenerator.Application/Contracts/IEnvelopeCertificateService.cs

@@ -1,11 +1,10 @@
-using DigitalData.Core.Contracts.Application;
+using DigitalData.Core.Abstractions.Application;
 using EnvelopeGenerator.Application.DTOs;
 using EnvelopeGenerator.Domain.Entities;
-using EnvelopeGenerator.Infrastructure.Contracts;
 
 namespace EnvelopeGenerator.Application.Contracts
 {
-    public interface IEnvelopeCertificateService : IBasicCRUDService<IEnvelopeCertificateRepository, EnvelopeCertificateDto, EnvelopeCertificate, int>
+    public interface IEnvelopeCertificateService : IBasicCRUDService<EnvelopeCertificateDto, EnvelopeCertificate, int>
     {
     }
 }

EnvelopeGenerator.Application/Contracts/IEnvelopeDocumentService.cs

@@ -1,11 +1,10 @@
-using DigitalData.Core.Contracts.Application;
+using DigitalData.Core.Abstractions.Application;
 using EnvelopeGenerator.Application.DTOs;
 using EnvelopeGenerator.Domain.Entities;
-using EnvelopeGenerator.Infrastructure.Contracts;
 
 namespace EnvelopeGenerator.Application.Contracts
 {
-    public interface IEnvelopeDocumentService : IBasicCRUDService<IEnvelopeDocumentRepository, EnvelopeDocumentDto, EnvelopeDocument, int>
+    public interface IEnvelopeDocumentService : IBasicCRUDService<EnvelopeDocumentDto, EnvelopeDocument, int>
     {
     }
 }

EnvelopeGenerator.Application/Contracts/IEnvelopeHistoryService.cs

@@ -1,14 +1,14 @@
-using DigitalData.Core.Contracts.Application;
+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
 {
-    public interface IEnvelopeHistoryService : ICRUDService<IEnvelopeHistoryRepository, EnvelopeHistoryCreateDto, EnvelopeHistoryDto, EnvelopeHistoryDto, EnvelopeHistory, long>
+    public interface IEnvelopeHistoryService : ICRUDService<EnvelopeHistoryCreateDto, EnvelopeHistoryDto, EnvelopeHistoryDto, EnvelopeHistory, long>
     {
         Task<int> CountAsync(int? envelopeId = null, string? userReference = null, int? status = null);
 
@@ -22,7 +22,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,5 +1,5 @@
 using DigitalData.Core.DTO;
-using DigitalData.EmailProfilerDispatcher.Application.Contracts;
+using DigitalData.EmailProfilerDispatcher.Abstraction.Contracts;
 using EnvelopeGenerator.Application.DTOs;
 using EnvelopeGenerator.Common;
 

EnvelopeGenerator.Application/Contracts/IEnvelopeReceiverService.cs

@@ -1,12 +1,11 @@
-using DigitalData.Core.Contracts.Application;
+using DigitalData.Core.Abstractions.Application;
 using DigitalData.Core.DTO;
 using EnvelopeGenerator.Application.DTOs;
 using EnvelopeGenerator.Domain.Entities;
-using EnvelopeGenerator.Infrastructure.Contracts;
 
 namespace EnvelopeGenerator.Application.Contracts
 {
-    public interface IEnvelopeReceiverService : IBasicCRUDService<IEnvelopeReceiverRepository, EnvelopeReceiverDto, EnvelopeReceiver, int>
+    public interface IEnvelopeReceiverService : IBasicCRUDService<EnvelopeReceiverDto, EnvelopeReceiver, object>
     {
 
         Task<DataResult<IEnumerable<EnvelopeReceiverDto>>> ReadByUuidAsync(string uuid, bool withEnvelope = true, bool withReceiver = false);
@@ -24,5 +23,7 @@ namespace EnvelopeGenerator.Application.Contracts
         Task<DataResult<bool>> VerifyAccessCodeAsync(string envelopeReceiverId, string accessCode);
 
         Task<DataResult<bool>> IsExisting(string envelopeReceiverId);
+
+        Task<DataResult<IEnumerable<EnvelopeReceiverDto>>> ReadByUsernameAsync(string username, int? min_status = null, int? max_status = null, params int[] ignore_statuses);
     }
 }

EnvelopeGenerator.Application/Contracts/IEnvelopeService.cs

@@ -1,4 +1,4 @@
-using DigitalData.Core.Contracts.Application;
+using DigitalData.Core.Abstractions.Application;
 using DigitalData.Core.DTO;
 using EnvelopeGenerator.Application.DTOs;
 using EnvelopeGenerator.Domain.Entities;
@@ -6,7 +6,7 @@ using EnvelopeGenerator.Infrastructure.Contracts;
 
 namespace EnvelopeGenerator.Application.Contracts
 {
-    public interface IEnvelopeService : IBasicCRUDService<IEnvelopeRepository, EnvelopeDto, Envelope, int>
+    public interface IEnvelopeService : IBasicCRUDService<EnvelopeDto, Envelope, int>
     {
         Task<DataResult<IEnumerable<EnvelopeDto>>> ReadAllWithAsync(bool documents = false, bool history = false, bool documentReceiverElement = false);
 

EnvelopeGenerator.Application/Contracts/IEnvelopeTypeService.cs

@@ -1,11 +1,10 @@
-using DigitalData.Core.Contracts.Application;
+using DigitalData.Core.Abstractions.Application;
 using EnvelopeGenerator.Application.DTOs;
 using EnvelopeGenerator.Domain.Entities;
-using EnvelopeGenerator.Infrastructure.Contracts;
 
 namespace EnvelopeGenerator.Application.Contracts
 {
-    public interface IEnvelopeTypeService : IBasicCRUDService<IEnvelopeTypeRepository, EnvelopeTypeDto, EnvelopeType, int>
+    public interface IEnvelopeTypeService : IBasicCRUDService<EnvelopeTypeDto, EnvelopeType, int>
     {
     }
 }

EnvelopeGenerator.Application/Contracts/IReceiverService.cs

@@ -1,11 +1,14 @@
-using DigitalData.Core.Contracts.Application;
-using EnvelopeGenerator.Application.DTOs;
+using DigitalData.Core.Abstractions.Application;
+using DigitalData.Core.DTO;
+using EnvelopeGenerator.Application.DTOs.Receiver;
 using EnvelopeGenerator.Domain.Entities;
-using EnvelopeGenerator.Infrastructure.Contracts;
 
 namespace EnvelopeGenerator.Application.Contracts
 {
-    public interface IReceiverService : IBasicCRUDService<IReceiverRepository, 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,11 +1,11 @@
-using DigitalData.Core.Contracts.Application;
+using DigitalData.Core.Abstractions.Application;
 using EnvelopeGenerator.Application.DTOs;
 using EnvelopeGenerator.Domain.Entities;
 using EnvelopeGenerator.Infrastructure.Contracts;
 
 namespace EnvelopeGenerator.Application.Contracts
 {
-    public interface IUserReceiverService : IBasicCRUDService<IUserReceiverRepository, UserReceiverDto, UserReceiver, int>
+    public interface IUserReceiverService : IBasicCRUDService<UserReceiverDto, UserReceiver, int>
     {
     }
 }

EnvelopeGenerator.Application/DIExtensions.cs

@@ -0,0 +1,57 @@
+using DigitalData.UserManager.Application.MappingProfiles;
+using EnvelopeGenerator.Application.Contracts;
+using EnvelopeGenerator.Application.MappingProfiles;
+using EnvelopeGenerator.Application.Services;
+using EnvelopeGenerator.Infrastructure.Contracts;
+using EnvelopeGenerator.Infrastructure.Repositories;
+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)
+        {
+            //Inject CRUD Service and repositoriesad
+            services.AddScoped<IConfigRepository, ConfigRepository>();
+            services.AddScoped<IDocumentReceiverElementRepository, DocumentReceiverElementRepository>();
+            services.AddScoped<IEnvelopeDocumentRepository, EnvelopeDocumentRepository>();
+            services.AddScoped<IConfigRepository, ConfigRepository>();
+            services.AddScoped<IDocumentReceiverElementRepository, DocumentReceiverElementRepository>();
+            services.AddScoped<IDocumentStatusRepository, DocumentStatusRepository>();
+            services.AddScoped<IEmailTemplateRepository, EmailTemplateRepository>();
+            services.AddScoped<IEnvelopeRepository, EnvelopeRepository>();
+            services.AddScoped<IEnvelopeCertificateRepository, EnvelopeCertificateRepository>();
+            services.AddScoped<IEnvelopeDocumentRepository, EnvelopeDocumentRepository>();
+            services.AddScoped<IEnvelopeHistoryRepository, EnvelopeHistoryRepository>();
+            services.AddScoped<IEnvelopeReceiverRepository, EnvelopeReceiverRepository>();
+            services.AddScoped<IEnvelopeTypeRepository, EnvelopeTypeRepository>();
+            services.AddScoped<IReceiverRepository, ReceiverRepository>();
+            services.AddScoped<IUserReceiverRepository, UserReceiverRepository>();
+            services.AddScoped<IConfigService, ConfigService>();
+            services.AddScoped<IDocumentReceiverElementService, DocumentReceiverElementService>();
+            services.AddScoped<IEnvelopeDocumentService, EnvelopeDocumentService>();
+            services.AddScoped<IEnvelopeHistoryService, EnvelopeHistoryService>();
+            services.AddScoped<IDocumentStatusService, DocumentStatusService>();
+            services.AddScoped<IEmailTemplateService, EmailTemplateService>();
+            services.AddScoped<IEnvelopeService, EnvelopeService>();
+            services.AddScoped<IEnvelopeCertificateService, EnvelopeCertificateService>();
+            services.AddScoped<IEnvelopeDocumentService, EnvelopeDocumentService>();
+            services.AddScoped<IEnvelopeReceiverService, EnvelopeReceiverService>();
+            services.AddScoped<IEnvelopeTypeService, EnvelopeTypeService>();
+            services.AddScoped<IReceiverService, ReceiverService>();
+            services.AddScoped<IUserReceiverService, UserReceiverService>();
+
+            //Auto mapping profiles
+            services.AddAutoMapper(typeof(BasicDtoMappingProfile).Assembly);
+            services.AddAutoMapper(typeof(UserMappingProfile).Assembly);
+
+            return services;
+        }
+    }
+}

EnvelopeGenerator.Application/DTOs/EnvelopeDto.cs

@@ -1,7 +1,5 @@
-using DigitalData.EmailProfilerDispatcher.Domain.Attributes;
+using DigitalData.EmailProfilerDispatcher.Abstraction.Attributes;
 using DigitalData.UserManager.Application.DTOs.User;
-using DigitalData.UserManager.Domain.Entities;
-using EnvelopeGenerator.Application.DTOs.EnvelopeHistory;
 using EnvelopeGenerator.Domain.Entities;
 
 namespace EnvelopeGenerator.Application.DTOs
@@ -14,7 +12,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,6 @@
 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
@@ -12,7 +13,7 @@ namespace EnvelopeGenerator.Application.DTOs.EnvelopeHistory
         DateTime AddedWhen,
         DateTime? ActionDate,
         UserCreateDto? Sender,
-        ReceiverDto? Receiver,
+        ReceiverReadDto? Receiver,
         ReferenceType ReferenceType,
         string? Comment = null) : BaseDTO<long>(Id);
 }

EnvelopeGenerator.Application/DTOs/EnvelopeReceiverDto.cs

@@ -1,6 +1,5 @@
-using DigitalData.EmailProfilerDispatcher.Domain.Attributes;
-using System.ComponentModel.DataAnnotations.Schema;
-using System.Text.Json.Serialization;
+using DigitalData.EmailProfilerDispatcher.Abstraction.Attributes;
+using EnvelopeGenerator.Application.DTOs.Receiver;
 
 namespace EnvelopeGenerator.Application.DTOs
 {
@@ -27,6 +26,6 @@ namespace EnvelopeGenerator.Application.DTOs
 				
 		public EnvelopeDto? Envelope { get; set; }
 
-		public ReceiverDto? Receiver { get; set; }
+		public ReceiverReadDto? Receiver { get; set; }
 	}
 }

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

@@ -1,8 +1,8 @@
 using DigitalData.Core.DTO;
 
-namespace EnvelopeGenerator.Application.DTOs
+namespace EnvelopeGenerator.Application.DTOs.Receiver
 {
-    public record ReceiverDto(
+    public record ReceiverReadDto(
         int Id,
         string EmailAddress,
         string Signature,

EnvelopeGenerator.Application/DTOs/Receiver/ReceiverUpdateDto.cs

@@ -0,0 +1,4 @@
+namespace EnvelopeGenerator.Application.DTOs.Receiver
+{
+    public record ReceiverUpdateDto();
+}

EnvelopeGenerator.Application/EnvelopeGenerator.Application.csproj

@@ -6,9 +6,19 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
+  <ItemGroup>
+    <None Remove="Resources\Model.Designer.vb" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="AutoMapper" Version="13.0.1" />
+    <PackageReference Include="DigitalData.Core.Abstractions" Version="1.0.1.1" />
+    <PackageReference Include="DigitalData.Core.Application" Version="1.0.0" />
+    <PackageReference Include="DigitalData.Core.DTO" Version="1.0.0" />
+    <PackageReference Include="DigitalData.EmailProfilerDispatcher" Version="1.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.18" />
+    <PackageReference Include="UserManager.Application" Version="1.0.0" />
+    <PackageReference Include="UserManager.Infrastructure" Version="1.0.0" />
   </ItemGroup>
 
   <ItemGroup>
@@ -16,39 +26,24 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Reference Include="DigitalData.Core.Application">
-      <HintPath>..\..\WebCoreModules\DigitalData.Core.Application\bin\Debug\net7.0\DigitalData.Core.Application.dll</HintPath>
-    </Reference>
-    <Reference Include="DigitalData.Core.Contracts">
-      <HintPath>..\..\WebCoreModules\DigitalData.Core.Application\bin\Debug\net7.0\DigitalData.Core.Contracts.dll</HintPath>
-    </Reference>
-    <Reference Include="DigitalData.Core.DTO">
-      <HintPath>..\..\WebCoreModules\DigitalData.Core.Application\bin\Debug\net7.0\DigitalData.Core.DTO.dll</HintPath>
-    </Reference>
-    <Reference Include="DigitalData.Core.Infrastructure">
-      <HintPath>..\..\WebUserManager\DigitalData.UserManager.Application\bin\Debug\net7.0\DigitalData.Core.Infrastructure.dll</HintPath>
-    </Reference>
-    <Reference Include="DigitalData.EmailProfilerDispatcher.Application">
-      <HintPath>..\..\EmailProfilerDispatcher\DigitalData.EmailProfilerDispatcher.Application\bin\Debug\net7.0\DigitalData.EmailProfilerDispatcher.Application.dll</HintPath>
-    </Reference>
-    <Reference Include="DigitalData.EmailProfilerDispatcher.Domain">
-      <HintPath>..\..\EmailProfilerDispatcher\DigitalData.EmailProfilerDispatcher.Application\bin\Debug\net7.0\DigitalData.EmailProfilerDispatcher.Domain.dll</HintPath>
-    </Reference>
-    <Reference Include="DigitalData.EmailProfilerDispatcher.Infrastructure">
-      <HintPath>..\..\EmailProfilerDispatcher\DigitalData.EmailProfilerDispatcher.Application\bin\Debug\net7.0\DigitalData.EmailProfilerDispatcher.Infrastructure.dll</HintPath>
-    </Reference>
-    <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>
+    <Compile Update="Resources\Model.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Model.resx</DependentUpon>
+    </Compile>
   </ItemGroup>
 
   <ItemGroup>
+    <EmbeddedResource Update="Resources\Model.en.resx">
+      <CustomToolNamespace>My.Resources</CustomToolNamespace>
+      <LastGenOutput>Model.en.Designer.vb</LastGenOutput>
+      <Generator>PublicResXFileCodeGenerator</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Update="Resources\Model.resx">
+      <CustomToolNamespace>My.Resources</CustomToolNamespace>
+      <LastGenOutput>Model.Designer.cs</LastGenOutput>
+      <Generator>PublicResXFileCodeGenerator</Generator>
+    </EmbeddedResource>
     <EmbeddedResource Update="Resources\Resource.de-DE.resx">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </EmbeddedResource>

EnvelopeGenerator.Application/MappingProfiles/BasicDtoMappingProfile.cs

@@ -1,6 +1,7 @@
 using AutoMapper;
 using EnvelopeGenerator.Application.DTOs;
 using EnvelopeGenerator.Application.DTOs.EnvelopeHistory;
+using EnvelopeGenerator.Application.DTOs.Receiver;
 using EnvelopeGenerator.Domain.Entities;
 
 namespace EnvelopeGenerator.Application.MappingProfiles
@@ -21,7 +22,9 @@ namespace EnvelopeGenerator.Application.MappingProfiles
             CreateMap<EnvelopeHistory, EnvelopeHistoryCreateDto>();
             CreateMap<EnvelopeReceiver, EnvelopeReceiverDto>();
             CreateMap<EnvelopeType, EnvelopeTypeDto>();
-            CreateMap<Receiver, ReceiverDto>();
+            CreateMap<Receiver, ReceiverReadDto>();
+            CreateMap<Receiver, ReceiverCreateDto>();
+            CreateMap<Receiver, ReceiverUpdateDto>();
             CreateMap<UserReceiver, UserReceiverDto>();
 
             // DTO to Entity mappings
@@ -36,7 +39,9 @@ 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>();
         }
     }

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>
@@ -201,9 +204,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>
@@ -201,9 +204,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

@@ -17,7 +17,7 @@ namespace EnvelopeGenerator.Application.Services
 
 		private readonly IMemoryCache _cache;
         private readonly ILogger<ConfigService> _logger;
-		public ConfigService(IConfigRepository repository, IStringLocalizer<Resource> localizer, IMapper mapper, IMemoryCache memoryCache, ILogger<ConfigService> logger) : base(repository, localizer, mapper)
+		public ConfigService(IConfigRepository repository, IMapper mapper, IMemoryCache memoryCache, ILogger<ConfigService> logger) : base(repository, mapper)
         {
 			_cache = memoryCache;
             _logger = logger;

EnvelopeGenerator.Application/Services/DocumentReceiverElementService.cs

@@ -11,8 +11,8 @@ namespace EnvelopeGenerator.Application.Services
 {
     public class DocumentReceiverElementService : BasicCRUDService<IDocumentReceiverElementRepository, DocumentReceiverElementDto, DocumentReceiverElement, int>, IDocumentReceiverElementService
     {
-        public DocumentReceiverElementService(IDocumentReceiverElementRepository repository, IStringLocalizer<Resource> localizer, IMapper mapper)
-            : base(repository, localizer, mapper)
+        public DocumentReceiverElementService(IDocumentReceiverElementRepository repository, IMapper mapper)
+            : base(repository, mapper)
         {
         }
     }

EnvelopeGenerator.Application/Services/DocumentStatusService.cs

@@ -11,8 +11,8 @@ namespace EnvelopeGenerator.Application.Services
 {
     public class DocumentStatusService : BasicCRUDService<IDocumentStatusRepository, DocumentStatusDto, DocumentStatus, int>, IDocumentStatusService
     {
-        public DocumentStatusService(IDocumentStatusRepository repository, IStringLocalizer<Resource> localizer, IMapper mapper)
-            : base(repository, localizer, mapper)
+        public DocumentStatusService(IDocumentStatusRepository repository, IMapper mapper)
+            : base(repository, mapper)
         {
         }
     }

EnvelopeGenerator.Application/Services/EmailTemplateService.cs

@@ -14,8 +14,8 @@ namespace EnvelopeGenerator.Application.Services
 {
     public class EmailTemplateService : BasicCRUDService<IEmailTemplateRepository, EmailTemplateDto, EmailTemplate, int>, IEmailTemplateService
     {
-        public EmailTemplateService(IEmailTemplateRepository repository, IStringLocalizer<Resource> localizer, IMapper mapper)
-            : base(repository, localizer, mapper)
+        public EmailTemplateService(IEmailTemplateRepository repository, IMapper mapper)
+            : base(repository, mapper)
         {
         }
 

EnvelopeGenerator.Application/Services/EnvelopeCertificateService.cs

@@ -11,8 +11,8 @@ namespace EnvelopeGenerator.Application.Services
 {
     public class EnvelopeCertificateService : BasicCRUDService<IEnvelopeCertificateRepository, EnvelopeCertificateDto, EnvelopeCertificate, int>, IEnvelopeCertificateService
     {
-        public EnvelopeCertificateService(IEnvelopeCertificateRepository repository, IStringLocalizer<Resource> localizer, IMapper mapper)
-            : base(repository, localizer, mapper)
+        public EnvelopeCertificateService(IEnvelopeCertificateRepository repository, IMapper mapper)
+            : base(repository, mapper)
         {
         }
     }

EnvelopeGenerator.Application/Services/EnvelopeDocumentService.cs

@@ -1,18 +1,15 @@
 using AutoMapper;
 using DigitalData.Core.Application;
-using DigitalData.Core.Contracts.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 EnvelopeDocumentService : BasicCRUDService<IEnvelopeDocumentRepository, EnvelopeDocumentDto, EnvelopeDocument, int>, IEnvelopeDocumentService
     {
-        public EnvelopeDocumentService(IEnvelopeDocumentRepository repository, IStringLocalizer<Resource> localizer, IMapper mapper) : base(repository, localizer, mapper)
+        public EnvelopeDocumentService(IEnvelopeDocumentRepository repository, IMapper mapper) : base(repository, mapper)
         {
         }
     }

EnvelopeGenerator.Application/Services/EnvelopeHistoryService.cs

@@ -8,14 +8,14 @@ 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)
-            : base(repository, localizer, mapper)
+            : base(repository, mapper)
         {
         }
 
@@ -67,11 +67,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

@@ -1,8 +1,8 @@
 using AutoMapper;
 using DigitalData.Core.DTO;
-using DigitalData.EmailProfilerDispatcher.Application.DTOs.EmailOut;
-using DigitalData.EmailProfilerDispatcher.Application.Services;
-using DigitalData.EmailProfilerDispatcher.Infrastructure.Contracts;
+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;
@@ -14,14 +14,14 @@ using static EnvelopeGenerator.Common.Constants;
 
 namespace EnvelopeGenerator.Application.Services
 {
-	public class EnvelopeMailService : EmailOutService<Resource>, IEnvelopeMailService
+	public class EnvelopeMailService : EmailOutService, IEnvelopeMailService
     {
 		private readonly IEmailTemplateService _tempService;
 		private readonly IEnvelopeReceiverService _envRcvService;
 		private readonly DispatcherConfig _dConfig;
 		private readonly IConfigService _configService;
 
-        public EnvelopeMailService(IEmailOutRepository repository, IStringLocalizer<Resource> localizer, IMapper mapper, IEmailTemplateService tempService, IEnvelopeReceiverService envelopeReceiverService, IOptions<DispatcherConfig> dispatcherConfigOptions, IConfigService configService) : base(repository, localizer, mapper)
+        public EnvelopeMailService(IEmailOutRepository repository, IStringLocalizer<Resource> localizer, IMapper mapper, IEmailTemplateService tempService, IEnvelopeReceiverService envelopeReceiverService, IOptions<DispatcherConfig> dispatcherConfigOptions, IConfigService configService) : base(repository, mapper)
         {
             _tempService = tempService;
 			_envRcvService = envelopeReceiverService;

EnvelopeGenerator.Application/Services/EnvelopeReceiverService.cs

@@ -11,11 +11,14 @@ using Microsoft.Extensions.Logging;
 
 namespace EnvelopeGenerator.Application.Services
 {
-    public class EnvelopeReceiverService : BasicCRUDService<IEnvelopeReceiverRepository, EnvelopeReceiverDto, EnvelopeReceiver, int>, IEnvelopeReceiverService
+    public class EnvelopeReceiverService : BasicCRUDService<IEnvelopeReceiverRepository, EnvelopeReceiverDto, EnvelopeReceiver, object>, IEnvelopeReceiverService
     {
+        private readonly IStringLocalizer<Resource> _localizer;
+
         public EnvelopeReceiverService(IEnvelopeReceiverRepository repository, IStringLocalizer<Resource> localizer, IMapper mapper)
-            : base(repository, localizer, mapper)
+            : base(repository, mapper)
         {
+            _localizer = localizer;
         }
 
         public async Task<DataResult<IEnumerable<EnvelopeReceiverDto>>> ReadBySignatureAsync(string signature, bool withEnvelope = false, bool withReceiver = true)
@@ -112,5 +115,12 @@ namespace EnvelopeGenerator.Application.Services
                 Result.Fail<string>().Notice(LogLevel.Error, Flag.DataIntegrityIssue, $"Access code is null. Envelope ID is {envelopeId} and receiver ID {receiverId}")
                 : Result.Success(code);
 		}
-	}
+
+        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, min_status: min_status, max_status: max_status, ignore_statuses: ignore_statuses);
+            var dto_list = _mapper.MapOrThrow<IEnumerable<EnvelopeReceiverDto>>(er_list);
+            return Result.Success(dto_list);
+        }
+    }
 }

EnvelopeGenerator.Application/Services/EnvelopeService.cs

@@ -14,8 +14,8 @@ namespace EnvelopeGenerator.Application.Services
     public class EnvelopeService : BasicCRUDService<IEnvelopeRepository, EnvelopeDto, Envelope, int>, IEnvelopeService
     {
         private readonly ILogger _logger;
-        public EnvelopeService(IEnvelopeRepository repository, IStringLocalizer<Resource> localizer, IMapper mapper, ILogger<EnvelopeService> logger)
-            : base(repository, localizer, mapper)
+        public EnvelopeService(IEnvelopeRepository repository, IMapper mapper, ILogger<EnvelopeService> logger)
+            : base(repository, mapper)
         {
             _logger = logger;
         }

EnvelopeGenerator.Application/Services/EnvelopeTypeService.cs

@@ -11,8 +11,8 @@ namespace EnvelopeGenerator.Application.Services
 {
     public class EnvelopeTypeService : BasicCRUDService<IEnvelopeTypeRepository, EnvelopeTypeDto, EnvelopeType, int>, IEnvelopeTypeService
     {
-        public EnvelopeTypeService(IEnvelopeTypeRepository repository, IStringLocalizer<Resource> localizer, IMapper mapper)
-            : base(repository, localizer, mapper)
+        public EnvelopeTypeService(IEnvelopeTypeRepository repository, IMapper mapper)
+            : base(repository, mapper)
         {
         }
     }

EnvelopeGenerator.Application/Services/ReceiverService.cs

@@ -2,19 +2,39 @@
 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)
-            : base(repository, localizer, 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.MapOrThrow<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

@@ -12,7 +12,7 @@ namespace EnvelopeGenerator.Application.Services
     public class UserReceiverService : BasicCRUDService<IUserReceiverRepository, UserReceiverDto, UserReceiver, int>, IUserReceiverService
     {
         public UserReceiverService(IUserReceiverRepository repository, IStringLocalizer<Resource> localizer, IMapper mapper)
-            : base(repository, localizer, mapper)
+            : base(repository, mapper)
         {
         }
     }

EnvelopeGenerator.Common/Constants.vb

@@ -102,6 +102,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/Entities/EmailData.vb

@@ -17,6 +17,8 @@ Public Class EmailData
     Public Property EnvelopeTitle As String = ""
 
     Public Property EmailAttachment As String = ""
+    Public Property ATT1_RELATED_ID As Long
+    Public Property ATT1_REL_TYPE As String = ""
 
     ''' <summary>
     ''' Constructor for sending email to receiver

EnvelopeGenerator.Common/Entities/Envelope.vb

@@ -31,7 +31,7 @@
     Public Property Receivers As New List(Of EnvelopeReceiver)
     Public Property History As New List(Of EnvelopeHistoryEntry)
     Public Property EnvelopeType As EnvelopeType
-
+    Public Property DOC_RESULT As Byte()
     Public ReadOnly Property EnvelopeTypeTitle As String
         Get
             Return EnvelopeType?.Title

EnvelopeGenerator.Common/Entities/EnvelopeDocument.vb

@@ -19,4 +19,5 @@ Public Class EnvelopeDocument
     Public Property Filepath As String
 
     Public Property PageCount As Integer
+    Public Property Byte_Data As Byte()
 End Class

EnvelopeGenerator.Common/EnvelopeGenerator.Common.vbproj

@@ -220,6 +220,8 @@
       <DesignTime>True</DesignTime>
       <DependentUpon>Model.resx</DependentUpon>
     </Compile>
+    <Compile Include="Strings\Model.vb" />
+    <Compile Include="TempFiles.vb" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="My Project\licenses.licx" />
@@ -241,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>

EnvelopeGenerator.Common/Jobs/FinalizeDocument/FinalizeDocumentJob.vb

@@ -7,15 +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
 
 Namespace Jobs
     Public Class FinalizeDocumentJob
@@ -41,11 +35,14 @@ Namespace Jobs
 
         Private ReadOnly CompleteWaitTime As Integer = 5
         Private ParentFolderUID As String = ""
+        Private myTempFiles As TempFiles
 
         Private Class EnvelopeData
             Public EnvelopeId As Integer
+            Public EnvelopeUUID As String
             Public DocumentPath As String
             Public AnnotationData As List(Of String)
+            Public DocAsByte As Byte()
 
         End Class
 
@@ -53,7 +50,8 @@ Namespace Jobs
             Dim oGdPictureKey As String = pContext.MergedJobDataMap.Item(Constants.GDPICTURE)
             LogConfig = pContext.MergedJobDataMap.Item(Constants.LOGCONFIG)
             Logger = LogConfig.GetLogger()
-
+            myTempFiles = New TempFiles(LogConfig)
+            myTempFiles.Create()
             Dim JobId = pContext.JobDetail.Key
             Logger.Info("Starting job {0}", JobId)
 
@@ -76,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)
@@ -86,6 +85,7 @@ Namespace Jobs
                 Logger.Debug("My.Settings.RuninDMZ: [{0}]", My.Settings.RuninDMZ.ToString)
                 Logger.Debug("My.Settings.NetUse_Usr: [{0}]", My.Settings.NetUse_Usr)
 
+
                 If My.Settings.RuninDMZ = True Then
                     If Config.DocumentPath_DMZ <> String.Empty Then
                         Logger.Debug("RuninDMZ - Using DocumentPath_DMZ: [{0}] - Overwrite Document-Path", Config.DocumentPath_DMZ)
@@ -126,7 +126,7 @@ Namespace Jobs
                 End If
 
                 Dim oCompleteStatus As Integer = Constants.EnvelopeStatus.EnvelopeCompletelySigned
-                Dim oSql = $"SELECT * FROM TBSIG_ENVELOPE WHERE STATUS = {oCompleteStatus} AND DATEDIFF(minute, CHANGED_WHEN, GETDATE()) >= {CompleteWaitTime}"
+                Dim oSql = $"SELECT * FROM TBSIG_ENVELOPE WHERE STATUS = {oCompleteStatus} AND DATEDIFF(minute, CHANGED_WHEN, GETDATE()) >= {CompleteWaitTime} ORDER BY GUID"
                 Dim oTable = Database.GetDatatable(oSql)
 
                 Dim oEnvelopeIds As List(Of Integer) = oTable.Rows.Cast(Of DataRow).
@@ -142,99 +142,83 @@ Namespace Jobs
                 Dim oCurrent As Integer = 1
 
                 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 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
 
-                    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)
-                                'Dim oReturnPath = MoveFileWithNetUse(Config.FINISHED_PATH_EX_DMZ, oOutputFilePath, My.Settings.NetUse_Usr, My.Settings.NetUse_PW)
-                                'If oReturnPath <> String.Empty Then
-                                '    oOutputFilePath = oReturnPath
-                                '    If Config.EML_PATH_EX_DMZ <> String.Empty Then
-                                '        Logger.Debug($"Now replacing [{Config.FINISHED_PATH_EX_DMZ}] with ")
-                                '        Logger.Debug($"............. [{Config.EML_PATH_EX_DMZ}] ")
-                                '        oOutputFilePath = oOutputFilePath.Replace(Config.FINISHED_PATH_EX_DMZ, Config.EML_PATH_EX_DMZ)
-                                '        Logger.Debug($"oOutputFilePath [{oOutputFilePath}] ")
-                                '    End If
-                                'Else
-                                '    Logger.Info($"Exiting/Aborting FinalizeDocuments!")
-                                '    Return Task.FromResult(False)
-                                '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("Sending finalized report-mails..")
+                        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
 
-                    If SendFinalEmails(oEnvelope, oOutputFilePath) = False Then
-                        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!")
@@ -259,6 +243,50 @@ Namespace Jobs
 
             Return Task.FromResult(True)
         End Function
+        Private Sub Update_File_DB(pFilePath As String, pEnvelopeID As Long)
+            Dim SqlCom As SqlCommand
+            Dim imageData As Byte()
+            Dim sFileName As String
+            Dim qry As String
+
+            Try
+                'Read Image Bytes into a byte array 
+                'Initialize SQL Server Connection 
+
+                'Convert File to bytes Array
+                imageData = ReadFile(pFilePath)
+                If Not IsNothing(imageData) Then
+                    sFileName = System.IO.Path.GetFileName(pFilePath)
+                    'Set insert query 
+                    qry = $"UPDATE TBSIG_ENVELOPE SET DOC_RESULT = @ImageData WHERE GUID = {pEnvelopeID}"
+                    'Initialize SqlCommand object for insert. 
+                    SqlCom = New SqlCommand(qry, Database.GetConnection)
+                    'We are passing File Name and Image byte data as sql parameters. 
+                    SqlCom.Parameters.Add(New SqlParameter("@ImageData", DirectCast(imageData, Object)))
+                    'Execute the Query
+                    SqlCom.ExecuteNonQuery()
+                End If
+
+            Catch ex As Exception
+                Logger.Error(ex)
+            End Try
+        End Sub
+        'Open file in to a filestream and read data in a byte array. 
+        Private Function ReadFile(ByVal sPath As String) As Byte()
+            'Initialize byte array with a null value initially. 
+            Dim data As Byte() = Nothing
+            'Use FileInfo object to get file size. 
+            Dim fInfo As New FileInfo(sPath)
+            Dim numBytes As Long = fInfo.Length
+            'Open FileStream to read file 
+            Dim fStream As New FileStream(sPath, FileMode.Open, FileAccess.Read)
+            'Use BinaryReader to read file stream into byte array. 
+            Dim br As New BinaryReader(fStream)
+            'When you use BinaryReader, you need to supply number of bytes to read from file. 
+            'In this case we want to read entire file. So supplying total number of bytes. 
+            data = br.ReadBytes(CInt(numBytes))
+            Return data
+        End Function
         Private Function NetUse_Command(pDestinationPath As String, pUsername As String, pPassword As String)
             Dim oDectryptedPW = Helpers.Decrypt(My.Settings.NetUse_PW)
             Dim netUseCommand As String = $"net use {pDestinationPath} /user:{pUsername} {oDectryptedPW}"
@@ -301,35 +329,33 @@ Namespace Jobs
 
 
         End Function
-        Private Function SendFinalEmails(pEnvelope As Envelope, pAttachment As String) As Boolean
+        Private Function SendFinalEmails(pEnvelope As Envelope) As Boolean ', pAttachment As String
             Dim oMailToCreator = pEnvelope.FinalEmailToCreator
             Dim oMailToReceivers = pEnvelope.FinalEmailToReceivers
 
             If oMailToCreator <> FinalEmailType.No Then
                 Logger.Debug("Sending email to creator ...")
-                SendFinalEmailToCreator(pEnvelope, pAttachment)
+                SendFinalEmailToCreator(pEnvelope) ', pAttachment
             End If
 
             If oMailToReceivers <> FinalEmailType.No Then
                 Logger.Debug("Sending emails to receivers..")
-
-
-                SendFinalEmailToReceivers(pEnvelope, pAttachment)
+                SendFinalEmailToReceivers(pEnvelope) ', pAttachment
             End If
 
             Return True
         End Function
 
-        Private Function SendFinalEmailToCreator(pEnvelope As Envelope, pAttachment As String) As Boolean
+        Private Function SendFinalEmailToCreator(pEnvelope As Envelope) As Boolean ', pAttachment As String
             Dim oIncludeAttachment = SendFinalEmailWithAttachment(pEnvelope.FinalEmailToCreator)
-            Dim oAttachment = String.Empty
+            ' Dim oAttachment = String.Empty
 
             Logger.Debug("Attachment included: [{0}]", oIncludeAttachment)
             If oIncludeAttachment Then
-                oAttachment = pAttachment
+                'oAttachment = pAttachment
             End If
 
-            If ActionService.CompleteEnvelope(pEnvelope, oAttachment) = False Then
+            If ActionService.CompleteEnvelope(pEnvelope) = False Then ', oAttachment
                 Logger.Error("Envelope could not be completed for receiver [{0}]", pEnvelope.User.Email)
                 Return False
             End If
@@ -337,18 +363,18 @@ Namespace Jobs
             Return True
         End Function
 
-        Private Function SendFinalEmailToReceivers(pEnvelope As Envelope, pAttachment As String) As Boolean
+        Private Function SendFinalEmailToReceivers(pEnvelope As Envelope) As Boolean ', pAttachment As String
             Dim oIncludeAttachment = SendFinalEmailWithAttachment(pEnvelope.FinalEmailToReceivers)
-            Dim oAttachment = String.Empty
+            'Dim oAttachment = String.Empty
 
             Logger.Debug("Attachment included: [{0}]", oIncludeAttachment)
             If oIncludeAttachment Then
 
-                oAttachment = pAttachment
+                ' oAttachment = pAttachment
             End If
 
             For Each oReceiver In pEnvelope.Receivers
-                If ActionService.CompleteEnvelope(pEnvelope, oReceiver, oAttachment) = False Then
+                If ActionService.CompleteEnvelope(pEnvelope, oReceiver) = False Then ', oAttachment
                     Logger.Error("Envelope could not be completed for receiver [{0}]", oReceiver.Email)
                     Return False
                 End If
@@ -371,36 +397,52 @@ Namespace Jobs
             Logger.Info($"Burning [{pEnvelopeData.AnnotationData.Count}] signatures")
             Dim oAnnotations = pEnvelopeData.AnnotationData
             Dim oInputPath = ""
-
-            If My.Settings.RuninDMZ Then
-                Logger.Debug("Replacing Path in pData.DocumentPath ...")
-                oInputPath = pEnvelopeData.DocumentPath.Replace(Config.DocumentPathOrigin, Config.DocumentPath)
-            ElseIf Config.DOCUMENT_PATH_MOVE_AFTSEND <> String.Empty Then
-                Logger.Debug("Replacing Path in pData.DocumentPath ...")
-                oInputPath = pEnvelopeData.DocumentPath.Replace(Config.DocumentPathOrigin, Config.DOCUMENT_PATH_MOVE_AFTSEND)
+            If IsNothing(pEnvelopeData.DocAsByte) Then
+                If My.Settings.RuninDMZ Then
+                    Logger.Debug("Replacing Path in pData.DocumentPath ...")
+                    oInputPath = pEnvelopeData.DocumentPath.Replace(Config.DocumentPathOrigin, Config.DocumentPath)
+                ElseIf Config.DOCUMENT_PATH_MOVE_AFTSEND <> String.Empty Then
+                    Logger.Debug("Replacing Path in pData.DocumentPath ...")
+                    oInputPath = pEnvelopeData.DocumentPath.Replace(Config.DocumentPathOrigin, Config.DOCUMENT_PATH_MOVE_AFTSEND)
+                Else
+                    oInputPath = pEnvelopeData.DocumentPath
+                End If
+                Logger.Info($"Input path: [{oInputPath}]")
             Else
-                oInputPath = pEnvelopeData.DocumentPath
+                Logger.Info($"we got bytes..")
+                oInputPath = Config.DocumentPathOrigin
+                Logger.Info($"oInputPath: {Config.DocumentPathOrigin}")
+            End If
+
+
+            If IsNothing(pEnvelopeData.DocAsByte) Then
+                Dim oDirectorySource As String = Path.GetDirectoryName(oInputPath)
+                Dim split As String() = oDirectorySource.Split("\")
+                ParentFolderUID = split(split.Length - 1)
+            Else
+                ParentFolderUID = pEnvelopeData.EnvelopeUUID
             End If
 
-            Logger.Info($"Input path: [{oInputPath}]")
-            Dim oDirectorySource As String = Path.GetDirectoryName(oInputPath)
-            Dim split As String() = oDirectorySource.Split("\")
-            ParentFolderUID = split(split.Length - 1)
 
             Logger.Info("ParentFolderUID: [{0}]", ParentFolderUID)
             Dim oInputDocumentBuffer As Byte()
-            Try
-                oInputDocumentBuffer = File.ReadAllBytes(oInputPath)
-            Catch ex As Exception
-                Logger.Error(ex)
-                Throw New BurnAnnotationException("Source document could not be read from disk!", ex)
-            End Try
+            If Not IsNothing(pEnvelopeData.DocAsByte) Then
+                oInputDocumentBuffer = pEnvelopeData.DocAsByte
+            Else
+                Try
+                    oInputDocumentBuffer = File.ReadAllBytes(oInputPath)
+                Catch ex As Exception
+                    Logger.Error(ex)
+                    Throw New BurnAnnotationException("Source document could not be read from disk!", ex)
+                End Try
+            End If
+
 
             Return PDFBurner.BurnInstantJSONAnnotationsToPDF(oInputDocumentBuffer, oAnnotations)
         End Function
 
         Private Function GetEnvelopeData(pEnvelopeId As Integer) As EnvelopeData
-            Dim oSql = $"SELECT T.GUID, T2.FILEPATH FROM [dbo].[TBSIG_ENVELOPE] T
+            Dim oSql = $"SELECT T.GUID, T.ENVELOPE_UUID,T2.FILEPATH, T2.BYTE_DATA FROM [dbo].[TBSIG_ENVELOPE] T
                 JOIN TBSIG_ENVELOPE_DOCUMENT T2 ON T.GUID = T2.ENVELOPE_ID
                 WHERE T.GUID = {pEnvelopeId}"
             Dim oTable As DataTable = Database.GetDatatable(oSql)
@@ -413,7 +455,9 @@ Namespace Jobs
             Dim oData As New EnvelopeData With {
                 .EnvelopeId = pEnvelopeId,
                 .DocumentPath = oRow.ItemEx("FILEPATH", ""),
-                .AnnotationData = oAnnotationData
+                .AnnotationData = oAnnotationData,
+                .DocAsByte = DirectCast(oRow.Item("BYTE_DATA"), Byte()),
+                .EnvelopeUUID = oRow.ItemEx("ENVELOPE_UUID", "")
             }
 
             Logger.Debug("Document path: [{0}]", oData.DocumentPath)

EnvelopeGenerator.Common/Jobs/FinalizeDocument/PDFBurner.vb

@@ -15,14 +15,18 @@ 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()
@@ -37,11 +41,11 @@ Namespace Jobs.FinalizeDocument
 
                     For Each oJSON In pInstantJSONList
                         If AddInstantJSONAnnotationToPDF(oJSON) = False Then
+                            Logger.Warn($"Error in AddInstantJSONAnnotationToPDF - oJson: ")
+                            Logger.Warn(oJSON)
                             Throw New BurnAnnotationException($"Adding Annotation failed")
                         End If
                     Next
-
-
                     oResult = Manager.BurnAnnotationsToPage(RemoveInitialAnnots:=True, VectorMode:=True)
                     If oResult <> GdPictureStatus.OK Then
                         Throw New BurnAnnotationException($"Could not burn annotations to file: [{oResult}]")
@@ -70,6 +74,7 @@ Namespace Jobs.FinalizeDocument
                 Dim oAnnotationData = JsonConvert.DeserializeObject(Of AnnotationData)(pInstantJSON)
 
                 For Each oAnnotation In oAnnotationData.annotations
+                    Logger.Debug("Adding AnnotationID: " + oAnnotation.id)
                     Select Case oAnnotation.type
                         Case ANNOTATION_TYPE_IMAGE
                             AddImageAnnotation(oAnnotation, oAnnotationData.attachments)
@@ -77,6 +82,12 @@ Namespace Jobs.FinalizeDocument
                         Case ANNOTATION_TYPE_INK
                             AddInkAnnotation(oAnnotation)
 
+                        Case ANNOTATION_TYPE_WIDGET
+                            'Add form field values
+                            Dim formFieldValue = oAnnotationData.formFieldValues.FirstOrDefault(Function(fv) fv.name = oAnnotation.id)
+                            If formFieldValue IsNot Nothing AndAlso Not _ignoredLabels.Contains(formFieldValue.value) Then
+                                AddFormFieldValue(oAnnotation, formFieldValue)
+                            End If
                     End Select
                 Next
 
@@ -137,6 +148,33 @@ Namespace Jobs.FinalizeDocument
 
         End Function
 
+        Private Function AddFormFieldValue(pAnnotation As Annotation, formFieldValue As FormFieldValue) As Boolean
+            Try
+                ' Convert pixels to Inches
+                Dim oBounds = pAnnotation.bbox.Select(AddressOf ToInches).ToList()
+
+                Dim oX = oBounds.Item(0)
+                Dim oY = oBounds.Item(1)
+                Dim oWidth = oBounds.Item(2)
+                Dim oHeight = oBounds.Item(3)
+
+                Manager.SelectPage(pAnnotation.pageIndex + 1)
+                ' Add the text annotation
+                Dim ant = Manager.AddTextAnnot(oX, oY, oWidth, oHeight, formFieldValue.value)
+
+                ' Set the font properties
+                ant.FontName = "Arial"
+                ant.FontSize = 8
+                ant.FontStyle = FontStyle.Italic
+                Manager.SaveAnnotationsToPage()
+                Return True
+            Catch ex As Exception
+                Logger.Warn("Could not add image annotation!")
+                Logger.Error(ex)
+                Return False
+            End Try
+        End Function
+
         Private Function ToPointF(pPoints As List(Of Single)) As PointF
             Dim oPoints = pPoints.Select(AddressOf ToInches).ToList()
             Return New PointF(oPoints.Item(0), oPoints.Item(1))
@@ -153,6 +191,7 @@ Namespace Jobs.FinalizeDocument
         Friend Class AnnotationData
             Public Property annotations As List(Of Annotation)
             Public Property attachments As Dictionary(Of String, Attachment)
+            Public Property formFieldValues As List(Of FormFieldValue)
         End Class
 
         Friend Class Annotation
@@ -174,5 +213,10 @@ Namespace Jobs.FinalizeDocument
             Public Property binary As String
             Public Property contentType As String
         End Class
+
+        Friend Class FormFieldValue
+            Public Property name As String
+            Public Property value As String
+        End Class
     End Class
 End Namespace

EnvelopeGenerator.Common/Models/DocumentModel.vb

@@ -24,7 +24,8 @@ Public Class DocumentModel
             .Filepath = pRow.ItemEx("FILEPATH", ""),
             .FileNameOriginal = pRow.ItemEx("FILENAME_ORIGINAL", ""),
             .IsTempFile = False,
-            .Elements = ElementModel.List(oDocumentId, pReceiverId)
+            .Elements = ElementModel.List(oDocumentId, pReceiverId),
+            .Byte_Data = DirectCast(pRow.Item("BYTE_DATA"), Byte())
         }
     End Function
 
@@ -79,18 +80,21 @@ Public Class DocumentModel
                            ([FILENAME]
                            ,[FILENAME_ORIGINAL]
                            ,[FILEPATH]
-                           ,[ENVELOPE_ID])
+                           ,[ENVELOPE_ID]
+                           ,[BYTE_DATA])
                         VALUES
                            (@FILENAME
                            ,@FILENAME_ORIGINAL
                            ,@FILEPATH
-                           ,@ENVELOPE_ID)"
+                           ,@ENVELOPE_ID
+                           ,@BYTE_DATA)"
 
             Dim oCommand As New SqlCommand(oSql)
             oCommand.Parameters.Add("FILENAME", SqlDbType.NVarChar).Value = pDocument.Filename
             oCommand.Parameters.Add("FILENAME_ORIGINAL", SqlDbType.NVarChar).Value = pDocument.FileNameOriginal
             oCommand.Parameters.Add("FILEPATH", SqlDbType.NVarChar).Value = pDocument.Filepath
             oCommand.Parameters.Add("ENVELOPE_ID", SqlDbType.Int).Value = pEnvelope.Id
+            oCommand.Parameters.Add(New SqlParameter("@BYTE_DATA", DirectCast(pDocument.Byte_Data, Object)))
 
             If Database.ExecuteNonQuery(oCommand, pTransaction) Then
                 pDocument.EnvelopeId = pEnvelope.Id

EnvelopeGenerator.Common/Models/EmailModel.vb

@@ -12,8 +12,8 @@ Public Class EmailModel
     Public Function Insert(pEmail As EmailData) As Boolean
         Try
             Dim oSql = "INSERT INTO [dbo].[TBEMLP_EMAIL_OUT] "
-            oSql += " (EMAIL_ADRESS, EMAIL_SUBJ, EMAIL_BODY, ADDED_WHO, SENDING_PROFILE, REFERENCE_ID, REFERENCE_STRING, REMINDER_TYPE_ID, EMAIL_ATTMT1, WF_ID) "
-            oSql += " VALUES (@EMAIL_ADRESS, @EMAIL_SUBJ, @EMAIL_BODY, @ADDED_WHO, @SENDING_PROFILE, @REFERENCE_ID, @REFERENCE_STRING, @REMINDER_TYPE_ID, @EMAIL_ATTMT1, @WF_ID)"
+            oSql += " (EMAIL_ADRESS, EMAIL_SUBJ, EMAIL_BODY, ADDED_WHO, SENDING_PROFILE, REFERENCE_ID, REFERENCE_STRING, REMINDER_TYPE_ID, WF_ID,ATT1_RELATED_ID,ATT1_REL_TYPE) "
+            oSql += " VALUES (@EMAIL_ADRESS, @EMAIL_SUBJ, @EMAIL_BODY, @ADDED_WHO, @SENDING_PROFILE, @REFERENCE_ID, @REFERENCE_STRING, @REMINDER_TYPE_ID, @WF_ID,@ATT1_RELATED_ID,@ATT1_REL_TYPE)"
             Dim oCommand As New SqlCommand(oSql)
             oCommand.Parameters.Add("EMAIL_ADRESS", SqlDbType.NVarChar).Value = pEmail.EmailAdress
             oCommand.Parameters.Add("EMAIL_SUBJ", SqlDbType.NVarChar).Value = pEmail.EmailSubject
@@ -23,8 +23,10 @@ Public Class EmailModel
             oCommand.Parameters.Add("REFERENCE_ID", SqlDbType.Int).Value = pEmail.ReferenceID
             oCommand.Parameters.Add("REFERENCE_STRING", SqlDbType.NVarChar).Value = pEmail.ReferenceString
             oCommand.Parameters.Add("REMINDER_TYPE_ID", SqlDbType.Int).Value = 202377
-            oCommand.Parameters.Add("EMAIL_ATTMT1", SqlDbType.NVarChar).Value = pEmail.EmailAttachment
+            'oCommand.Parameters.Add("EMAIL_ATTMT1", SqlDbType.NVarChar).Value = pEmail.EmailAttachment
             oCommand.Parameters.Add("WF_ID", SqlDbType.Int).Value = pEmail.EmailType  ' Wegen DB-Trigger MUSS dieser Wert gesetzt werden
+            oCommand.Parameters.Add("ATT1_RELATED_ID", SqlDbType.Int).Value = pEmail.ATT1_RELATED_ID
+            oCommand.Parameters.Add("ATT1_REL_TYPE", SqlDbType.NVarChar).Value = pEmail.ATT1_REL_TYPE
 
             If Database.ExecuteNonQuery(oCommand) Then
                 Return True

EnvelopeGenerator.Common/Models/EnvelopeModel.vb

@@ -47,7 +47,15 @@ Public Class EnvelopeModel
             .FinalEmailToCreator = ObjectEx.ToEnum(Of Constants.FinalEmailType)(pRow.ItemEx("FINAL_EMAIL_TO_CREATOR", Constants.FinalEmailType.No.ToString())),
             .FinalEmailToReceivers = ObjectEx.ToEnum(Of Constants.FinalEmailType)(pRow.ItemEx("FINAL_EMAIL_TO_RECEIVERS", Constants.FinalEmailType.No.ToString()))
         }
-
+        Dim oDOC_RESULT = pRow.Item("DOC_RESULT")
+        If Not IsDBNull(oDOC_RESULT) Then
+            Dim oByte As Byte() = DirectCast(pRow.Item("DOC_RESULT"), Byte())
+            If Not IsNothing(oByte) Then
+                oEnvelope.DOC_RESULT = oByte
+            End If
+        Else
+            oEnvelope.DOC_RESULT = Nothing
+        End If
         oEnvelope.User = UserModel.SelectUser(oEnvelope.UserId)
         oEnvelope.Receivers = ReceiverModel.ListEnvelopeReceivers(oEnvelope.Id)
         oEnvelope.Documents = DocumentModel.List(oEnvelope.Id)
@@ -185,6 +193,9 @@ Public Class EnvelopeModel
             oCommand.Parameters.Add("TITLE", SqlDbType.NVarChar).Value = pEnvelope.Title
             oCommand.Parameters.Add("ENVELOPE_TYPE", SqlDbType.Int).Value = pEnvelope.EnvelopeTypeId
             oCommand.Parameters.Add("CONTRACT_TYPE", SqlDbType.Int).Value = pEnvelope.ContractType
+            If IsNothing(pEnvelope.Language) Then
+                pEnvelope.Language = "de-DE"
+            End If
             oCommand.Parameters.Add("LANGUAGE", SqlDbType.NVarChar).Value = pEnvelope.Language
             oCommand.Parameters.Add("CERTIFICATION_TYPE", SqlDbType.Int).Value = pEnvelope.CertificationType
             oCommand.Parameters.Add("EXPIRES_WHEN_DAYS", SqlDbType.Int).Value = pEnvelope.ExpiresWhenDays

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.6.0.0")>
-<Assembly: AssemblyFileVersion("1.6.0.0")>
+<Assembly: AssemblyVersion("1.9.1.0")>
+<Assembly: AssemblyFileVersion("1.9.1.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,10 @@ Public Class ActionService
 
         Return True
     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
@@ -108,20 +113,20 @@ Public Class ActionService
         Return True
     End Function
 
-    Public Function CompleteEnvelope(pEnvelope As Envelope, pReceiver As EnvelopeReceiver, pAttachment As String) As Boolean
+    Public Function CompleteEnvelope(pEnvelope As Envelope, pReceiver As EnvelopeReceiver) As Boolean ', pAttachment As String
         If HistoryService.SetEnvelopeStatus(pEnvelope, Constants.EnvelopeStatus.MessageCompletionSent, pReceiver.Email) = False Then
             Return False
         End If
 
-        Return EmailService.SendDocumentCompletedEmailToReceiver(pEnvelope, pReceiver, pAttachment)
+        Return EmailService.SendDocumentCompletedEmailToReceiver(pEnvelope, pReceiver) ', pAttachment
     End Function
 
-    Public Function CompleteEnvelope(pEnvelope As Envelope, pAttachment As String) As Boolean
+    Public Function CompleteEnvelope(pEnvelope As Envelope) As Boolean ', pAttachment As String
         If HistoryService.SetEnvelopeStatus(pEnvelope, Constants.EnvelopeStatus.MessageCompletionSent, pEnvelope.User.Email) = False Then
             Return False
         End If
 
-        Return EmailService.SendDocumentCompletedEmailToCreator(pEnvelope, pAttachment)
+        Return EmailService.SendDocumentCompletedEmailToCreator(pEnvelope) ', pAttachment
     End Function
 
     Public Function CreateReport(pEnvelope As Envelope) As Boolean

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
@@ -83,14 +93,15 @@ Public Class EmailService
         Return True
     End Function
 
-    Public Function SendDocumentCompletedEmailToReceiver(pEnvelope As Envelope, pReceiver As EnvelopeReceiver, pAttachment As String) As Boolean
+    Public Function SendDocumentCompletedEmailToReceiver(pEnvelope As Envelope, pReceiver As EnvelopeReceiver) As Boolean ', pAttachment As String
         Logger.Debug("Creating email data object.")
         Dim oEmailData = New EmailData(pEnvelope, pReceiver, Constants.EnvelopeStatus.MessageCompletionSent) With
         {
             .SignatureLink = "",
-            .EmailAttachment = pAttachment
+            .ATT1_RELATED_ID = pEnvelope.Id,
+            .ATT1_REL_TYPE = "EnvelopeResult"
         }
-
+        ' .EmailAttachment = pAttachment,
         Logger.Debug("Sending mail to receiver: [{0}]", oEmailData.EmailAdress)
 
         EmailTemplate.FillDocumentCompletedEmailBody(oEmailData)
@@ -103,14 +114,15 @@ Public Class EmailService
         Return True
     End Function
 
-    Public Function SendDocumentCompletedEmailToCreator(pEnvelope As Envelope, pAttachment As String) As Boolean
+    Public Function SendDocumentCompletedEmailToCreator(pEnvelope As Envelope) As Boolean ', pAttachment As String
         Logger.Debug("Creating email data object.")
         Dim oEmailData = New EmailData(pEnvelope, Constants.EnvelopeStatus.MessageCompletionSent) With
         {
             .SignatureLink = "",
-            .EmailAttachment = pAttachment
+            .ATT1_RELATED_ID = pEnvelope.Id,
+            .ATT1_REL_TYPE = "EnvelopeResult"
         }
-
+        '.EmailAttachment = pAttachment,
         EmailTemplate.FillDocumentCompletedEmailBody(oEmailData)
 
         If EmailModel.Insert(oEmailData) = False Then

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>

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>

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

EnvelopeGenerator.Common/Strings/Model.vb

@@ -0,0 +1,3 @@
+Public Class Model
+
+End Class

EnvelopeGenerator.Common/TempFiles.vb

@@ -0,0 +1,60 @@
+Imports System.IO
+Imports DigitalData.Modules.Base
+Imports DigitalData.Modules.Logging
+
+Public Class TempFiles
+    Inherits BaseClass
+
+    Public Property TempPath As String
+
+    Public Sub New(pLogConfig As LogConfig)
+        MyBase.New(pLogConfig)
+
+        Dim oTempDirectoryPath = Path.GetTempPath()
+        TempPath = Path.Combine(oTempDirectoryPath, "EnvelopeGenerator")
+    End Sub
+
+    Public Function Create() As Boolean
+        Try
+            If Directory.Exists(TempPath) = False Then
+                Directory.CreateDirectory(TempPath)
+            Else
+                CleanUpFiles()
+            End If
+            Return True
+
+        Catch ex As Exception
+            Logger.Error(ex)
+            Return False
+        End Try
+
+    End Function
+
+    Private Function CleanUpFiles() As Boolean
+        Try
+            For Each fileItem As String In Directory.GetFiles(TempPath)
+                Logger.Debug("Deleting tempPath-file: {0} ...", fileItem)
+                File.Delete(fileItem)
+            Next
+
+            Return True
+
+        Catch ex As Exception
+            Logger.Error(ex)
+            Return False
+        End Try
+    End Function
+
+    Public Function CleanUp() As Boolean
+        Try
+            Logger.Debug("Deleting tempPath-Data: {0} ...", TempPath)
+            Directory.Delete(TempPath, True)
+            Return True
+
+        Catch ex As Exception
+            Logger.Error(ex)
+            Return False
+        End Try
+    End Function
+
+End Class

EnvelopeGenerator.Domain/Entities/Envelope.cs

@@ -21,6 +21,9 @@ 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; }
@@ -100,19 +103,6 @@ namespace EnvelopeGenerator.Domain.Entities
         [NotMapped]
         public bool IsAlreadySent => Status > (int) Constants.EnvelopeStatus.EnvelopeSaved;
 
-        [NotMapped]
-        public string? StatusTranslated => Model.ResourceManager.GetString(Status.ToString());
-
-        [NotMapped]
-        public string? ContractTypeTranslated
-        {
-            get
-            {
-                string? oContractType = ContractType.ToString();
-                return oContractType is null ? default : Model.ResourceManager.GetString(oContractType);
-            }
-        }
-
         public IEnumerable<EnvelopeDocument>? Documents { get; set; }
 
         public IEnumerable<EnvelopeHistory>? History { get; set; }

EnvelopeGenerator.Domain/Entities/Receiver.cs

@@ -10,14 +10,14 @@ namespace EnvelopeGenerator.Domain.Entities
         [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")]

EnvelopeGenerator.Domain/EnvelopeGenerator.Domain.csproj

@@ -7,16 +7,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\EnvelopeGenerator.Common\EnvelopeGenerator.Common.vbproj" />
+    <PackageReference Include="DigitalData.EmailProfilerDispatcher.Abstraction" Version="1.0.0" />
+    <PackageReference Include="UserManager.Domain" Version="1.0.0" />
   </ItemGroup>
 
   <ItemGroup>
-    <Reference Include="DigitalData.Core.Domain">
-      <HintPath>..\..\WebCoreModules\DigitalData.Core.Domain\bin\Debug\net7.0\DigitalData.Core.Domain.dll</HintPath>
-    </Reference>
-    <Reference Include="DigitalData.UserManager.Domain">
-      <HintPath>..\..\WebUserManager\DigitalData.UserManager.Domain\bin\Debug\net7.0\DigitalData.UserManager.Domain.dll</HintPath>
-    </Reference>
+    <ProjectReference Include="..\EnvelopeGenerator.Common\EnvelopeGenerator.Common.vbproj" />
   </ItemGroup>
 
 </Project>

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
@@ -164,7 +167,8 @@ Public Class EnvelopeEditorController
                 .Filepath = oFileInfoTemp.FullName,
                 .FileNameOriginal = oFileInfo.Name,
                 .Thumbnail = Thumbnail.GetThumbnailFromPDFFile(oTempFilePath),
-                .PageCount = Thumbnail.GetPageCount(oTempFilePath)
+                .PageCount = Thumbnail.GetPageCount(oTempFilePath),
+                .Byte_Data = ReadFile(pDocumentFilePath)
             }
 
             Return oDocument
@@ -174,7 +178,22 @@ Public Class EnvelopeEditorController
             Return Nothing
         End Try
     End Function
-
+    'Open file in to a filestream and read data in a byte array. 
+    Private Function ReadFile(ByVal sPath As String) As Byte()
+        'Initialize byte array with a null value initially. 
+        Dim data As Byte() = Nothing
+        'Use FileInfo object to get file size. 
+        Dim fInfo As New FileInfo(sPath)
+        Dim numBytes As Long = fInfo.Length
+        'Open FileStream to read file 
+        Dim fStream As New FileStream(sPath, FileMode.Open, FileAccess.Read)
+        'Use BinaryReader to read file stream into byte array. 
+        Dim br As New BinaryReader(fStream)
+        'When you use BinaryReader, you need to supply number of bytes to read from file. 
+        'In this case we want to read entire file. So supplying total number of bytes. 
+        data = br.ReadBytes(CInt(numBytes))
+        Return data
+    End Function
     Public Function CreateThumbnail(pDocumentPath As String) As Bitmap
         Try
             Dim oThumbNail As Bitmap = Thumbnail.GetThumbnailFromPDFFile(pDocumentPath)

EnvelopeGenerator.Form/EnvelopeGenerator.Form.vbproj

@@ -84,6 +84,10 @@
     <Reference Include="DigitalData.Modules.Logging">
       <HintPath>..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.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">
       <HintPath>D:\ProgramFiles\GdPicture.NET 14\Redist\GdPicture.NET (.NET Framework 4.5)\GdPicture.NET.14.dll</HintPath>
     </Reference>
@@ -179,9 +183,11 @@
     </EmbeddedResource>
     <EmbeddedResource Include="frmEnvelopeEditor.resx">
       <DependentUpon>frmEnvelopeEditor.vb</DependentUpon>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
     <EmbeddedResource Include="frmEnvelopeMainData.en.resx">
       <DependentUpon>frmEnvelopeMainData.vb</DependentUpon>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
     <EmbeddedResource Include="frmEnvelopeMainData.resx">
       <DependentUpon>frmEnvelopeMainData.vb</DependentUpon>
@@ -246,7 +252,7 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\EnvelopeGenerator.Common\EnvelopeGenerator.Common.vbproj">
-      <Project>{6ea0c51f-c2b1-4462-8198-3de0b32b74f8}</Project>
+      <Project>{6EA0C51F-C2B1-4462-8198-3DE0B32B74F8}</Project>
       <Name>EnvelopeGenerator.Common</Name>
     </ProjectReference>
   </ItemGroup>

EnvelopeGenerator.Form/ModuleSettings.vb

@@ -1,8 +1,10 @@
-Imports DigitalData.Modules.Logging
+Imports DigitalData.Modules.Database
+Imports DigitalData.Modules.Logging
 
 Module ModuleSettings
     Public DOCUMENT_PATH_MOVE_AFTSEND As String = ""
     Public CurrLogConfig As LogConfig
     Public Directory2Delete As String = ""
     Public MS_GDPICTUREKEY As String = ""
+    Public DB_DD_ECM As MSSQLServer = Nothing
 End Module

EnvelopeGenerator.Form/frmEnvelopeEditor.Designer.vb

@@ -57,6 +57,7 @@ Partial Public Class frmEnvelopeEditor
         Me.txtEnvelopeIdLabel2 = New DevExpress.XtraBars.BarStaticItem()
         Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem()
         Me.BarStaticItem1 = New DevExpress.XtraBars.BarStaticItem()
+        Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem()
         Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage()
         Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
         Me.RibbonPageGroupDocuments = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
@@ -239,9 +240,9 @@ Partial Public Class frmEnvelopeEditor
         'RibbonControl1
         '
         Me.RibbonControl1.ExpandCollapseItem.Id = 0
-        Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.btnSave, Me.btnCancel, Me.btnNewFile, Me.btnDeleteFile, Me.btnSendEnvelope, Me.btnEditFields, Me.btnDeleteReceiver, Me.btnEditData, Me.txtCreatorEmailLabel, Me.txtEnvelopeIdLabel2, Me.BarButtonItem1, Me.BarStaticItem1})
+        Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.btnSave, Me.btnCancel, Me.btnNewFile, Me.btnDeleteFile, Me.btnSendEnvelope, Me.btnEditFields, Me.btnDeleteReceiver, Me.btnEditData, Me.txtCreatorEmailLabel, Me.txtEnvelopeIdLabel2, Me.BarButtonItem1, Me.BarStaticItem1, Me.BarButtonItem2})
         resources.ApplyResources(Me.RibbonControl1, "RibbonControl1")
-        Me.RibbonControl1.MaxItemId = 14
+        Me.RibbonControl1.MaxItemId = 15
         Me.RibbonControl1.Name = "RibbonControl1"
         Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1})
         Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False]
@@ -335,6 +336,12 @@ Partial Public Class frmEnvelopeEditor
         Me.BarStaticItem1.Id = 13
         Me.BarStaticItem1.Name = "BarStaticItem1"
         '
+        'BarButtonItem2
+        '
+        resources.ApplyResources(Me.BarButtonItem2, "BarButtonItem2")
+        Me.BarButtonItem2.Id = 14
+        Me.BarButtonItem2.Name = "BarButtonItem2"
+        '
         'RibbonPage1
         '
         Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroupDocuments, Me.RibbonPageGroupInvitation, Me.RibbonPageGroupAddSignature, Me.RibbonPageGroupReceiver})
@@ -391,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, 530)
+        Me.LayoutControlGroup4.Size = New System.Drawing.Size(251, 526)
         Me.LayoutControlGroup4.TextVisible = False
         '
         'LayoutControlGroup5
@@ -399,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, 530)
+        Me.LayoutControlGroup5.Size = New System.Drawing.Size(251, 526)
         resources.ApplyResources(Me.LayoutControlGroup5, "LayoutControlGroup5")
         '
         'LayoutControlItem5
@@ -407,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, 485)
+        Me.LayoutControlItem5.Size = New System.Drawing.Size(227, 477)
         Me.LayoutControlItem5.TextSize = New System.Drawing.Size(0, 0)
         Me.LayoutControlItem5.TextVisible = False
         '
@@ -571,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, 204)
+        Me.LayoutControlItem2.Size = New System.Drawing.Size(875, 200)
         Me.LayoutControlItem2.TextSize = New System.Drawing.Size(0, 0)
         Me.LayoutControlItem2.TextVisible = False
         '
@@ -604,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, 263)
+        Me.Root.Size = New System.Drawing.Size(899, 259)
         Me.Root.TextVisible = False
         '
         'LayoutControlGroup1
@@ -613,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, 263)
+        Me.LayoutControlGroup1.Size = New System.Drawing.Size(899, 259)
         resources.ApplyResources(Me.LayoutControlGroup1, "LayoutControlGroup1")
         '
         'LayoutControlItem3
@@ -622,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, 216)
+        Me.LayoutControlItem3.Size = New System.Drawing.Size(873, 208)
         resources.ApplyResources(Me.LayoutControlItem3, "LayoutControlItem3")
         Me.LayoutControlItem3.TextLocation = DevExpress.Utils.Locations.Top
         Me.LayoutControlItem3.TextSize = New System.Drawing.Size(49, 13)
@@ -775,6 +782,7 @@ Partial Public Class frmEnvelopeEditor
     Friend WithEvents colPageCount As DevExpress.XtraGrid.Columns.TileViewColumn
     Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem
     Friend WithEvents BarStaticItem1 As DevExpress.XtraBars.BarStaticItem
+    Friend WithEvents BarButtonItem2 As DevExpress.XtraBars.BarButtonItem
 
 #End Region
 

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, 35</value>
+    <value>14, 39</value>
   </data>
   <data name="colFilename.Caption" xml:space="preserve">
     <value>Dateiname</value>
@@ -322,7 +322,7 @@
 </value>
   </data>
   <data name="btnEditData.Caption" xml:space="preserve">
-    <value>Bearbeite Daten</value>
+    <value>Titel und Typ</value>
   </data>
   <data name="btnEditData.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
@@ -411,6 +411,9 @@
   <data name="BarButtonItem1.Caption" xml:space="preserve">
     <value>BarButtonItem1</value>
   </data>
+  <data name="BarButtonItem2.Caption" xml:space="preserve">
+    <value>Öffnen</value>
+  </data>
   <data name="RibbonControl1.Location" type="System.Drawing.Point, System.Drawing">
     <value>0, 0</value>
   </data>
@@ -436,10 +439,10 @@
     <value>1164, 132</value>
   </data>
   <data name="RibbonStatusBar1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 662</value>
+    <value>0, 658</value>
   </data>
   <data name="RibbonStatusBar1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1164, 22</value>
+    <value>1164, 26</value>
   </data>
   <data name="&gt;&gt;RibbonStatusBar1.Name" xml:space="preserve">
     <value>RibbonStatusBar1</value>
@@ -466,7 +469,7 @@
     <value>2</value>
   </data>
   <data name="GridDocuments.Size" type="System.Drawing.Size, System.Drawing">
-    <value>223, 481</value>
+    <value>223, 473</value>
   </data>
   <data name="GridDocuments.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
@@ -493,7 +496,7 @@
     <value>Ihre Dokumente</value>
   </data>
   <data name="LayoutControl3.Size" type="System.Drawing.Size, System.Drawing">
-    <value>251, 530</value>
+    <value>251, 526</value>
   </data>
   <data name="LayoutControl3.TabIndex" type="System.Int32, mscorlib">
     <value>1</value>
@@ -535,10 +538,10 @@
     <value>0, 0</value>
   </data>
   <metadata name="EnvelopeReceiverBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>338, 17</value>
+    <value>334, 17</value>
   </metadata>
   <data name="GridReceivers.Location" type="System.Drawing.Point, System.Drawing">
-    <value>14, 35</value>
+    <value>14, 39</value>
   </data>
   <data name="colColor.Caption" xml:space="preserve">
     <value> </value>
@@ -632,7 +635,7 @@
     <value>Combo</value>
   </data>
   <data name="GridReceivers.Size" type="System.Drawing.Size, System.Drawing">
-    <value>871, 200</value>
+    <value>871, 196</value>
   </data>
   <data name="GridReceivers.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
@@ -725,13 +728,13 @@
     <value>0</value>
   </data>
   <data name="txtMessage.Location" type="System.Drawing.Point, System.Drawing">
-    <value>23, 60</value>
+    <value>23, 64</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, 180</value>
+    <value>853, 172</value>
   </data>
   <data name="txtMessage.TabIndex" type="System.Int32, mscorlib">
     <value>2</value>
@@ -761,7 +764,7 @@
     <value>Ihre Nachricht</value>
   </data>
   <data name="LayoutControl1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>899, 263</value>
+    <value>899, 259</value>
   </data>
   <data name="LayoutControl1.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
@@ -791,7 +794,7 @@
     <value>0, 0, 0, 0</value>
   </data>
   <data name="PanelControl2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>903, 267</value>
+    <value>903, 263</value>
   </data>
   <data name="PanelControl2.TabIndex" type="System.Int32, mscorlib">
     <value>1</value>
@@ -824,7 +827,7 @@
     <value>1</value>
   </data>
   <data name="SplitContainerControl2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>903, 530</value>
+    <value>903, 526</value>
   </data>
   <data name="SplitContainerControl2.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
@@ -857,7 +860,7 @@
     <value>1</value>
   </data>
   <data name="SplitContainerControl1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1164, 530</value>
+    <value>1164, 526</value>
   </data>
   <data name="SplitContainerControl1.TabIndex" type="System.Int32, mscorlib">
     <value>1</value>
@@ -875,13 +878,13 @@
     <value>0</value>
   </data>
   <metadata name="FrmEditorBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>801, 17</value>
+    <value>792, 17</value>
   </metadata>
   <metadata name="EnvelopeDocumentBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>564, 17</value>
+    <value>557, 17</value>
   </metadata>
   <metadata name="OpenFileDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>196, 17</value>
+    <value>193, 17</value>
   </metadata>
   <data name="OpenFileDialog1.Filter" xml:space="preserve">
     <value>PDF Files|*.pdf</value>
@@ -1049,6 +1052,12 @@
   <data name="&gt;&gt;BarStaticItem1.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;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>

EnvelopeGenerator.Form/frmEnvelopeEditor.vb

@@ -1,6 +1,8 @@
 Imports System.ComponentModel
+Imports System.Data.SqlClient
 Imports System.IO
 Imports DevExpress.Export.Xl
+Imports DevExpress.Utils.CommonDialogs
 Imports DevExpress.Utils.Drawing
 Imports DevExpress.XtraEditors
 Imports DevExpress.XtraExport.Helpers
@@ -35,33 +37,38 @@ Partial Public Class frmEnvelopeEditor
 
     Private Async Sub btnNewFile_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnNewFile.ItemClick
         Dim oHandle = SplashScreenManager.ShowOverlayForm(Me)
-
+        'SaveEnvelopeWithValidation()
+        ' If Not IsNothing(Envelope) Then
         Try
-            ' prüfen ob es schon eine Datei gibt
-            If Documents.Count > 0 Then
-                MsgBox(Resources.Envelope.Only_one_file_is_allowed, MsgBoxStyle.Information, Text)
-                Return
-            End If
-
-            If OpenFileDialog1.ShowDialog() = DialogResult.OK Then
-                Dim oDocument = Await Controller.CreateDocument(OpenFileDialog1.FileName)
-
-                If oDocument IsNot Nothing Then
-                    Documents.Add(oDocument)
-                Else
-                    MsgBox(Resources.Envelope.Document_Could_Not_Be_Saved, MsgBoxStyle.Critical, Text)
+                ' prüfen ob es schon eine Datei gibt
+                If Documents.Count > 0 Then
+                    MsgBox(Resources.Envelope.Only_one_file_is_allowed, MsgBoxStyle.Information, Text)
+                    Return
                 End If
-            End If
 
-        Catch ex As Exception
-            Logger.Error(ex)
-        Finally
-            SplashScreenManager.CloseOverlayForm(oHandle)
+                If OpenFileDialog1.ShowDialog() = DialogResult.OK Then
+                    Dim oDocument = Await Controller.CreateDocument(OpenFileDialog1.FileName)
+
+                    If oDocument IsNot Nothing Then
+                        Documents.Add(oDocument)
+                        ' Update_File_DB(OpenFileDialog1.FileName)
+                    Else
+                        MsgBox(Resources.Envelope.Document_Could_Not_Be_Saved, MsgBoxStyle.Critical, Text)
+                    End If
+                End If
+
+            Catch ex As Exception
+                Logger.Error(ex)
+            Finally
+                SplashScreenManager.CloseOverlayForm(oHandle)
+
+                RibbonPageGroupAddSignature_Enabled()
+            End Try
+        ' Else
+        ' SplashScreenManager.CloseOverlayForm(oHandle)
+        ' End If
 
-            RibbonPageGroupAddSignature_Enabled()
-        End Try
     End Sub
-
     Private Sub frmEditor_Load(sender As Object, e As EventArgs) Handles Me.Load
         Logger = State.LogConfig.GetLogger()
         Logger.Debug("Loading Configuration..")
@@ -471,24 +478,26 @@ Partial Public Class frmEnvelopeEditor
         SendEnvelopeButton_Enable()
         RibbonPageGroupAddSignature_Enabled()
     End Sub
-
+    Dim CellValueChanged As Boolean = False
     Private Sub ViewReceivers_CellValueChanged(sender As Object, e As Views.Base.CellValueChangedEventArgs) Handles ViewReceivers.CellValueChanged
-        If e.Column.FieldName = COL_EMAIL Then
+        If e.Column.FieldName = COL_EMAIL And CellValueChanged = False Then
             If e.Value Is Nothing Then
                 ' Keine E-Mail-Adresse, also weg damit
                 ViewReceivers.DeleteRow(ViewReceivers.FocusedRowHandle)
             Else
                 ' Doppelte E-Mail-Adresse? TODO
                 'Dim oReceivers = Controller.Envelope.Receivers
-
+                CellValueChanged = True
                 Dim oNameCellValue = ViewReceivers.GetRowCellValue(e.RowHandle, COL_NAME)
                 If oNameCellValue Is Nothing Then
-                    Dim oEmailAdress As String = DirectCast(e.Value, String)
+                    Dim oEmailAdress As String = DirectCast(e.Value.ToString.ToLower, String)
+
                     Dim oLastName As String = Controller.GetLastNameByEmailAdress(oEmailAdress)
                     Dim oAccessCode As String = Helpers.GetAccessCode()
-
+                    ViewReceivers.SetRowCellValue(e.RowHandle, ViewReceivers.Columns.Item(COL_EMAIL), oEmailAdress)
                     ViewReceivers.SetRowCellValue(e.RowHandle, ViewReceivers.Columns.Item(COL_NAME), oLastName)
                     ViewReceivers.SetRowCellValue(e.RowHandle, ViewReceivers.Columns.Item(COL_CODE), oAccessCode)
+                    CellValueChanged = False
                 End If
             End If
         End If
@@ -497,4 +506,6 @@ Partial Public Class frmEnvelopeEditor
     Private Sub RibbonControl1_Click(sender As Object, e As EventArgs) Handles RibbonControl1.Click
 
     End Sub
+
+
 End Class

EnvelopeGenerator.Form/frmEnvelopeMainData.vb

@@ -94,10 +94,12 @@ Public Class frmEnvelopeMainData
         End If
 
         Dim oEnvelopeType = DirectCast(cmbEnvelopeType.EditValue, EnvelopeType)
-
+        If IsNothing(oEnvelopeType) Then
+            oEnvelopeType = EnvelopeType
+        End If
         Envelope.Title = txtTitle.EditValue.ToString
         Envelope.EnvelopeType = oEnvelopeType
-        Envelope.EnvelopeTypeId = oEnvelopeType.Id
+        Envelope.EnvelopeTypeId = IIf(IsNothing(oEnvelopeType), 0, oEnvelopeType.Id)
         Envelope.CertificationType = cmbCertificationType.SelectedIndex + 1
         Envelope.Language = cmbLanguage.EditValue
         Envelope.UseAccessCode = chkUseAccessCode.EditValue

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,7 @@ 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.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage()
         Me.RibbonPageEnvelopeActions = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
         Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
@@ -83,13 +84,16 @@ Partial Class frmMain
         Me.GridColumn5 = New DevExpress.XtraGrid.Columns.GridColumn()
         Me.GridColumn7 = New DevExpress.XtraGrid.Columns.GridColumn()
         Me.RefreshTimer = New System.Windows.Forms.Timer(Me.components)
+        Me.SaveFileDialog1 = New System.Windows.Forms.SaveFileDialog()
+        Me.bbtnitmInfoMail = New DevExpress.XtraBars.BarButtonItem()
+        Me.BarButtonItem2 = 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()
@@ -117,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
@@ -125,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
         '
@@ -288,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.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 = 14
+        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]
@@ -398,6 +402,14 @@ 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"
+        '
         'RibbonPage1
         '
         Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageEnvelopeActions, Me.RibbonPageGroup1, Me.RibbonPageGroup2})
@@ -423,6 +435,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")
         '
@@ -581,6 +596,24 @@ Partial Class frmMain
         '
         Me.RefreshTimer.Interval = 120000
         '
+        'SaveFileDialog1
+        '
+        resources.ApplyResources(Me.SaveFileDialog1, "SaveFileDialog1")
+        '
+        'bbtnitmInfoMail
+        '
+        resources.ApplyResources(Me.bbtnitmInfoMail, "bbtnitmInfoMail")
+        Me.bbtnitmInfoMail.Id = 15
+        Me.bbtnitmInfoMail.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem2.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.SvgImage1"), DevExpress.Utils.Svg.SvgImage)
+        Me.BarButtonItem2.Name = "BarButtonItem2"
+        '
         'frmMain
         '
         resources.ApplyResources(Me, "$this")
@@ -597,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()
@@ -632,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
@@ -672,4 +705,8 @@ Partial Class frmMain
     Friend WithEvents colAccessCode As DevExpress.XtraGrid.Columns.GridColumn
     Friend WithEvents BarCheckItem1 As DevExpress.XtraBars.BarCheckItem
     Friend WithEvents bsitmInfo As DevExpress.XtraBars.BarStaticItem
+    Friend WithEvents SaveFileDialog1 As SaveFileDialog
+    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

@@ -125,10 +125,10 @@
   <data name="SplitContainerControl1.Location" type="System.Drawing.Point, System.Drawing">
     <value>0, 162</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">
@@ -679,6 +679,80 @@
         2l5bAl4RwcXCFfsR4Xefb9NSVVK1Cd1LkRF6v9XyxLeaHtij7ty3R92pQ2GfVdg/v1T/jtb+gcD7/Q6B
         A3mJnKFyyJmGNmy/hqecqqbHT0D2qhCuYE4nHyWO7o8b4D6P8T7zGl67RbznkIucwEFnQaxy0ElO+YAT
         Tf3vtimEjyo75pQyyYvgMZ7jNQxe/wsmJ/df0Zh/vpjXMzsAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="bbtnitmEB.Caption" xml:space="preserve">
+    <value>Ergebnisbericht anzeigen</value>
+  </data>
+  <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
+        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAJYEAAAC77u/
+        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
+        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
+        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
+        Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
+        MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlllbGxvd3tmaWxsOiNGRkIxMTU7fQoJ
+        LlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5HcmVlbntmaWxsOiMwMzlD
+        MjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh
+        Y2l0eTowLjc1O30KPC9zdHlsZT4NCiAgPGcgaWQ9IkRvY3VtZW50UERGIj4NCiAgICA8cGF0aCBkPSJN
+        MjIsMjR2NEgyVjJoMTR2NWMwLDAuNiwwLjQsMSwxLDFoNXY0aDJWN2wtNy03SDFDMC40LDAsMCwwLjQs
+        MCwxdjI4YzAsMC42LDAuNCwxLDEsMWgyMmMwLjYsMCwxLTAuNCwxLTEgICB2LTVIMjJ6IiBjbGFzcz0i
+        QmxhY2siIC8+DQogICAgPHBhdGggZD0iTTE5LjIsMTZjMC4zLDAuNSwwLjQsMS4xLDAuNCwxLjljMCww
+        LjktMC4yLDEuNS0wLjUsMmMtMC4zLDAuNS0wLjcsMC43LTEuMywwLjdoLTAuNnYtNS4zaDAuNiAgIEMx
+        OC40LDE1LjMsMTguOSwxNS42LDE5LjIsMTZ6IE0xMi4xLDE1LjNoLTAuNXYyLjZoMC41YzAuNywwLDEu
+        MS0wLjQsMS4xLTEuM2MwLTAuNC0wLjEtMC44LTAuMy0xQzEyLjYsMTUuNCwxMi40LDE1LjMsMTIuMSwx
+        NS4zeiAgICBNMzAsMTJ2MTJINlYxMkgzMHogTTE0LjgsMTYuNWMwLTAuOC0wLjItMS41LTAuNi0xLjlj
+        LTAuNC0wLjQtMS0wLjctMS44LTAuN0gxMHY4aDEuNnYtMi43aDAuNmMwLjgsMCwxLjQtMC4zLDEuOS0w
+        LjggICBDMTQuNSwxOCwxNC44LDE3LjMsMTQuOCwxNi41eiBNMjEuMiwxNy45YzAtMi42LTEuMS0zLjkt
+        My40LTMuOWgtMi4xdjhoMi4yYzEuMSwwLDEuOS0wLjQsMi41LTEuMUMyMC45LDIwLjIsMjEuMiwxOS4y
+        LDIxLjIsMTcuOXogICAgTTI2LDE0aC0zLjd2OGgxLjZ2LTMuMWgydi0xLjNoLTJ2LTIuMkgyNlYxNHoi
+        IGNsYXNzPSJSZWQiIC8+DQogIDwvZz4NCjwvc3ZnPgs=
+</value>
+  </data>
+  <data name="bbtnitmInfoMail.Caption" xml:space="preserve">
+    <value>Support Mail</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="BarButtonItem2.Caption" xml:space="preserve">
+    <value>BarButtonItem2</value>
+  </data>
+  <data name="BarButtonItem2.ImageOptions.SvgImage1" 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">
@@ -706,10 +780,10 @@
     <value>1090, 162</value>
   </data>
   <data name="RibbonStatusBar.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 660</value>
+    <value>0, 656</value>
   </data>
   <data name="RibbonStatusBar.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1090, 22</value>
+    <value>1090, 26</value>
   </data>
   <data name="&gt;&gt;RibbonStatusBar.Name" xml:space="preserve">
     <value>RibbonStatusBar</value>
@@ -736,7 +810,7 @@
     <value>2</value>
   </data>
   <data name="GridEnvelopes.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1088, 459</value>
+    <value>1088, 455</value>
   </data>
   <data name="GridEnvelopes.TabIndex" type="System.Int32, mscorlib">
     <value>2</value>
@@ -754,7 +828,7 @@
     <value>0</value>
   </data>
   <data name="XtraTabPage1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1088, 459</value>
+    <value>1088, 455</value>
   </data>
   <data name="XtraTabPage1.Text" xml:space="preserve">
     <value>Offene Umschläge</value>
@@ -766,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, 488</value>
+  <data name="XtraTabControlMain.Size" type="System.Drawing.Size, System.Drawing">
+    <value>1090, 484</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">
@@ -916,7 +990,7 @@
     <value>195</value>
   </data>
   <data name="GridCompleted.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1086, 466</value>
+    <value>1088, 455</value>
   </data>
   <data name="GridCompleted.TabIndex" type="System.Int32, mscorlib">
     <value>3</value>
@@ -934,7 +1008,7 @@
     <value>0</value>
   </data>
   <data name="XtraTabPage2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1086, 466</value>
+    <value>1088, 455</value>
   </data>
   <data name="XtraTabPage2.Text" xml:space="preserve">
     <value>Abgeschlossene Umschläge</value>
@@ -946,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">
@@ -994,7 +1068,7 @@
     <value>1</value>
   </data>
   <data name="SplitContainerControl1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1090, 498</value>
+    <value>1090, 494</value>
   </data>
   <data name="SplitContainerControl1.TabIndex" type="System.Int32, mscorlib">
     <value>5</value>
@@ -1014,6 +1088,12 @@
   <metadata name="RefreshTimer.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>193, 17</value>
   </metadata>
+  <metadata name="SaveFileDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>316, 17</value>
+  </metadata>
+  <data name="SaveFileDialog1.Filter" xml:space="preserve">
+    <value>PDF Files|*.pdf</value>
+  </data>
   <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
@@ -1283,6 +1363,12 @@
   <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;RibbonPage1.Name" xml:space="preserve">
     <value>RibbonPage1</value>
   </data>
@@ -1409,6 +1495,24 @@
   <data name="&gt;&gt;RefreshTimer.Type" xml:space="preserve">
     <value>System.Windows.Forms.Timer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
+  <data name="&gt;&gt;SaveFileDialog1.Name" xml:space="preserve">
+    <value>SaveFileDialog1</value>
+  </data>
+  <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;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;$this.Name" xml:space="preserve">
     <value>frmMain</value>
   </data>

EnvelopeGenerator.Form/frmMain.vb

@@ -1,4 +1,5 @@
-Imports DevExpress.LookAndFeel
+Imports System.IO
+Imports DevExpress.LookAndFeel
 Imports DevExpress.Utils.Extensions
 Imports DevExpress.XtraCharts
 Imports DevExpress.XtraGrid
@@ -9,6 +10,7 @@ Imports DigitalData.Modules.Base
 Imports DigitalData.Modules.Logging
 Imports EnvelopeGenerator.Common
 Imports EnvelopeGenerator.Common.My
+Imports System.Diagnostics
 
 Public Class frmMain
     Private ReadOnly LogConfig As LogConfig
@@ -19,6 +21,8 @@ Public Class frmMain
 
     Private State As State
     Private Controller As EnvelopeListController
+    Private myFileData As Byte()
+    Private myResFileData As Byte()
 
     Public Sub New(pState As State)
         ' Dieser Aufruf ist für den Designer erforderlich.
@@ -52,8 +56,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()
@@ -180,18 +188,22 @@ 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()
         End Select
     End Sub
 
@@ -214,9 +226,44 @@ Public Class frmMain
             btnEditEnvelope.Enabled = True
         End If
     End Sub
+    Private Sub bbtnitmEB_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles bbtnitmEB.ItemClick
+        Try
+            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 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
+            'If File.Exists(oTempFilename) Then
+            '    oVersion += 1
+            '    oTempFilename = String.Concat(oTempFolder, "\", $"ViewEnvResReport_{oEnvelope.Id}_", oVersion.ToString, ".pdf")
+            '    Try
+            '        File.OpenWrite(oTempFilename)
+            '    Catch ex As Exception
+            '        MsgBox("File might already be open?", MsgBoxStyle.Exclamation)
+            '        Exit Sub
+            '    End Try
 
+
+            '    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 Then
+        If e.RowHandle < 0 Or XtraTabControlMain.SelectedTabPageIndex = 1 Then
             Exit Sub
         End If
 
@@ -311,33 +358,118 @@ Public Class frmMain
     End Sub
 
     Private Sub btnShowDocument_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnShowDocument.ItemClick
-        If ViewEnvelopes.FocusedRowHandle < 0 Then
-            Exit Sub
-        End If
-
-        Dim oEnvelope As Envelope = ViewEnvelopes.GetRow(ViewEnvelopes.FocusedRowHandle)
-        Dim oDocument = oEnvelope.Documents.FirstOrDefault()
-
-        If oDocument Is Nothing Then
-            MsgBox(Resources.Envelope.The_envelope_does_not_contain_any_documents, MsgBoxStyle.Exclamation, Text)
-            Exit Sub
-        End If
-
         Try
-            Process.Start(oDocument.Filepath)
+            If ViewEnvelopes.FocusedRowHandle < 0 Then
+                Exit Sub
+            End If
+            Me.Cursor = Cursors.WaitCursor
+            Dim oEnvelope As Envelope = ViewEnvelopes.GetRow(ViewEnvelopes.FocusedRowHandle)
+            Dim oDocument = oEnvelope.Documents.FirstOrDefault()
+            If oDocument Is Nothing Then
+                MsgBox(Resources.Envelope.The_envelope_does_not_contain_any_documents, MsgBoxStyle.Exclamation, Text)
+                Me.Cursor = Cursors.Default
+                Exit Sub
+            Else
+                If Not IsNothing(oDocument.Byte_Data) Then
+                    Dim oTempFolder = TempFiles.TempPath
+                    Dim oTempFilename = String.Concat(oTempFolder, "\", $"ViewEnvDoc_{oEnvelope.Id}.pdf")
+                    If File.Exists(oTempFilename) Then
+                        Try
+                            File.OpenWrite(oTempFilename)
+                        Catch ex As Exception
+                            MsgBox("File might already be open?", MsgBoxStyle.Exclamation)
+                            Me.Cursor = Cursors.Default
+                            Exit Sub
+                        End Try
+
+
+                        File.Delete(oTempFilename)
+                    End If
+                    downloadFile(oTempFilename, oDocument.Byte_Data)
+                End If
+            End If
         Catch ex As Exception
             MsgBox(Resources.Envelope.Document_could_not_be_opened, MsgBoxStyle.Critical, Text)
-            Logger.Error(ex)
+        Logger.Error(ex)
+        End Try
+        Me.Cursor = Cursors.Default
+    End Sub
+    Private Sub GetResRepFileStreamByte(ByVal pEnvID As Long)
+
+        Dim strSql As String
+        'For Document
+        Try
+            'Get image data from gridview column. 
+            strSql = "Select [DOC_RESULT] from [TBSIG_ENVELOPE] WHERE GUID = " & pEnvID
+            Dim obyteDB = DB_DD_ECM.GetScalarValue(strSql)
+            If Not IsDBNull(obyteDB) Then
+                'Get image data from DB
+                Dim fileData As Byte() = DirectCast(DB_DD_ECM.GetScalarValue(strSql), Byte())
+                If Not fileData Is Nothing Then
+                    myResFileData = fileData
+                Else
+                    myResFileData = Nothing
+                End If
+            Else
+                myResFileData = Nothing
+            End If
+
+
+        Catch ex As Exception
+            MsgBox(ex.Message, MsgBoxStyle.Exclamation, "Error in GetResRepFileStreamByte")
+            myResFileData = Nothing
+        End Try
+
+    End Sub
+    Private Sub downloadFile(ByVal sFileName As String, pByte As Byte())
+
+        'For Document
+        Try
+            If Not pByte Is Nothing Then
+                'Read image data into a file stream 
+                Using fs As New FileStream(sFileName, FileMode.OpenOrCreate, FileAccess.Write)
+                    fs.Write(pByte, 0, pByte.Length)
+                    'Set image variable value using memory stream. 
+                    fs.Flush()
+                    fs.Close()
+                End Using
+                'Open File
+                Process.Start(sFileName)
+            End If
+        Catch ex As Exception
+            MsgBox(ex.Message, MsgBoxStyle.Exclamation, "Error in downloadFile")
+        End Try
+    End Sub
+    Private Sub downloadResFile(ByVal sFileName As String)
+        Try
+            If Not myResFileData Is Nothing Then
+                'Read image data into a file stream 
+                Using fs As New FileStream(sFileName, FileMode.OpenOrCreate, FileAccess.Write)
+                    fs.Write(myResFileData, 0, myResFileData.Length)
+                    'Set image variable value using memory stream. 
+                    fs.Flush()
+                    fs.Close()
+                End Using
+                'Open File
+                Process.Start(sFileName)
+            Else
+                MsgBox("Could not get DocData from Database!", MsgBoxStyle.Exclamation, "Error in downloadResFile")
+            End If
+        Catch ex As Exception
+            MsgBox(ex.Message, MsgBoxStyle.Exclamation, "Error in downloadResFile")
         End Try
     End Sub
-
     Private Sub ViewCompleted_FocusedRowChanged(sender As Object, e As Views.Base.FocusedRowChangedEventArgs) Handles ViewCompleted.FocusedRowChanged
         If ViewCompleted.FocusedRowHandle < 0 Then
             Exit Sub
         End If
 
         Dim oEnvelope As Envelope = ViewCompleted.GetRow(ViewCompleted.FocusedRowHandle)
-
+        If oEnvelope.Status = Common.Constants.EnvelopeStatus.EnvelopeArchived Then
+            bbtnitmEB.Enabled = True
+        Else
+            bbtnitmEB.Enabled = False
+        End If
         txtEnvelopeIdLabel.Caption = String.Format(txtEnvelopeIdLabel.Tag, oEnvelope.Id)
     End Sub
 
@@ -368,6 +500,54 @@ Public Class frmMain
         Else
             BarCheckItem1.Checked = False
         End If
+        bbtnitmEB.Enabled = False
         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
+
+    End Sub
 End Class

EnvelopeGenerator.Form/frmRueckruf.Designer.vb

@@ -22,6 +22,7 @@ Partial Class frmRueckruf
     'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
     <System.Diagnostics.DebuggerStepThrough()> _
     Private Sub InitializeComponent()
+        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmRueckruf))
         Me.Label2 = New System.Windows.Forms.Label()
         Me.txtReason = New System.Windows.Forms.TextBox()
         Me.btnWeiter = New System.Windows.Forms.Button()
@@ -38,9 +39,9 @@ Partial Class frmRueckruf
         Me.Label2.Location = New System.Drawing.Point(22, 20)
         Me.Label2.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
         Me.Label2.Name = "Label2"
-        Me.Label2.Size = New System.Drawing.Size(432, 16)
+        Me.Label2.Size = New System.Drawing.Size(380, 16)
         Me.Label2.TabIndex = 0
-        Me.Label2.Text = "Bitte geben Sie einen Grund für den Abbruch/Rückruf des Umschlages ein:"
+        Me.Label2.Text = "Bitte geben Sie einen Grund für den Rückruf des Umschlages ein:"
         '
         'txtReason
         '
@@ -58,7 +59,7 @@ Partial Class frmRueckruf
         Me.btnWeiter.Name = "btnWeiter"
         Me.btnWeiter.Size = New System.Drawing.Size(203, 44)
         Me.btnWeiter.TabIndex = 2
-        Me.btnWeiter.Text = "Weiter"
+        Me.btnWeiter.Text = "Umschlag zurückrufen"
         Me.btnWeiter.UseVisualStyleBackColor = True
         '
         'Label1
@@ -72,11 +73,13 @@ Partial Class frmRueckruf
         '
         'btnCancel
         '
+        Me.btnCancel.Image = CType(resources.GetObject("btnCancel.Image"), System.Drawing.Image)
+        Me.btnCancel.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
         Me.btnCancel.Location = New System.Drawing.Point(251, 134)
         Me.btnCancel.Name = "btnCancel"
         Me.btnCancel.Size = New System.Drawing.Size(203, 44)
         Me.btnCancel.TabIndex = 4
-        Me.btnCancel.Text = "Abbruch"
+        Me.btnCancel.Text = "Abbrechen"
         Me.btnCancel.UseVisualStyleBackColor = True
         '
         'StatusStrip1

EnvelopeGenerator.Form/frmRueckruf.resx

@@ -117,6 +117,19 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="btnCancel.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAFJSURBVDhPpVOhjoNQEOQT+gn9hPuEC56kFleBB41CYRs8
+        SSWyAg8aRULwh4OAwGHf7Sz7yuMCd+ImmfRlZ3cYeFsLWJblQnwSFXEmBiz8ANUj6dG8aSGoqko5jsNs
+        23YTCXS+Eussy5Rt26ooCuiRyNxQpmnKIuh5nhrHEUmQLMA5jmPW0Ee1l4yuQBMSaAMwSRI0zl3XsSFq
+        MKFaTbzI6AoUIOR5vjPB0/BKOBuprjK2x5kJCJNpmvD0T2k/BtyJHNU0gCnVn9J2DBk+TOC67p/xP4gz
+        Ppw5aH4D3/f5A8rIBj18Ers2b0Fu5iGjKxAtDMPdMBaGGvmu6feOHiQwjN9LZunt0jy6azoj5Rc0vFLT
+        NLxkLJoGp4tCQI1Yoh+v1Pd9ycIwDLzjEntzPgHpD/wXsLl0jrRzIPx1WIP67sQStJRS/6CyvgGjI/3S
+        /lGAOgAAAABJRU5ErkJggg==
+</value>
+  </data>
   <metadata name="StatusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>

EnvelopeGenerator.Form/frmSplashScreen.Designer.vb

@@ -46,10 +46,11 @@ Partial Class frmSplashScreen
         '
         Me.lblCopyright.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
         Me.lblCopyright.AutoSize = True
+        Me.lblCopyright.Font = New System.Drawing.Font("Tahoma", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.lblCopyright.Location = New System.Drawing.Point(137, 226)
         Me.lblCopyright.Name = "lblCopyright"
         Me.lblCopyright.RightToLeft = System.Windows.Forms.RightToLeft.No
-        Me.lblCopyright.Size = New System.Drawing.Size(68, 13)
+        Me.lblCopyright.Size = New System.Drawing.Size(82, 14)
         Me.lblCopyright.TabIndex = 9
         Me.lblCopyright.Tag = "Copyright {0}"
         Me.lblCopyright.Text = "Copyright {0}"
@@ -58,9 +59,10 @@ Partial Class frmSplashScreen
         '
         Me.lblVersion.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
         Me.lblVersion.AutoSize = True
+        Me.lblVersion.Font = New System.Drawing.Font("Tahoma", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.lblVersion.Location = New System.Drawing.Point(12, 226)
         Me.lblVersion.Name = "lblVersion"
-        Me.lblVersion.Size = New System.Drawing.Size(91, 13)
+        Me.lblVersion.Size = New System.Drawing.Size(111, 14)
         Me.lblVersion.TabIndex = 8
         Me.lblVersion.Tag = "Version {0}.{1:00}"
         Me.lblVersion.Text = "Version {0}.{1:00}"
@@ -78,10 +80,10 @@ Partial Class frmSplashScreen
         Me.lblStatus.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
         Me.lblStatus.AutoSize = True
         Me.lblStatus.BackColor = System.Drawing.SystemColors.Control
-        Me.lblStatus.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.lblStatus.Font = New System.Drawing.Font("Tahoma", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.lblStatus.Location = New System.Drawing.Point(12, 253)
         Me.lblStatus.Name = "lblStatus"
-        Me.lblStatus.Size = New System.Drawing.Size(47, 15)
+        Me.lblStatus.Size = New System.Drawing.Size(54, 14)
         Me.lblStatus.TabIndex = 7
         Me.lblStatus.Text = "{Status}"
         Me.lblStatus.TextAlign = System.Drawing.ContentAlignment.MiddleCenter

EnvelopeGenerator.Form/frmSplashScreen.resx

@@ -121,7 +121,7 @@
   <data name="PictureEdit1.EditValue" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAyAAAADICAYAAAAQj4UaAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL
-        EAAACxABrSO9dQAASudJREFUeF7tvWusZNd5nukfcpSOmmre3Wp2s3lrdpNUk01RPxIk6iBBIjFxMBPZ
+        DwAACw8BkvkDpQAASudJREFUeF7tvWusZNd5nukfcpSOmmre3Wp2s3lrdpNUk01RPxIk6iBBIjFxMBPZ
         DGxLEyB2M8ggkegAsSRElikHEsnBJFZrRjZtxZIpZaIZRy2AloGxrAHIRKIQRIqVGJ6AsJEAAwgDOzNJ
         HCBSLsqfynmq+HV9tepd+1KnLnufen88OKf2rfa67HPed3/rW+t7PnffoxNjjDHGGLNb/n4L/9t9l6b8
         vXsX+ewBn1ngkSkvCH79hy9NXr5yafKbz1yavHr10uRfv/jo5Pe//Ohk8uoMfmcb+ziGYznnc4/q663C

EnvelopeGenerator.Form/frmSplashScreen.vb

@@ -70,6 +70,8 @@ Public Class frmSplashScreen
 
         If oState.Database?.DBInitialized = False Then
             Throw New ApplicationException("Could not connect to the database. Application will close!")
+        Else
+            DB_DD_ECM = oState.Database
         End If
 
         Worker.ReportProgress(40, "Initialize Confguration")

EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/README.md

@@ -1,6 +1,6 @@
 # EnvelopeGeneratorUi
 
-This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 18.0.3.
+This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 17.3.8.
 
 ## Development server
 
@@ -24,4 +24,4 @@ Run `ng e2e` to execute the end-to-end tests via a platform of your choice. To u
 
 ## Further help
 
-To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI Overview and Command Reference](https://angular.dev/tools/cli) page.
+To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI Overview and Command Reference](https://angular.io/cli) page.

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

@@ -26,15 +26,19 @@
             "tsConfig": "tsconfig.app.json",
             "inlineStyleLanguage": "scss",
             "assets": [
-              {
-                "glob": "**/*",
-                "input": "public"
-              }
+              "src/favicon.ico",
+              "src/assets"
             ],
             "styles": [
-              "src/styles.scss"
+              "@angular/material/prebuilt-themes/indigo-pink.css",
+              "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": {
@@ -46,13 +50,13 @@
               "budgets": [
                 {
                   "type": "initial",
-                  "maximumWarning": "500kB",
-                  "maximumError": "1MB"
+                  "maximumWarning": "1.5mb",
+                  "maximumError": "2mb"
                 },
                 {
                   "type": "anyComponentStyle",
-                  "maximumWarning": "2kB",
-                  "maximumError": "4kB"
+                  "maximumWarning": "2kb",
+                  "maximumError": "4kb"
                 }
               ],
               "outputHashing": "all"
@@ -75,10 +79,16 @@
               "buildTarget": "envelope-generator-ui:build:development"
             }
           },
-          "defaultConfiguration": "development"
+          "defaultConfiguration": "development",
+          "options": {
+            "proxyConfig": "proxy.conf.json"
+          }
         },
         "extract-i18n": {
-          "builder": "@angular-devkit/build-angular:extract-i18n"
+          "builder": "@angular-devkit/build-angular:extract-i18n",
+          "options": {
+            "buildTarget": "envelope-generator-ui:build"
+          }
         },
         "test": {
           "builder": "@angular-devkit/build-angular:karma",
@@ -90,18 +100,23 @@
             "tsConfig": "tsconfig.spec.json",
             "inlineStyleLanguage": "scss",
             "assets": [
-              {
-                "glob": "**/*",
-                "input": "public"
-              }
+              "src/favicon.ico",
+              "src/assets"
             ],
             "styles": [
-              "src/styles.scss"
+              "@angular/material/prebuilt-themes/indigo-pink.css",
+              "src/styles.scss",
+              "node_modules/bootstrap/dist/css/bootstrap.min.css",
+              "src/styles.css"
             ],
-            "scripts": []
+            "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"
+            ]
           }
         }
       }
     }
   }
-}
+}

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",
@@ -11,28 +11,39 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "^18.0.0",
-    "@angular/common": "^18.0.0",
-    "@angular/compiler": "^18.0.0",
-    "@angular/core": "^18.0.0",
-    "@angular/forms": "^18.0.0",
-    "@angular/platform-browser": "^18.0.0",
-    "@angular/platform-browser-dynamic": "^18.0.0",
-    "@angular/platform-server": "^18.0.0",
-    "@angular/router": "^18.0.0",
-    "@angular/ssr": "^18.0.3",
+    "@angular/animations": "^17.3.0",
+    "@angular/cdk": "^17.3.10",
+    "@angular/common": "^17.3.0",
+    "@angular/compiler": "^17.3.0",
+    "@angular/core": "^17.3.0",
+    "@angular/forms": "^17.3.0",
+    "@angular/material": "^17.3.10",
+    "@angular/platform-browser": "^17.3.0",
+    "@angular/platform-browser-dynamic": "^17.3.0",
+    "@angular/platform-server": "^17.3.0",
+    "@angular/router": "^17.3.0",
+    "@angular/ssr": "^17.3.8",
+    "@generic-ui/fabric": "^0.21.0",
+    "@generic-ui/hermes": "^0.21.0",
+    "@generic-ui/ngx-grid": "^0.21.0",
+    "@ng-bootstrap/ng-bootstrap": "^16.0.0",
+    "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": {
-    "@angular-devkit/build-angular": "^18.0.3",
-    "@angular/cli": "^18.0.3",
-    "@angular/compiler-cli": "^18.0.0",
+    "@angular-devkit/build-angular": "^17.3.8",
+    "@angular/cli": "^17.3.8",
+    "@angular/compiler-cli": "^17.3.0",
+    "@angular/localize": "^17.3.0",
     "@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",
@@ -41,4 +52,4 @@
     "karma-jasmine-html-reporter": "~2.1.0",
     "typescript": "~5.4.2"
   }
-}
+}

EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/proxy.conf.json

@@ -0,0 +1,7 @@
+{
+    "/api": {
+        "target": "https://localhost:7174",
+        "secure": false,
+        "changeOrigin": true
+    }
+}

EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/server.ts

@@ -20,13 +20,12 @@ export function app(): express.Express {
   // Example Express Rest API endpoints
   // server.get('/api/**', (req, res) => { });
   // Serve static files from /browser
-  server.get('**', express.static(browserDistFolder, {
-    maxAge: '1y',
-    index: 'index.html',
+  server.get('*.*', express.static(browserDistFolder, {
+    maxAge: '1y'
   }));
 
   // All regular routes use the Angular engine
-  server.get('**', (req, res, next) => {
+  server.get('*', (req, res, next) => {
     const { protocol, originalUrl, baseUrl, headers } = req;
 
     commonEngine

EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/app.component.html

@@ -1,336 +1,4 @@
-<!-- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * -->
-<!-- * * * * * * * * * * * The content below * * * * * * * * * * * -->
-<!-- * * * * * * * * * * is only a placeholder * * * * * * * * * * -->
-<!-- * * * * * * * * * * and can be replaced.  * * * * * * * * * * -->
-<!-- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * -->
-<!-- * * * * * * * * * Delete the template below * * * * * * * * * -->
-<!-- * * * * * * * to get started with your project! * * * * * * * -->
-<!-- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * -->
-
-<style>
-  :host {
-    --bright-blue: oklch(51.01% 0.274 263.83);
-    --electric-violet: oklch(53.18% 0.28 296.97);
-    --french-violet: oklch(47.66% 0.246 305.88);
-    --vivid-pink: oklch(69.02% 0.277 332.77);
-    --hot-red: oklch(61.42% 0.238 15.34);
-    --orange-red: oklch(63.32% 0.24 31.68);
-
-    --gray-900: oklch(19.37% 0.006 300.98);
-    --gray-700: oklch(36.98% 0.014 302.71);
-    --gray-400: oklch(70.9% 0.015 304.04);
-
-    --red-to-pink-to-purple-vertical-gradient: linear-gradient(
-      180deg,
-      var(--orange-red) 0%,
-      var(--vivid-pink) 50%,
-      var(--electric-violet) 100%
-    );
-
-    --red-to-pink-to-purple-horizontal-gradient: linear-gradient(
-      90deg,
-      var(--orange-red) 0%,
-      var(--vivid-pink) 50%,
-      var(--electric-violet) 100%
-    );
-
-    --pill-accent: var(--bright-blue);
-
-    font-family: "Inter", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto,
-      Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji",
-      "Segoe UI Symbol";
-    box-sizing: border-box;
-    -webkit-font-smoothing: antialiased;
-    -moz-osx-font-smoothing: grayscale;
-  }
-
-  h1 {
-    font-size: 3.125rem;
-    color: var(--gray-900);
-    font-weight: 500;
-    line-height: 100%;
-    letter-spacing: -0.125rem;
-    margin: 0;
-    font-family: "Inter Tight", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto,
-      Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji",
-      "Segoe UI Symbol";
-  }
-
-  p {
-    margin: 0;
-    color: var(--gray-700);
-  }
-
-  main {
-    width: 100%;
-    min-height: 100%;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    padding: 1rem;
-    box-sizing: inherit;
-    position: relative;
-  }
-
-  .angular-logo {
-    max-width: 9.2rem;
-  }
-
-  .content {
-    display: flex;
-    justify-content: space-around;
-    width: 100%;
-    max-width: 700px;
-    margin-bottom: 3rem;
-  }
-
-  .content h1 {
-    margin-top: 1.75rem;
-  }
-
-  .content p {
-    margin-top: 1.5rem;
-  }
-
-  .divider {
-    width: 1px;
-    background: var(--red-to-pink-to-purple-vertical-gradient);
-    margin-inline: 0.5rem;
-  }
-
-  .pill-group {
-    display: flex;
-    flex-direction: column;
-    align-items: start;
-    flex-wrap: wrap;
-    gap: 1.25rem;
-  }
-
-  .pill {
-    display: flex;
-    align-items: center;
-    --pill-accent: var(--bright-blue);
-    background: color-mix(in srgb, var(--pill-accent) 5%, transparent);
-    color: var(--pill-accent);
-    padding-inline: 0.75rem;
-    padding-block: 0.375rem;
-    border-radius: 2.75rem;
-    border: 0;
-    transition: background 0.3s ease;
-    font-family: var(--inter-font);
-    font-size: 0.875rem;
-    font-style: normal;
-    font-weight: 500;
-    line-height: 1.4rem;
-    letter-spacing: -0.00875rem;
-    text-decoration: none;
-  }
-
-  .pill:hover {
-    background: color-mix(in srgb, var(--pill-accent) 15%, transparent);
-  }
-
-  .pill-group .pill:nth-child(6n + 1) {
-    --pill-accent: var(--bright-blue);
-  }
-  .pill-group .pill:nth-child(6n + 2) {
-    --pill-accent: var(--french-violet);
-  }
-  .pill-group .pill:nth-child(6n + 3),
-  .pill-group .pill:nth-child(6n + 4),
-  .pill-group .pill:nth-child(6n + 5) {
-    --pill-accent: var(--hot-red);
-  }
-
-  .pill-group svg {
-    margin-inline-start: 0.25rem;
-  }
-
-  .social-links {
-    display: flex;
-    align-items: center;
-    gap: 0.73rem;
-    margin-top: 1.5rem;
-  }
-
-  .social-links path {
-    transition: fill 0.3s ease;
-    fill: var(--gray-400);
-  }
-
-  .social-links a:hover svg path {
-    fill: var(--gray-900);
-  }
-
-  @media screen and (max-width: 650px) {
-    .content {
-      flex-direction: column;
-      width: max-content;
-    }
-
-    .divider {
-      height: 1px;
-      width: 100%;
-      background: var(--red-to-pink-to-purple-horizontal-gradient);
-      margin-block: 1.5rem;
-    }
-  }
-</style>
-
-<main class="main">
-  <div class="content">
-    <div class="left-side">
-      <svg
-        xmlns="http://www.w3.org/2000/svg"
-        viewBox="0 0 982 239"
-        fill="none"
-        class="angular-logo"
-      >
-        <g clip-path="url(#a)">
-          <path
-            fill="url(#b)"
-            d="M388.676 191.625h30.849L363.31 31.828h-35.758l-56.215 159.797h30.848l13.174-39.356h60.061l13.256 39.356Zm-65.461-62.675 21.602-64.311h1.227l21.602 64.311h-44.431Zm126.831-7.527v70.202h-28.23V71.839h27.002v20.374h1.392c2.782-6.71 7.2-12.028 13.255-15.956 6.056-3.927 13.584-5.89 22.503-5.89 8.264 0 15.465 1.8 21.684 5.318 6.137 3.518 10.964 8.673 14.319 15.382 3.437 6.71 5.074 14.81 4.992 24.383v76.175h-28.23v-71.92c0-8.019-2.046-14.237-6.219-18.819-4.173-4.5-9.819-6.791-17.102-6.791-4.91 0-9.328 1.063-13.174 3.272-3.846 2.128-6.792 5.237-9.001 9.328-2.046 4.009-3.191 8.918-3.191 14.728ZM589.233 239c-10.147 0-18.82-1.391-26.103-4.091-7.282-2.7-13.092-6.382-17.511-10.964-4.418-4.582-7.528-9.655-9.164-15.219l25.448-6.136c1.145 2.372 2.782 4.663 4.991 6.954 2.209 2.291 5.155 4.255 8.837 5.81 3.683 1.554 8.428 2.291 14.074 2.291 8.019 0 14.647-1.964 19.884-5.81 5.237-3.845 7.856-10.227 7.856-19.064v-22.665h-1.391c-1.473 2.946-3.601 5.892-6.383 9.001-2.782 3.109-6.464 5.645-10.965 7.691-4.582 2.046-10.228 3.109-17.101 3.109-9.165 0-17.511-2.209-25.039-6.545-7.446-4.337-13.42-10.883-17.757-19.474-4.418-8.673-6.628-19.473-6.628-32.565 0-13.091 2.21-24.301 6.628-33.383 4.419-9.082 10.311-15.955 17.839-20.7 7.528-4.746 15.874-7.037 25.039-7.037 7.037 0 12.846 1.145 17.347 3.518 4.582 2.373 8.182 5.236 10.883 8.51 2.7 3.272 4.746 6.382 6.137 9.327h1.554v-19.8h27.821v121.749c0 10.228-2.454 18.737-7.364 25.447-4.91 6.709-11.538 11.7-20.048 15.055-8.509 3.355-18.165 4.991-28.884 4.991Zm.245-71.266c5.974 0 11.047-1.473 15.302-4.337 4.173-2.945 7.446-7.118 9.573-12.519 2.21-5.482 3.274-12.027 3.274-19.637 0-7.609-1.064-14.155-3.274-19.8-2.127-5.646-5.318-10.064-9.491-13.255-4.174-3.11-9.329-4.746-15.384-4.746s-11.537 1.636-15.792 4.91c-4.173 3.272-7.365 7.772-9.492 13.418-2.128 5.727-3.191 12.191-3.191 19.392 0 7.2 1.063 13.745 3.273 19.228 2.127 5.482 5.318 9.736 9.573 12.764 4.174 3.027 9.41 4.582 15.629 4.582Zm141.56-26.51V71.839h28.23v119.786h-27.412v-21.273h-1.227c-2.7 6.709-7.119 12.191-13.338 16.446-6.137 4.255-13.747 6.382-22.748 6.382-7.855 0-14.81-1.718-20.783-5.237-5.974-3.518-10.72-8.591-14.075-15.382-3.355-6.709-5.073-14.891-5.073-24.464V71.839h28.312v71.921c0 7.609 2.046 13.664 6.219 18.083 4.173 4.5 9.655 6.709 16.365 6.709 4.173 0 8.183-.982 12.111-3.028 3.927-2.045 7.118-5.072 9.655-9.082 2.537-4.091 3.764-9.164 3.764-15.218Zm65.707-109.395v159.796h-28.23V31.828h28.23Zm44.841 162.169c-7.61 0-14.402-1.391-20.457-4.091-6.055-2.7-10.883-6.791-14.32-12.109-3.518-5.319-5.237-11.946-5.237-19.801 0-6.791 1.228-12.355 3.765-16.773 2.536-4.419 5.891-7.937 10.228-10.637 4.337-2.618 9.164-4.664 14.647-6.055 5.4-1.391 11.046-2.373 16.856-3.027 7.037-.737 12.683-1.391 17.102-1.964 4.337-.573 7.528-1.555 9.574-2.782 1.963-1.309 3.027-3.273 3.027-5.973v-.491c0-5.891-1.718-10.391-5.237-13.664-3.518-3.191-8.51-4.828-15.056-4.828-6.955 0-12.356 1.473-16.447 4.5-4.009 3.028-6.71 6.546-8.183 10.719l-26.348-3.764c2.046-7.282 5.483-13.336 10.31-18.328 4.746-4.909 10.638-8.59 17.511-11.045 6.955-2.455 14.565-3.682 22.912-3.682 5.809 0 11.537.654 17.265 2.045s10.965 3.6 15.711 6.71c4.746 3.109 8.51 7.282 11.455 12.6 2.864 5.318 4.337 11.946 4.337 19.883v80.184h-27.166v-16.446h-.9c-1.719 3.355-4.092 6.464-7.201 9.328-3.109 2.864-6.955 5.237-11.619 6.955-4.828 1.718-10.229 2.536-16.529 2.536Zm7.364-20.701c5.646 0 10.556-1.145 14.729-3.354 4.173-2.291 7.364-5.237 9.655-9.001 2.292-3.763 3.355-7.854 3.355-12.273v-14.155c-.9.737-2.373 1.391-4.5 2.046-2.128.654-4.419 1.145-7.037 1.636-2.619.491-5.155.9-7.692 1.227-2.537.328-4.746.655-6.628.901-4.173.572-8.019 1.472-11.292 2.781-3.355 1.31-5.973 3.11-7.855 5.401-1.964 2.291-2.864 5.318-2.864 8.918 0 5.237 1.882 9.164 5.728 11.782 3.682 2.782 8.51 4.091 14.401 4.091Zm64.643 18.328V71.839h27.412v19.965h1.227c2.21-6.955 5.974-12.274 11.292-16.038 5.319-3.763 11.456-5.645 18.329-5.645 1.555 0 3.355.082 5.237.163 1.964.164 3.601.328 4.91.573v25.938c-1.227-.41-3.109-.819-5.646-1.146a58.814 58.814 0 0 0-7.446-.49c-5.155 0-9.738 1.145-13.829 3.354-4.091 2.209-7.282 5.236-9.655 9.164-2.373 3.927-3.519 8.427-3.519 13.5v70.448h-28.312ZM222.077 39.192l-8.019 125.923L137.387 0l84.69 39.192Zm-53.105 162.825-57.933 33.056-57.934-33.056 11.783-28.556h92.301l11.783 28.556ZM111.039 62.675l30.357 73.803H80.681l30.358-73.803ZM7.937 165.115 0 39.192 84.69 0 7.937 165.115Z"
-          />
-          <path
-            fill="url(#c)"
-            d="M388.676 191.625h30.849L363.31 31.828h-35.758l-56.215 159.797h30.848l13.174-39.356h60.061l13.256 39.356Zm-65.461-62.675 21.602-64.311h1.227l21.602 64.311h-44.431Zm126.831-7.527v70.202h-28.23V71.839h27.002v20.374h1.392c2.782-6.71 7.2-12.028 13.255-15.956 6.056-3.927 13.584-5.89 22.503-5.89 8.264 0 15.465 1.8 21.684 5.318 6.137 3.518 10.964 8.673 14.319 15.382 3.437 6.71 5.074 14.81 4.992 24.383v76.175h-28.23v-71.92c0-8.019-2.046-14.237-6.219-18.819-4.173-4.5-9.819-6.791-17.102-6.791-4.91 0-9.328 1.063-13.174 3.272-3.846 2.128-6.792 5.237-9.001 9.328-2.046 4.009-3.191 8.918-3.191 14.728ZM589.233 239c-10.147 0-18.82-1.391-26.103-4.091-7.282-2.7-13.092-6.382-17.511-10.964-4.418-4.582-7.528-9.655-9.164-15.219l25.448-6.136c1.145 2.372 2.782 4.663 4.991 6.954 2.209 2.291 5.155 4.255 8.837 5.81 3.683 1.554 8.428 2.291 14.074 2.291 8.019 0 14.647-1.964 19.884-5.81 5.237-3.845 7.856-10.227 7.856-19.064v-22.665h-1.391c-1.473 2.946-3.601 5.892-6.383 9.001-2.782 3.109-6.464 5.645-10.965 7.691-4.582 2.046-10.228 3.109-17.101 3.109-9.165 0-17.511-2.209-25.039-6.545-7.446-4.337-13.42-10.883-17.757-19.474-4.418-8.673-6.628-19.473-6.628-32.565 0-13.091 2.21-24.301 6.628-33.383 4.419-9.082 10.311-15.955 17.839-20.7 7.528-4.746 15.874-7.037 25.039-7.037 7.037 0 12.846 1.145 17.347 3.518 4.582 2.373 8.182 5.236 10.883 8.51 2.7 3.272 4.746 6.382 6.137 9.327h1.554v-19.8h27.821v121.749c0 10.228-2.454 18.737-7.364 25.447-4.91 6.709-11.538 11.7-20.048 15.055-8.509 3.355-18.165 4.991-28.884 4.991Zm.245-71.266c5.974 0 11.047-1.473 15.302-4.337 4.173-2.945 7.446-7.118 9.573-12.519 2.21-5.482 3.274-12.027 3.274-19.637 0-7.609-1.064-14.155-3.274-19.8-2.127-5.646-5.318-10.064-9.491-13.255-4.174-3.11-9.329-4.746-15.384-4.746s-11.537 1.636-15.792 4.91c-4.173 3.272-7.365 7.772-9.492 13.418-2.128 5.727-3.191 12.191-3.191 19.392 0 7.2 1.063 13.745 3.273 19.228 2.127 5.482 5.318 9.736 9.573 12.764 4.174 3.027 9.41 4.582 15.629 4.582Zm141.56-26.51V71.839h28.23v119.786h-27.412v-21.273h-1.227c-2.7 6.709-7.119 12.191-13.338 16.446-6.137 4.255-13.747 6.382-22.748 6.382-7.855 0-14.81-1.718-20.783-5.237-5.974-3.518-10.72-8.591-14.075-15.382-3.355-6.709-5.073-14.891-5.073-24.464V71.839h28.312v71.921c0 7.609 2.046 13.664 6.219 18.083 4.173 4.5 9.655 6.709 16.365 6.709 4.173 0 8.183-.982 12.111-3.028 3.927-2.045 7.118-5.072 9.655-9.082 2.537-4.091 3.764-9.164 3.764-15.218Zm65.707-109.395v159.796h-28.23V31.828h28.23Zm44.841 162.169c-7.61 0-14.402-1.391-20.457-4.091-6.055-2.7-10.883-6.791-14.32-12.109-3.518-5.319-5.237-11.946-5.237-19.801 0-6.791 1.228-12.355 3.765-16.773 2.536-4.419 5.891-7.937 10.228-10.637 4.337-2.618 9.164-4.664 14.647-6.055 5.4-1.391 11.046-2.373 16.856-3.027 7.037-.737 12.683-1.391 17.102-1.964 4.337-.573 7.528-1.555 9.574-2.782 1.963-1.309 3.027-3.273 3.027-5.973v-.491c0-5.891-1.718-10.391-5.237-13.664-3.518-3.191-8.51-4.828-15.056-4.828-6.955 0-12.356 1.473-16.447 4.5-4.009 3.028-6.71 6.546-8.183 10.719l-26.348-3.764c2.046-7.282 5.483-13.336 10.31-18.328 4.746-4.909 10.638-8.59 17.511-11.045 6.955-2.455 14.565-3.682 22.912-3.682 5.809 0 11.537.654 17.265 2.045s10.965 3.6 15.711 6.71c4.746 3.109 8.51 7.282 11.455 12.6 2.864 5.318 4.337 11.946 4.337 19.883v80.184h-27.166v-16.446h-.9c-1.719 3.355-4.092 6.464-7.201 9.328-3.109 2.864-6.955 5.237-11.619 6.955-4.828 1.718-10.229 2.536-16.529 2.536Zm7.364-20.701c5.646 0 10.556-1.145 14.729-3.354 4.173-2.291 7.364-5.237 9.655-9.001 2.292-3.763 3.355-7.854 3.355-12.273v-14.155c-.9.737-2.373 1.391-4.5 2.046-2.128.654-4.419 1.145-7.037 1.636-2.619.491-5.155.9-7.692 1.227-2.537.328-4.746.655-6.628.901-4.173.572-8.019 1.472-11.292 2.781-3.355 1.31-5.973 3.11-7.855 5.401-1.964 2.291-2.864 5.318-2.864 8.918 0 5.237 1.882 9.164 5.728 11.782 3.682 2.782 8.51 4.091 14.401 4.091Zm64.643 18.328V71.839h27.412v19.965h1.227c2.21-6.955 5.974-12.274 11.292-16.038 5.319-3.763 11.456-5.645 18.329-5.645 1.555 0 3.355.082 5.237.163 1.964.164 3.601.328 4.91.573v25.938c-1.227-.41-3.109-.819-5.646-1.146a58.814 58.814 0 0 0-7.446-.49c-5.155 0-9.738 1.145-13.829 3.354-4.091 2.209-7.282 5.236-9.655 9.164-2.373 3.927-3.519 8.427-3.519 13.5v70.448h-28.312ZM222.077 39.192l-8.019 125.923L137.387 0l84.69 39.192Zm-53.105 162.825-57.933 33.056-57.934-33.056 11.783-28.556h92.301l11.783 28.556ZM111.039 62.675l30.357 73.803H80.681l30.358-73.803ZM7.937 165.115 0 39.192 84.69 0 7.937 165.115Z"
-          />
-        </g>
-        <defs>
-          <radialGradient
-            id="c"
-            cx="0"
-            cy="0"
-            r="1"
-            gradientTransform="rotate(118.122 171.182 60.81) scale(205.794)"
-            gradientUnits="userSpaceOnUse"
-          >
-            <stop stop-color="#FF41F8" />
-            <stop offset=".707" stop-color="#FF41F8" stop-opacity=".5" />
-            <stop offset="1" stop-color="#FF41F8" stop-opacity="0" />
-          </radialGradient>
-          <linearGradient
-            id="b"
-            x1="0"
-            x2="982"
-            y1="192"
-            y2="192"
-            gradientUnits="userSpaceOnUse"
-          >
-            <stop stop-color="#F0060B" />
-            <stop offset="0" stop-color="#F0070C" />
-            <stop offset=".526" stop-color="#CC26D5" />
-            <stop offset="1" stop-color="#7702FF" />
-          </linearGradient>
-          <clipPath id="a"><path fill="#fff" d="M0 0h982v239H0z" /></clipPath>
-        </defs>
-      </svg>
-      <h1>Hello, {{ title }}</h1>
-      <p>Congratulations! Your app is running. 🎉</p>
-    </div>
-    <div class="divider" role="separator" aria-label="Divider"></div>
-    <div class="right-side">
-      <div class="pill-group">
-        @for (item of [
-          { title: 'Explore the Docs', link: 'https://angular.dev' },
-          { title: 'Learn with Tutorials', link: 'https://angular.dev/tutorials' },
-          { title: 'CLI Docs', link: 'https://angular.dev/tools/cli' },
-          { title: 'Angular Language Service', link: 'https://angular.dev/tools/language-service' },
-          { title: 'Angular DevTools', link: 'https://angular.dev/tools/devtools' },
-        ]; track item.title) {
-          <a
-            class="pill"
-            [href]="item.link"
-            target="_blank"
-            rel="noopener"
-          >
-            <span>{{ item.title }}</span>
-            <svg
-              xmlns="http://www.w3.org/2000/svg"
-              height="14"
-              viewBox="0 -960 960 960"
-              width="14"
-              fill="currentColor"
-            >
-              <path
-                d="M200-120q-33 0-56.5-23.5T120-200v-560q0-33 23.5-56.5T200-840h280v80H200v560h560v-280h80v280q0 33-23.5 56.5T760-120H200Zm188-212-56-56 372-372H560v-80h280v280h-80v-144L388-332Z"
-              />
-            </svg>
-          </a>
-        }
-      </div>
-      <div class="social-links">
-        <a
-          href="https://github.com/angular/angular"
-          aria-label="Github"
-          target="_blank"
-          rel="noopener"
-        >
-          <svg
-            width="25"
-            height="24"
-            viewBox="0 0 25 24"
-            fill="none"
-            xmlns="http://www.w3.org/2000/svg"
-            alt="Github"
-          >
-            <path
-              d="M12.3047 0C5.50634 0 0 5.50942 0 12.3047C0 17.7423 3.52529 22.3535 8.41332 23.9787C9.02856 24.0946 9.25414 23.7142 9.25414 23.3871C9.25414 23.0949 9.24389 22.3207 9.23876 21.2953C5.81601 22.0377 5.09414 19.6444 5.09414 19.6444C4.53427 18.2243 3.72524 17.8449 3.72524 17.8449C2.61064 17.082 3.81137 17.0973 3.81137 17.0973C5.04697 17.1835 5.69604 18.3647 5.69604 18.3647C6.79321 20.2463 8.57636 19.7029 9.27978 19.3881C9.39052 18.5924 9.70736 18.0499 10.0591 17.7423C7.32641 17.4347 4.45429 16.3765 4.45429 11.6618C4.45429 10.3185 4.9311 9.22133 5.72065 8.36C5.58222 8.04931 5.16694 6.79833 5.82831 5.10337C5.82831 5.10337 6.85883 4.77319 9.2121 6.36459C10.1965 6.09082 11.2424 5.95546 12.2883 5.94931C13.3342 5.95546 14.3801 6.09082 15.3644 6.36459C17.7023 4.77319 18.7328 5.10337 18.7328 5.10337C19.3942 6.79833 18.9789 8.04931 18.8559 8.36C19.6403 9.22133 20.1171 10.3185 20.1171 11.6618C20.1171 16.3888 17.2409 17.4296 14.5031 17.7321C14.9338 18.1012 15.3337 18.8559 15.3337 20.0084C15.3337 21.6552 15.3183 22.978 15.3183 23.3779C15.3183 23.7009 15.5336 24.0854 16.1642 23.9623C21.0871 22.3484 24.6094 17.7341 24.6094 12.3047C24.6094 5.50942 19.0999 0 12.3047 0Z"
-            />
-          </svg>
-        </a>
-        <a
-          href="https://twitter.com/angular"
-          aria-label="Twitter"
-          target="_blank"
-          rel="noopener"
-        >
-          <svg
-            width="24"
-            height="24"
-            viewBox="0 0 24 24"
-            fill="none"
-            xmlns="http://www.w3.org/2000/svg"
-            alt="Twitter"
-          >
-            <path
-              d="M18.244 2.25h3.308l-7.227 8.26 8.502 11.24H16.17l-5.214-6.817L4.99 21.75H1.68l7.73-8.835L1.254 2.25H8.08l4.713 6.231zm-1.161 17.52h1.833L7.084 4.126H5.117z"
-            />
-          </svg>
-        </a>
-        <a
-          href="https://www.youtube.com/channel/UCbn1OgGei-DV7aSRo_HaAiw"
-          aria-label="Youtube"
-          target="_blank"
-          rel="noopener"
-        >
-          <svg
-            width="29"
-            height="20"
-            viewBox="0 0 29 20"
-            fill="none"
-            xmlns="http://www.w3.org/2000/svg"
-            alt="Youtube"
-          >
-            <path
-              fill-rule="evenodd"
-              clip-rule="evenodd"
-              d="M27.4896 1.52422C27.9301 1.96749 28.2463 2.51866 28.4068 3.12258C29.0004 5.35161 29.0004 10 29.0004 10C29.0004 10 29.0004 14.6484 28.4068 16.8774C28.2463 17.4813 27.9301 18.0325 27.4896 18.4758C27.0492 18.9191 26.5 19.2389 25.8972 19.4032C23.6778 20 14.8068 20 14.8068 20C14.8068 20 5.93586 20 3.71651 19.4032C3.11363 19.2389 2.56449 18.9191 2.12405 18.4758C1.68361 18.0325 1.36732 17.4813 1.20683 16.8774C0.613281 14.6484 0.613281 10 0.613281 10C0.613281 10 0.613281 5.35161 1.20683 3.12258C1.36732 2.51866 1.68361 1.96749 2.12405 1.52422C2.56449 1.08095 3.11363 0.76113 3.71651 0.596774C5.93586 0 14.8068 0 14.8068 0C14.8068 0 23.6778 0 25.8972 0.596774C26.5 0.76113 27.0492 1.08095 27.4896 1.52422ZM19.3229 10L11.9036 5.77905V14.221L19.3229 10Z"
-            />
-          </svg>
-        </a>
-      </div>
-    </div>
-  </div>
-</main>
-
-<!-- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * -->
-<!-- * * * * * * * * * * * The content above * * * * * * * * * * * * -->
-<!-- * * * * * * * * * * is only a placeholder * * * * * * * * * * * -->
-<!-- * * * * * * * * * * and can be replaced.  * * * * * * * * * * * -->
-<!-- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * -->
-<!-- * * * * * * * * * * End of Placeholder  * * * * * * * * * * * * -->
-<!-- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * -->
-
-
-<router-outlet />
+<app-navbar></app-navbar>
+<main>
+  <router-outlet />
+</main>

EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/app.component.scss

@@ -0,0 +1,11 @@
+main {
+    width: 100%;
+    min-height: calc(100% - 4rem);
+    padding: 0;
+    margin: 0;
+    display: grid;
+}
+
+router-outlet{
+    display: none;
+}

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

@@ -1,13 +1,15 @@
 import { Component } from '@angular/core';
 import { RouterOutlet } from '@angular/router';
+import { NavbarComponent } from "./components/navbar/navbar.component";
+import { LoginComponent } from "./components/login/login.component";
+import { HomeComponent } from "./pages/home/home.component";
 
 @Component({
-  selector: 'app-root',
-  standalone: true,
-  imports: [RouterOutlet],
-  templateUrl: './app.component.html',
-  styleUrl: './app.component.scss'
+    selector: 'app-root',
+    standalone: true,
+    templateUrl: './app.component.html',
+    styleUrl: './app.component.scss',
+    imports: [RouterOutlet, NavbarComponent, LoginComponent, HomeComponent]
 })
 export class AppComponent {
-  title = 'envelope-generator-ui';
-}
+}

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

@@ -1,9 +1,34 @@
-import { ApplicationConfig, provideZoneChangeDetection } from '@angular/core';
+import { ApplicationConfig } from '@angular/core';
 import { provideRouter } from '@angular/router';
-
 import { routes } from './app.routes';
 import { provideClientHydration } from '@angular/platform-browser';
+import { provideAnimationsAsync } from '@angular/platform-browser/animations/async';
+import { APP_BASE_HREF } from '@angular/common';
+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';
 
 export const appConfig: ApplicationConfig = {
-  providers: [provideZoneChangeDetection({ eventCoalescing: true }), provideRouter(routes), provideClientHydration()]
-};
+  providers: [
+    provideRouter(routes),
+    provideClientHydration(),
+    provideAnimationsAsync(),
+    provideHttpClient(withFetch()),
+    {
+      provide: APP_BASE_HREF,
+      useFactory: (urlService: UrlService) => urlService.getBaseHref(),
+      deps: [UrlService]
+    },
+    {
+      provide: API_URL,
+      useFactory: (urlService: UrlService) => urlService.getApiUrl(),
+      deps: [UrlService]
+    },
+    {
+      provide: HTTP_INTERCEPTORS,
+      useClass: HttpRequestInterceptor,
+      multi: true
+    }
+  ]
+};

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

@@ -1,3 +1,12 @@
 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 = [];
+export const routes: Routes = [
+  { path: '', component: EnvelopeComponent, canActivate: [authGuard] },
+  { path: 'login', component: HomeComponent },
+  { path: 'envelope', component: EnvelopeComponent, canActivate: [authGuard] },
+  { path: 'envelope-creation', component: EnvelopeCreationComponent, canActivate: [authGuard] }
+];

EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/components/clearable-input/clearable-input.component.html

@@ -0,0 +1,9 @@
+<mat-form-field class="example-form-field">
+    <mat-label>{{label}}</mat-label>
+    <input matInput type="text" [(ngModel)]="value">
+    @if (value) {
+    <button matSuffix mat-icon-button aria-label="Clear" (click)="value=''">
+        <mat-icon>close</mat-icon>
+    </button>
+    }
+</mat-form-field>

EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/components/clearable-input/clearable-input.component.scss

@@ -0,0 +1,7 @@
+.mat-stepper-vertical {
+    margin-top: 8px;
+}
+
+.mat-mdc-form-field {
+    margin-top: 16px;
+}

EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/components/clearable-input/clearable-input.component.spec.ts

@@ -0,0 +1,23 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { ClearableInputComponent } from './clearable-input.component';
+
+describe('ClearableInputComponent', () => {
+  let component: ClearableInputComponent;
+  let fixture: ComponentFixture<ClearableInputComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [ClearableInputComponent]
+    })
+    .compileComponents();
+    
+    fixture = TestBed.createComponent(ClearableInputComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/components/clearable-input/clearable-input.component.ts

@@ -0,0 +1,18 @@
+import {Component, Input} from '@angular/core';
+import {MatIconModule} from '@angular/material/icon';
+import {MatButtonModule} from '@angular/material/button';
+import {FormsModule} from '@angular/forms';
+import {MatInputModule} from '@angular/material/input';
+import {MatFormFieldModule} from '@angular/material/form-field';
+
+@Component({
+  selector: 'clearable-input',
+  standalone: true,
+  imports: [MatFormFieldModule, MatInputModule, FormsModule, MatButtonModule, MatIconModule],
+  templateUrl: './clearable-input.component.html',
+  styleUrl: './clearable-input.component.scss'
+})
+export class ClearableInputComponent {
+  @Input() public value: string = '';
+  @Input() public label: string = '';
+}

EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/components/envelope-table/envelope-table.component.html

@@ -0,0 +1,48 @@
+<table #table mat-table [dataSource]="data" class="mat-elevation-z8">
+
+    @for (colId of displayedColumns; track colId) {
+    <ng-container matColumnDef="{{colId}}">
+        <th mat-header-cell *matHeaderCellDef> {{schema[colId].header}} </th>
+        <td mat-cell *matCellDef="let element"> {{schema[colId].field(element)}} </td>
+    </ng-container>
+    }
+
+    <ng-container matColumnDef="expand">
+        <th mat-header-cell *matHeaderCellDef aria-label="row actions">&nbsp;</th>
+        <td mat-cell *matCellDef="let element">
+            <button mat-icon-button aria-label="expand row"
+                (click)="(expandedElement = expandedElement === element ? null : element); $event.stopPropagation()">
+                @if (expandedElement === element) {
+                <mat-icon>keyboard_arrow_up</mat-icon>
+                } @else {
+                <mat-icon>keyboard_arrow_down</mat-icon>
+                }
+            </button>
+        </td>
+    </ng-container>
+
+    <!-- Expanded Content Column - The detail row is made up of this one column that spans across all columns -->
+    <ng-container matColumnDef="expandedDetail">
+        <td mat-cell *matCellDef="let element" [attr.colspan]="columnsToDisplayWithExpand.length">
+            <div class="example-element-detail" [@detailExpand]="element == expandedElement ? 'expanded' : 'collapsed'">
+                <div class="example-element-diagram">
+                    <div class="example-element-position"> {{"element.position"}} </div>
+                    <div class="example-element-symbol"> {{"element.symbol"}} </div>
+                    <div class="example-element-name"> {{"element.name"}} </div>
+                    <div class="example-element-weight"> {{"element.weight"}} </div>
+                </div>
+                <div class="example-element-description">
+                    {{"element.description"}}
+                    <span class="example-element-description-attribution"> -- Wikipedia </span>
+                </div>
+            </div>
+        </td>
+    </ng-container>
+
+    <tr mat-header-row *matHeaderRowDef="columnsToDisplayWithExpand"></tr>
+    <tr mat-row *matRowDef="let element; columns: columnsToDisplayWithExpand;" class="example-element-row"
+        [class.example-expanded-row]="expandedElement === element"
+        (click)="expandedElement = expandedElement === element ? null : element">
+    </tr>
+    <!--<tr mat-row *matRowDef="let row; columns: ['expandedDetail']; when: isExpandedRow" class="example-detail-row"></tr>-->
+</table>

EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/components/envelope-table/envelope-table.component.scss

@@ -0,0 +1,31 @@
+.example-element-row td {
+    border-bottom-width: 0;
+  }
+  
+  .example-element-detail {
+    overflow: hidden;
+    display: flex;
+  }
+  
+  .example-element-diagram {
+    min-width: 80px;
+    border: 2px solid black;
+    padding: 8px;
+    font-weight: lighter;
+    margin: 8px 0;
+    height: 104px;
+  }
+  
+  .example-element-symbol {
+    font-weight: bold;
+    font-size: 40px;
+    line-height: normal;
+  }
+  
+  .example-element-description {
+    padding: 16px;
+  }
+  
+  .example-element-description-attribution {
+    opacity: 0.5;
+  }

EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/components/envelope-table/envelope-table.component.spec.ts

@@ -0,0 +1,23 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { EnvelopeTableComponent } from './envelope-table.component';
+
+describe('EnvelopeTableComponent', () => {
+  let component: EnvelopeTableComponent;
+  let fixture: ComponentFixture<EnvelopeTableComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [EnvelopeTableComponent]
+    })
+    .compileComponents();
+    
+    fixture = TestBed.createComponent(EnvelopeTableComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/components/envelope-table/envelope-table.component.ts

@@ -0,0 +1,74 @@
+import { Component, Input, ViewChild } from '@angular/core';
+import { EnvelopeReceiverService } from '../../services/envelope-receiver.service';
+import { MatTable, MatTableModule } from '@angular/material/table';
+import { CommonModule } from '@angular/common'
+import { MatIconModule } from '@angular/material/icon';
+import { MatButtonModule } from '@angular/material/button';
+import { animate, state, style, transition, trigger } from '@angular/animations';
+
+@Component({
+  selector: 'app-envelope-table',
+  standalone: true,
+  imports: [MatTableModule, CommonModule, MatTableModule, MatButtonModule, MatIconModule],
+  templateUrl: './envelope-table.component.html',
+  animations: [
+    trigger('detailExpand', [
+      state('collapsed,void', style({ height: '0px', minHeight: '0' })),
+      state('expanded', style({ height: '*' })),
+      transition('expanded <=> collapsed', animate('225ms cubic-bezier(0.4, 0.0, 0.2, 1)')),
+    ]),
+  ],
+  styleUrl: './envelope-table.component.scss'
+})
+export class EnvelopeTableComponent {
+
+  @Input() data: Array<any> = []
+
+  @Input() options?: { min_status?: number; max_status?: number; ignore_status?: number[] }
+
+  @Input() displayedColumns: string[] = ['title', 'status', 'type', 'privateMessage', 'addedWhen'];
+
+  @Input() schema: Record<string, { header: string; field: (element: any) => any; }> = {
+    'title': {
+      header: 'Title',
+      field: (element: any) => element.envelope.title
+    },
+    'status': {
+      header: 'Status',
+      field: (element: any) => element.envelope.statusName
+    },
+    'type': {
+      header: 'Type',
+      field: (element: any) => element.envelope.contractType
+    },
+    'privateMessage': {
+      header: 'Private Message',
+      field: (element: any) => element.privateMessage
+    },
+    'addedWhen': {
+      header: 'Added When',
+      field: (element: any) => element.addedWhen
+    },
+  }
+
+  columnsToDisplayWithExpand = [...this.displayedColumns, 'expand'];
+
+  expandedElement: any | null;
+
+  @ViewChild(MatTable) table!: MatTable<any>;
+
+  constructor(private erService: EnvelopeReceiverService) { }
+
+  async ngOnInit() {
+    if (this.data.length === 0)
+      this.data = await this.erService.getEnvelopeReceiverAsync(this.options);
+  }
+
+  public updateTable() {
+    this.table.renderRows();
+  }
+
+  isExpandedRow(index: number, row: any): boolean {
+    return (row?.envelopeId === this.expandedElement?.envelopeId) && (row?.receiverId === this.expandedElement?.receiverId);
+  }
+}

EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/components/login/login.component.html

@@ -0,0 +1,25 @@
+<!-- src/app/components/login/login.component.html -->
+<form [formGroup]="loginForm" (ngSubmit)="onSubmit()">
+  <div class="mb-3">
+    <mat-form-field>
+      <mat-label>Username</mat-label>
+      <input matInput formControlName="username">
+    </mat-form-field>
+  </div>
+  <div class="mb-3">
+    <mat-form-field>
+      <mat-label>Enter your password</mat-label>
+      <input matInput [type]="hide ? 'password' : 'text'" formControlName="password">
+      <button type="button" mat-icon-button matSuffix (click)="togglePWVisibility($event)"
+        [attr.aria-label]="'Hide password'" [attr.aria-pressed]="hide">
+        <mat-icon>{{hide ? 'visibility_off' : 'visibility'}}</mat-icon>
+      </button>
+    </mat-form-field>
+  </div>
+  <div class="mb-3">
+    <button type="submit" class="btn" mat-flat-button color="primary">
+      <span class="me-2">Anmeldung</span>
+      <span class="p-0 m-0" [class.spinner-border]="wait4waitRes" [class.spinner-border-sm]="wait4waitRes" aria-hidden="true"></span>      
+      </button>
+  </div>
+</form>

EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/components/login/login.component.scss

@@ -0,0 +1,3 @@
+mat-form-field{
+    width: 100%;
+}

EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/components/login/login.component.spec.ts

@@ -0,0 +1,23 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { LoginComponent } from './login.component';
+
+describe('LoginComponent', () => {
+  let component: LoginComponent;
+  let fixture: ComponentFixture<LoginComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [LoginComponent]
+    })
+    .compileComponents();
+    
+    fixture = TestBed.createComponent(LoginComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/components/login/login.component.ts

@@ -0,0 +1,49 @@
+import { Component } from '@angular/core';
+import { MatIconModule } from '@angular/material/icon';
+import { MatButtonModule } from '@angular/material/button';
+import { MatInputModule } from '@angular/material/input';
+import { MatFormFieldModule } from '@angular/material/form-field';
+import { FormBuilder, FormGroup, Validators } from '@angular/forms';
+import { AuthService } from '../../services/auth.service'
+import { Router } from '@angular/router';
+import { ReactiveFormsModule } from '@angular/forms';
+
+@Component({
+  selector: 'login',
+  standalone: true,
+  imports: [MatFormFieldModule, MatInputModule, MatButtonModule, MatIconModule, ReactiveFormsModule],
+  templateUrl: './login.component.html',
+  styleUrl: './login.component.scss'
+})
+export class LoginComponent {
+  hide = true;
+  loginForm: FormGroup;
+  wait4waitRes: boolean = false;
+
+  constructor(private fb: FormBuilder, private authService: AuthService, private router: Router) {
+    this.loginForm = this.fb.group({
+      username: ['', Validators.required],
+      password: ['', Validators.required]
+    });
+  }
+
+  togglePWVisibility(event: MouseEvent) {
+    this.hide = !this.hide;
+    event.stopPropagation();
+  }
+
+  onSubmit() {
+    if (this.loginForm.valid) {
+      this.wait4waitRes = true;
+      this.authService.login(this.loginForm.value).subscribe({
+        next: () => {
+          this.wait4waitRes = false;
+          this.router.navigate(['/envelope']);          
+        },
+        error: error => {
+          this.wait4waitRes = false;
+        }
+      });
+    }
+  }
+}

EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/components/navbar/navbar.component.html

@@ -0,0 +1,40 @@
+<header>
+  <nav class="navbar navbar-expand-lg bg-body-tertiary fs-5">
+    <div class="container-fluid">
+      <a class="navbar-brand fs-2 fw-bold" [routerLink]="['/']">signFlow</a>
+      <!-- Navbars -->
+      <div *ngIf="isLogedIn()" class="navbar-collapse collapse d-sm-inline-flex justify-content-center"
+        [ngClass]="{ show: isExpanded }">
+        <ul class=" navbar-nav flex-grow">
+          <li class="nav-item" [routerLinkActive]="['link-active']" [routerLinkActiveOptions]="{exact: true}">
+            <button class="btn nav-link d-inline-flex flex-column align-items-center justify-content-center mx-2" (click)="router.navigate(['/'])">
+              <mat-icon>mail</mat-icon>
+              <span class="fs-6">Umschläge</span>
+            </button>
+            <button class="btn nav-link d-inline-flex flex-column align-items-center justify-content-center mx-2" (click)="router.navigate(['/envelope-creation'])">
+              <mat-icon>forward_to_inbox</mat-icon>
+              <span class="fs-6">Neuer Umschlag</span>
+            </button>
+          </li>
+        </ul>
+      </div>
+      <!-- Right menu -->
+      <div class="navbar-collapse justify-content-end me-5">
+        <button class="navbar-toggler" type="button" data-toggle="collapse" data-target=".navbar-collapse"
+          aria-label="Toggle navigation" [attr.aria-expanded]="isExpanded" (click)="toggle()">
+          <span class="navbar-toggler-icon"></span>
+        </button>
+        <button class="fs-5 btn d-flex align-items-center ms-2 me-0 pe-0" type="button" (click)="logInOut()">
+          @if(isLogedIn()){
+            <mat-icon>logout</mat-icon>
+            <span class="fs-6 ms-1">Abmelden</span>
+          }
+          @else {
+            <mat-icon>login</mat-icon>
+            <span class="fs-6 ms-1">Anmelden</span>
+          }
+        </button>
+      </div>
+    </div>
+  </nav>
+</header>

EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/app/components/navbar/navbar.component.scss

@@ -0,0 +1,3 @@
+mat-toolbar{
+    height: 4rem
+}