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/Dto/EnvelopeDto.cs

@@ -75,10 +75,12 @@ public record EnvelopeDto : IEnvelope
     /// </summary>
     public int? EnvelopeTypeId { get; set; }
 
+    // TODO: use ReadAndConfirm property name
     /// <summary>
     /// 
     /// </summary>
-    public bool ReadOnly => EnvelopeTypeId == 2;
+    [Obsolete("Use EnvelopeExtensions.IsReadAndConfirm extension metot instead.")]
+    public bool ReadOnly => this.IsReadAndConfirm();
 
     /// <summary>
     /// 

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.Domain/Interfaces/IEnvelope.cs

@@ -11,5 +11,10 @@
         {
             return envelope.EnvelopeTypeId == 2;
         }
+
+        public static bool IsReadAndSign(this IEnvelope envelope)
+        {
+            return envelope.EnvelopeTypeId != 2;
+        }
     }
 }

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/Controllers/AnnotationController.cs

@@ -6,6 +6,7 @@ using EnvelopeGenerator.Application.Common.Notifications.DocSigned;
 using EnvelopeGenerator.Application.EnvelopeReceivers.Queries;
 using EnvelopeGenerator.Application.Histories.Queries;
 using EnvelopeGenerator.Domain.Constants;
+using EnvelopeGenerator.Domain.Interfaces;
 using EnvelopeGenerator.Web.Extensions;
 using MediatR;
 using Microsoft.AspNetCore.Authentication;
@@ -65,7 +66,7 @@ public class AnnotationController : ControllerBase
         // Again check if receiver has already signed
         if (await _mediator.IsSignedAsync(uuid, signature, cancel))
             return Problem(statusCode: 409);
-        else if (await _mediator.AnyHistoryAsync(uuid, new[] { EnvelopeStatus.EnvelopeRejected, EnvelopeStatus.DocumentRejected }, cancel))
+        else if (er.Envelope.IsReadAndSign() && await _mediator.AnyHistoryAsync(uuid, new[] { EnvelopeStatus.EnvelopeRejected, EnvelopeStatus.DocumentRejected }, cancel))
             return Problem(statusCode: 423);
 
         var docSignedNotification = await _mediator
@@ -80,6 +81,7 @@ public class AnnotationController : ControllerBase
         return Ok();
     }
     
+    //TODO: add logic to check if it is already rejected or signed
     [Authorize(Roles = Role.ReceiverFull)]
     [HttpPost("reject")]
     [Obsolete("Use DigitalData.Core.Exceptions and .Middleware")]
@@ -100,7 +102,7 @@ public class AnnotationController : ControllerBase
         if (envRcvRes.IsFailed)
         {
             _logger.LogNotice(envRcvRes.Notices);
-            return Unauthorized("you are not authirized");
+            return Unauthorized();
         }
 
         var histRes = await _histService.RecordAsync(envRcvRes.Data.EnvelopeId, userReference: mail, EnvelopeStatus.DocumentRejected, comment: reason);

EnvelopeGenerator.Web/Controllers/EnvelopeController.cs

@@ -7,6 +7,7 @@ using EnvelopeGenerator.Application.Common.Interfaces.Services;
 using EnvelopeGenerator.Application.EnvelopeReceivers.Queries;
 using EnvelopeGenerator.Application.Resources;
 using EnvelopeGenerator.Domain.Constants;
+using EnvelopeGenerator.Domain.Interfaces;
 using EnvelopeGenerator.PdfEditor;
 using EnvelopeGenerator.Web.Extensions;
 using EnvelopeGenerator.Web.Models;
@@ -78,13 +79,18 @@ public class EnvelopeController : ViewControllerBase
                 return this.ViewEnvelopeNotFound();
 
             #region Rejected or Signed
-            //check rejection
             var rejRcvrs = await _historyService.ReadRejectingReceivers(er.Envelope!.Id);
             if (rejRcvrs.Any())
             {
                 await HttpContext.SignOutAsync(CookieAuthenticationDefaults.AuthenticationScheme);
-                ViewBag.IsExt = !rejRcvrs.Contains(er.Receiver);    //external if the current user is not rejected
-                return View("EnvelopeRejected", er);
+                var isExt = !rejRcvrs.Where(rcv => rcv.Id == er.Receiver!.Id).Any();    //external if the current user is not rejected
+
+                if (er.Envelope.IsReadAndSign() || !isExt)
+                {
+                    //TODO: Normally assigned to the isExt variable. However, since the relevant keys are not defined in the resx files, it was assigned false. Fix this.
+                    ViewBag.IsExt = true;
+                    return View("EnvelopeRejected", er);
+                }
             }
 
             //check if it has already signed
