Merge branch 'master' of https://vcs.digitaldata.works/AppStd/EnvelopeGenerator

Corrected "red" to "read" in the DocumentSuccessfullyConfirmed resource string to ensure proper messaging.

EnvelopeGenerator.Application/Common/Extensions/AutoMapperAuditingExtensions.cs

@@ -13,12 +13,12 @@ public static class AutoMapperAuditingExtensions
     /// </summary>
     public static IMappingExpression<TSource, TDestination> MapAddedWhen<TSource, TDestination>(this IMappingExpression<TSource, TDestination> expression)
         where TDestination : IHasAddedWhen
-        => expression.ForMember(dest => dest.AddedWhen, opt => opt.MapFrom(_ => DateTime.UtcNow));
+        => expression.ForMember(dest => dest.AddedWhen, opt => opt.MapFrom(_ => DateTime.Now));
 
     /// <summary>
     /// Maps <see cref="IHasChangedWhen.ChangedWhen"/> to the current UTC time.
     /// </summary>
     public static IMappingExpression<TSource, TDestination> MapChangedWhen<TSource, TDestination>(this IMappingExpression<TSource, TDestination> expression)
         where TDestination : IHasChangedWhen
-        => expression.ForMember(dest => dest.ChangedWhen, opt => opt.MapFrom(_ => DateTime.UtcNow));
+        => expression.ForMember(dest => dest.ChangedWhen, opt => opt.MapFrom(_ => DateTime.Now));
 }

EnvelopeGenerator.Application/Common/Notifications/SendMailHandler.cs

@@ -113,7 +113,7 @@ public abstract class SendMailHandler<TNotification> : INotificationHandler<TNot
             EmailAddress = notification.EmailAddress,
             EmailBody = temp.Body,
             EmailSubj = temp.Subject,
-            AddedWhen = DateTime.UtcNow,
+            AddedWhen = DateTime.Now,
             AddedWho = DispatcherParams.AddedWho,
             SendingProfile = DispatcherParams.SendingProfile,
             ReminderTypeId = DispatcherParams.ReminderTypeId,

EnvelopeGenerator.Application/DocStatus/MappingProfile.cs

@@ -27,7 +27,7 @@ public class MappingProfile : Profile
         CreateMap<UpdateDocStatusCommand, DocumentStatus>()
         .ForMember(dest => dest.Envelope, opt => opt.Ignore())
         .ForMember(dest => dest.Receiver, opt => opt.Ignore())
-        .ForMember(dest => dest.StatusChangedWhen, opt => opt.MapFrom(src => DateTime.UtcNow))
+        .ForMember(dest => dest.StatusChangedWhen, opt => opt.MapFrom(src => DateTime.Now))
         .MapChangedWhen();
     }
 }

EnvelopeGenerator.Application/Histories/Commands/CreateHistoryCommand.cs

@@ -34,7 +34,7 @@ public record CreateHistoryCommand : EnvelopeReceiverQueryBase, IRequest<History
     /// <summary>
     /// 
     /// </summary>
-    public DateTime AddedWhen { get; } = DateTime.UtcNow;
+    public DateTime AddedWhen { get; } = DateTime.Now;
 
     /// <summary>
     /// 

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

@@ -448,7 +448,7 @@
     <value>Document has been reset.</value>
   </data>
   <data name="DocumentSuccessfullyConfirmed" xml:space="preserve">
-    <value>Document successfully red and confirmed!</value>
+    <value>Document successfully read and confirmed!</value>
   </data>
   <data name="DocumentConfirmedConfirmationMessage" xml:space="preserve">
     <value>You have read and confirmed the document. You will receive a written confirmation afterwards.</value>

EnvelopeGenerator.CommonServices/Jobs/FinalizeDocument/FinalizeDocumentJob.vb

@@ -15,6 +15,7 @@ Imports DigitalData.Core.Abstraction.Application
 Imports EnvelopeGenerator.Infrastructure
 Imports Microsoft.EntityFrameworkCore
 Imports DigitalData.Core.Abstractions
+Imports EnvelopeGenerator.Domain.Interfaces
 
 Namespace Jobs
     Public Class FinalizeDocumentJob
@@ -350,7 +351,7 @@ Namespace Jobs
                 Logger.Warn($"No SendFinalEmailToCreator - oMailToCreator [{oMailToCreator}] <> [{FinalEmailType.No}] ")
             End If
 