@@ -162,13 +168,19 @@ public class EnvelopeController : ViewControllerBase
             }
             var er_secret = er_secret_res.Data;
 
-            //check rejection
             var rejRcvrs = await _historyService.ReadRejectingReceivers(er_secret.Envelope!.Id);
             if (rejRcvrs.Any())
             {
                 await HttpContext.SignOutAsync(CookieAuthenticationDefaults.AuthenticationScheme);
-                ViewBag.IsExt = !rejRcvrs.Contains(er_secret.Receiver);    //external if the current user is not rejected
-                return View("EnvelopeRejected", er_secret);
+                var isExt = !rejRcvrs.Where(rcv => rcv.Id == er_secret.Receiver!.Id).Any();    //external if the current user is not rejected
+
+                //check rejection if the envelope is read-and-sign or non-external (internal)
+                if (er_secret.Envelope.IsReadAndSign() || !isExt)
+                {
+                    //TODO: Normally assigned to the isExt variable. However, since the relevant keys are not defined in the resx files, it was assigned false. Fix this.
+                    ViewBag.IsExt = true;
+                    return View("EnvelopeRejected", er_secret);
+                }
             }
 
             // show envelope if already logged in

EnvelopeGenerator.Web/EnvelopeGenerator.Web.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
 	<PropertyGroup>
-		<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
+		<TargetFrameworks>net7.0;net8.0;net9.0</TargetFrameworks>
 		<Nullable>enable</Nullable>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<PackageId>EnvelopeGenerator.Web</PackageId>
@@ -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.0</Version>						<!-- NuGet package version -->
-		<AssemblyVersion>3.12.0.0</AssemblyVersion>		<!-- Assembly version for API compatibility -->
-		<FileVersion>3.12.0.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>
 
@@ -626,7 +626,6 @@
 		<None Include="wwwroot\lib\bootstrap-icons\icons\clipboard2-pulse.svg" />
 		<None Include="wwwroot\lib\bootstrap-icons\icons\clipboard2-x-fill.svg" />
 		<None Include="wwwroot\lib\bootstrap-icons\icons\clipboard2-x.svg" />
-		<None Include="wwwroot\lib\bootstrap-icons\icons\clipboard2.svg" />
 		<None Include="wwwroot\lib\bootstrap-icons\icons\clock-fill.svg" />
 		<None Include="wwwroot\lib\bootstrap-icons\icons\clock-history.svg" />
 		<None Include="wwwroot\lib\bootstrap-icons\icons\clock.svg" />
@@ -2093,6 +2092,31 @@
 		<None Include="wwwroot\lib\bootstrap-icons\icons\zoom-out.svg" />
 	</ItemGroup>
 
+	<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
+		<PackageReference Include="BuildBundlerMinifier2022" Version="2.9.11" />
+		<PackageReference Include="DigitalData.Core.API" Version="2.2.1" />
+		<PackageReference Include="DigitalData.Core.Exceptions" Version="1.1.0" />
+		<PackageReference Include="DigitalData.EmailProfilerDispatcher" Version="3.1.1" />
+		<PackageReference Include="HtmlSanitizer" Version="9.0.892" />
+		<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="7.0.20" />
+		<PackageReference Include="Microsoft.Extensions.Caching.SqlServer" Version="7.0.20" />
+		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+		<PackageReference Include="NLog" Version="5.2.8" />
+		<PackageReference Include="NLog.Web.AspNetCore" Version="5.3.4" />
+		<PackageReference Include="Quartz" Version="3.7.0" />
+		<PackageReference Include="Quartz.AspNetCore" Version="3.7.0" />
+		<PackageReference Include="Quartz.Plugins" Version="3.7.0" />
+		<PackageReference Include="Quartz.Serialization.Json" Version="3.7.0" />
+		<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
+		<PackageReference Include="System.Configuration.ConfigurationManager" Version="7.0.0" />
+		<PackageReference Include="System.Diagnostics.PerformanceCounter" Version="7.0.0" />
+		<PackageReference Include="System.DirectoryServices" Version="7.0.1" />
+		<PackageReference Include="System.DirectoryServices.AccountManagement" Version="7.0.1" />
+		<PackageReference Include="System.DirectoryServices.Protocols" Version="7.0.1" />
+		<PackageReference Include="System.Drawing.Common" Version="7.0.0" />
+		<PackageReference Include="System.Security.Cryptography.Cng" Version="5.0.0" />
+	</ItemGroup>
+
 	<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
 		<PackageReference Include="BuildBundlerMinifier2022" Version="2.9.9" />
 		<PackageReference Include="DigitalData.Core.API" Version="2.2.1" />