-            If oMailToReceivers <> FinalEmailType.No Then
+            If oMailToReceivers <> FinalEmailType.No And pEnvelope.IsReadAndSign() Then
                 Logger.Debug("Sending emails to receivers..")
                 SendFinalEmailToReceivers(pEnvelope) ', pAttachment
             Else

EnvelopeGenerator.Infrastructure/EGDbContext.cs

@@ -47,6 +47,8 @@ public abstract class EGDbContextBase : DbContext
 
     public DbSet<Signature> DocumentReceiverElements { get; set; }
 
+    public DbSet<ElementAnnotation> DocumentReceiverElementAnnotations { get; set; }
+
     public DbSet<DocumentStatus> DocumentStatus { get; set; }
 
     public DbSet<EmailTemplate> EmailTemplate { get; set; }

EnvelopeGenerator.Tests/Application/Fake.cs

@@ -215,7 +215,7 @@ public static class Extensions
         Title = faker.Lorem.Paragraph(faker.Random.Number(1, 2)),
         Message = faker.Lorem.Paragraph(faker.Random.Number(2, 5)),
         TfaEnabled = tfaEnabled,
-        AddedWhen = DateTime.UtcNow,
+        AddedWhen = DateTime.Now,
         CertificationType = (int)CertificationType.AdvancedElectronicSignature,
         UseAccessCode = false,
         ContractType = (int)ContractType.Contract,
@@ -273,9 +273,9 @@ public static class Extensions
         EnvelopeId = envelopeId,
         ReceiverId = receiverId,
         Status = ReceiverStatus.Unsigned,
-        AddedWhen = DateTime.UtcNow,
+        AddedWhen = DateTime.Now,
         AccessCode = faker.Random.Number(1000, 9999).ToString(),
-        ChangedWhen = DateTime.UtcNow,
+        ChangedWhen = DateTime.Now,
         CompanyName = faker.Company.CompanyName(),
         JobTitle = faker.Name.JobTitle(),
         Name = faker.Name.FullName(),

EnvelopeGenerator.Web/EnvelopeGenerator.Web.csproj

@@ -12,9 +12,9 @@
 		<PackageTags>digital data envelope generator web</PackageTags>
 		<Description>EnvelopeGenerator.Web is an ASP.NET MVC application developed to manage signing processes. It uses Entity Framework Core (EF Core) for database operations. The user interface for signing processes is developed with Razor View Engine (.cshtml files) and JavaScript under wwwroot, integrated with PSPDFKit. This integration allows users to view and sign documents seamlessly.</Description>
 		<ApplicationIcon>Assets\icon.ico</ApplicationIcon>
-		<Version>3.12.2</Version>						<!-- NuGet package version -->
-		<AssemblyVersion>3.12.2.0</AssemblyVersion>		<!-- Assembly version for API compatibility -->
-		<FileVersion>3.12.2.0</FileVersion>				<!-- Windows file version -->
+		<Version>3.12.3</Version>						<!-- NuGet package version -->
+		<AssemblyVersion>3.12.3.0</AssemblyVersion>		<!-- Assembly version for API compatibility -->
+		<FileVersion>3.12.3.0</FileVersion>				<!-- Windows file version -->
 		<Copyright>Copyright © 2025 Digital Data GmbH. All rights reserved.</Copyright>
 	</PropertyGroup>
 

EnvelopeGenerator.Web/appsettings.Database.json

@@ -1,7 +1,7 @@
 {
   "UseDbMigration": false,
   "ConnectionStrings": {
-    "Default": "Server=10.1.6.7;Database=DD_ECM;User Id=DD_ECM;Password=dd_ecm;Encrypt=false;TrustServerCertificate=True;",
+    "Default": "Server=SDD-VMP04-SQL17\\DD_DEVELOP01;Database=DD_ECM;User Id=sa;Password=dd;Encrypt=false;TrustServerCertificate=True;",
     "DbMigrationTest": "Server=SDD-VMP04-SQL17\\DD_DEVELOP01;Database=DD_ECM_DATA_MIGR_TEST;User Id=sa;Password=dd;Encrypt=false;TrustServerCertificate=True;"
   },
   "DbTriggerParams": {

EnvelopeGenerator.Web/appsettings.Logging.json

@@ -10,7 +10,7 @@
   "NLog": {
     "throwConfigExceptions": true,
     "variables": {
-      "logDirectory": "F:\\LogFiles\\signFLOW",
+      "logDirectory": "E:\\LogFiles\\Digital Data\\signFlow",
       "logFileNamePrefix": "${shortdate}-ECM.EnvelopeGenerator.Web"
     },
     "targets": {

EnvelopeGenerator.Web/appsettings.PSPDFKitLicense.json

@@ -1,3 +1,3 @@
 {
-  "PSPDFKitLicenseKey": "Lr5MhhvIID0IXu3rLgw5P385B8cuo2BGd7dxrTfPddsaN0Mtak8CaqSiGNFcjiDC5ZSOMkvxmh5f2azXrLaWk0yDPyOiAdkc2zZHhv5d3nvGINki7zsJMd4_8f9-gismBGfwQtHO3MU7im-UVeYAzaE6DUg6Ja7mcJ2JNcCoPTqFsBjwriW413wYNFKF3A49WdFS93tNc2auYka8XrGv6DjgajeVr25Y2YRzsg-9O6WtKEhUK10PC0BgwYCTfiERKrdUX1jJCxjpHqJKxI8s59m3-2s3TrzUOMgnVVfA6HvZDPpucD8XKpudloQfTXCCdKyeOwflxzFMNdrVtjIxz4iZabv5e2Zpch3LreGmFLfS6Bz9p0DJhLZ5zKpFWfvsJqRRTmeWZkPZp_0yOvlN-7lT1Z6nMWdznX5Sp6KdH9ZX3QgumUZEyKKLp5NWVa73mS9xlJ93--KX5Y6BqiOURw0golIWya4qg2P0S2brDJb6ejSCIpHIuLFVXQAVQpQZJ48naZNPiP8jcDmz7ziDEntFRSbw1nMAvCcdakQOLQ5DHzSKML5eDxanRL5zAIzX6PdZhQHIKZ0eIsjr6b_r8yc84C3Cv9kcexbrO9OEnw6hMARkP2TXsSRcDuC0Eety4CU4GpEuatXqUOMhkpQkg6nNctL24APZX47ZKqbHfkU=",
+  "PSPDFKitLicenseKey": "SXCtGGY9XA-31OGUXQK-r7c6AkdLGPm2ljuyDr1qu0kkhLvydg-Do-fxpNUF4Rq3fS_xAnZRNFRHbXpE6sQ2BMcCSVTcXVJO6tPviexjpiT-HnrDEySlUERJnnvh-tmeOWprxS6BySPnSILkmaVQtUfOIUS-cUbvvEYHTvQBKbSF8di4XHQFyfv49ihr51axm3NVV3AXwh2EiKL5C5XdqBZ4sQ4O7vXBjM2zvxdPxlxdcNYmiU83uAzw7B83O_jubPzya4CdUHh_YH7Nlp2gP56MeG1Sw2JhMtfG3Rj14Sg4ctaeL9p6AEWca5dDjJ2li5tFIV2fQSsw6A_cowLu0gtMm5i8IfJXeIcQbMC2-0wGv1oe9hZYJvFMdzhTM_FiejM0agemxt3lJyzuyP8zbBSOgp7Si6A85krLWPZptyZBTG7pp7IHboUHfPMxCXqi-zMsqewOJtQBE2mjntU-lPryKnssOpMPfswwQX7QSkJYV5EMqNmEhQX6mEkp2wcqFzMC7bJQew1aO4pOpvChUaMvb1vgRek0HxLag0nwQYX2YrYGh7F_xXJs-8HNwJe8H0-eW4x4faayCgM5rB5772CCCsD9ThZcvXFrjNHHLGJ8WuBUFm6LArvSfFQdii_7j-_sqHMpeKZt26NFgivj1A=="
 }

EnvelopeGenerator.Web/appsettings.Security.json

@@ -10,7 +10,7 @@
     "media-src 'self'",
     "object-src 'self'"
   ],
-  "AllowedOrigins": [ "http://localhost:8080", "https://digitale.unterschrift.wisag.de/" ],
+  "AllowedOrigins": [ "https://localhost:7202", "https://digitale.unterschrift.wisag.de/" ],
   "TFARegParams": {
     "TimeLimit": "90.00:00:00"
   }