Merge branch 'master' of http://git.dd:3000/AppStd/EnvelopeGenerator

Added localized SigningProcessTitle entry to de-DE, en-US, and fr-FR resource files. Renamed RejectionInfoConfirmation to RejectionInfo1Confirmation. Removed duplicate SigningProcessTitle entries. No changes to localized values.

EnvelopeGenerator.Application/Resources/Resource.cs

@@ -190,6 +190,13 @@ public static class Extensions
     /// <returns></returns>
     public static string SignDoc(this IStringLocalizer localizer) => localizer[nameof(SignDoc)].Value;
 
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="localizer"></param>
+    /// <returns></returns>
+    public static string ConfirmDoc(this IStringLocalizer localizer) => localizer[nameof(ConfirmDoc)].Value;
+
     /// <summary>
     /// 
     /// </summary>
@@ -204,6 +211,13 @@ public static class Extensions
     /// <returns></returns>
     public static string DocSigned(this IStringLocalizer localizer) => localizer[nameof(DocSigned)].Value;
 
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="localizer"></param>
+    /// <returns></returns>
+    public static string DocConfirmed(this IStringLocalizer localizer) => localizer[nameof(DocConfirmed)].Value;
+
     /// <summary>
     /// 
     /// </summary>
@@ -239,6 +253,13 @@ public static class Extensions
     /// <returns></returns>
     public static string SigAgree(this IStringLocalizer localizer) => localizer[nameof(SigAgree)].Value;
 
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="localizer"></param>
+    /// <returns></returns>
+    public static string ConfirmAgree(this IStringLocalizer localizer) => localizer[nameof(ConfirmAgree)].Value;
+
     /// <summary>
     /// 
     /// </summary>
@@ -267,6 +288,13 @@ public static class Extensions
     /// <returns></returns>
     public static string RejectionInfo1(this IStringLocalizer localizer) => localizer[nameof(RejectionInfo1)].Value;
 
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="localizer"></param>
+    /// <returns></returns>
+    public static string RejectionInfo1ForConfirmation(this IStringLocalizer localizer) => localizer[nameof(RejectionInfo1ForConfirmation)].Value;
+
     /// <summary>
     /// 
     /// </summary>
@@ -295,6 +323,13 @@ public static class Extensions
     /// <returns></returns>
     public static string SigningProcessTitle(this IStringLocalizer localizer) => localizer[nameof(SigningProcessTitle)].Value;
 
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="localizer"></param>
+    /// <returns></returns>
+    public static string ConfirmationProcessTitle(this IStringLocalizer localizer) => localizer[nameof(ConfirmationProcessTitle)].Value;
+
     /// <summary>
     /// 
     /// </summary>

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

@@ -250,7 +250,7 @@
     <value>Sie können bei Bedarf mit {0}, &lt;a href="mailto:{1}?subject={2}&amp;body=Sehr geehrte(r)%20{0},%0A%0A%0A"&gt;{1}&lt;/a&gt; Kontakt aufnehmen.</value>
   </data>
   <data name="RejectionInfo2_ext" xml:space="preserve">
-    <value>Das Vorgang wurde von einer der beteiligten Parteien abgelehnt. Sie können bei Bedarf mit {0}, &lt;a href="mailto:{1}?subject={2}&amp;body=Sehr geehrte(r)%20{0},%0A%0A%0A"&gt;{1}&lt;/a&gt; Kontakt aufnehmen.</value>
+    <value>Der Vorgang wurde von einer der beteiligten Parteien abgelehnt. Sie können bei Bedarf mit {0}, &lt;a href="mailto:{1}?subject={2}&amp;body=Sehr geehrte(r)%20{0},%0A%0A%0A"&gt;{1}&lt;/a&gt; Kontakt aufnehmen.</value>
   </data>
   <data name="RejectionReasonQ" xml:space="preserve">
     <value>Bitte geben Sie einen Grund an:</value>
@@ -447,4 +447,34 @@
   <data name="DocumentReset" xml:space="preserve">
     <value>Dokument wurde zurückgesetzt.</value>
   </data>
+  <data name="DocumentSuccessfullyConfirmed" xml:space="preserve">
+    <value>Dokument erfolgreich gelesen und bestätigt!</value>
+  </data>
+  <data name="DocumentConfirmedConfirmationMessage" xml:space="preserve">
+    <value>Sie haben das Dokument gelesen und bestätigt. Im Anschluss erhalten Sie eine schriftliche Bestätigung.</value>
+  </data>
+  <data name="Confirm" xml:space="preserve">
+    <value>Bestätigen</value>
+  </data>
+  <data name="RejectionInfo1Confirmation" xml:space="preserve">
+    <value>Dieser Bestätigungsvorgang wurde abgelehnt!</value>
+  </data>
+  <data name="ConfirmDoc" xml:space="preserve">
+    <value>Dokument bestätigen</value>
+  </data>
+  <data name="DocConfirmed" xml:space="preserve">
+    <value>Dokument bestätigt</value>
+  </data>
+  <data name="ConfirmAgree" xml:space="preserve">
+    <value>Durch Klick auf Abschließen bestätige ich, das Dokument gelesen und zur Kenntnis genommen zu haben.</value>
+  </data>
+  <data name="ConfirmedBy" xml:space="preserve">
+    <value>Bestätigt von</value>
+  </data>
+  <data name="ConfirmationProcessTitle" xml:space="preserve">
+    <value>Titel des Lesebetätigungs-Vorgangs</value>
+  </data>
+  <data name="Confirmations" xml:space="preserve">
+    <value>Bestätigungen</value>
+  </data>
 </root>

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

@@ -447,4 +447,34 @@
   <data name="DocumentReset" xml:space="preserve">
     <value>Document has been reset.</value>
   </data>
+  <data name="DocumentSuccessfullyConfirmed" xml:space="preserve">
+    <value>Document successfully red 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>
+  </data>
+  <data name="Confirm" xml:space="preserve">
+    <value>Confirm</value>
+  </data>
+  <data name="RejectionInfo1Confirmation" xml:space="preserve">
+    <value>This confirmation process has been rejected!</value>
+  </data>
+  <data name="ConfirmDoc" xml:space="preserve">
+    <value>Confirm Document</value>
+  </data>
+  <data name="DocConfirmed" xml:space="preserve">
+    <value>Document confirmed</value>
+  </data>
+  <data name="ConfirmAgree" xml:space="preserve">
+    <value>By clicking on “Complete”, I confirm that I have read and taken note of the document.</value>
+  </data>
+  <data name="ConfirmedBy" xml:space="preserve">
+    <value>Confirmed by</value>
+  </data>
+  <data name="ConfirmationProcessTitle" xml:space="preserve">
+    <value>Title of the read confirmation process</value>
+  </data>
+  <data name="Confirmations" xml:space="preserve">
+    <value>Confirmations</value>
+  </data>
 </root>

EnvelopeGenerator.Application/Resources/Resource.fr-FR.resx

@@ -447,4 +447,34 @@
   <data name="DocumentReset" xml:space="preserve">
     <value>Le document a été réinitialisé.</value>
   </data>
+  <data name="DocumentSuccessfullyConfirmed" xml:space="preserve">
+    <value>Document lu et confirmé avec succès !</value>
+  </data>
+  <data name="DocumentConfirmedConfirmationMessage" xml:space="preserve">
+    <value>Vous avez lu et confirmé le document. Vous recevrez une confirmation écrite par la suite.</value>
+  </data>
+  <data name="Confirm" xml:space="preserve">
+    <value>Confirmer</value>
+  </data>
+  <data name="RejectionInfo1Confirmation" xml:space="preserve">
+    <value>Cette procédure de confirmation a été rejetée !</value>
+  </data>
+  <data name="ConfirmDoc" xml:space="preserve">
+    <value>Confirmer le document</value>
+  </data>
+  <data name="DocConfirmed" xml:space="preserve">
+    <value>Document confirmé</value>
+  </data>
+  <data name="ConfirmAgree" xml:space="preserve">
+    <value>En cliquant sur « Terminer », je confirme avoir lu et pris connaissance du document.</value>
+  </data>
+  <data name="ConfirmedBy" xml:space="preserve">
+    <value>Confirmé par</value>
+  </data>
+  <data name="ConfirmationProcessTitle" xml:space="preserve">
+    <value>Titre de la procédure de confirmation de lecture</value>
+  </data>
+  <data name="Confirmations" xml:space="preserve">
+    <value>Confirmations</value>
+  </data>
 </root>

EnvelopeGenerator.Web/Controllers/EnvelopeController.cs

@@ -91,7 +91,7 @@ public class EnvelopeController : ViewControllerBase
             if (await _historyService.IsSigned(envelopeId: er.Envelope!.Id, userReference: er.Receiver!.EmailAddress))
             {
                 await HttpContext.SignOutAsync(CookieAuthenticationDefaults.AuthenticationScheme);
-                return View("EnvelopeSigned");
+                return View("EnvelopeSigned", er);
             }
             #endregion
 

EnvelopeGenerator.Web/Views/Envelope/EnvelopeRejected.cshtml

@@ -9,12 +9,14 @@
 @using EnvelopeGenerator.Web.Extensions
 @using Newtonsoft.Json
 @using Newtonsoft.Json.Serialization
+@using EnvelopeGenerator.Domain.Interfaces;
 @model EnvelopeReceiverDto;
 @{
 	var envelope = Model.Envelope;
 	var document = Model.Envelope?.Documents?.FirstOrDefault();
 	var sender = Model.Envelope?.User;
 	var isExt = ViewBag.IsExt ?? false;
+	bool IsReadAndConfirm = Model!.Envelope!.IsReadAndConfirm();
 }
 <div class="page container p-5">
     <header class="text-center">
@@ -54,7 +56,11 @@
 				c-5.791,5.79-15.176,5.79-20.969,0l-30.32-30.322l-11.676,11.676l30.32,30.32c5.79,5.79,5.79,15.178,0,20.969L299.11,404.045z"/>
 			</svg>
         </div>
-		<h1>@(isExt ? _localizer.RejectionInfo1Ext() : _localizer.RejectionInfo1())</h1>
+		<h1>@(isExt
+			? _localizer.RejectionInfo1Ext()
+			: IsReadAndConfirm
+				? _localizer.RejectionInfo1ForConfirmation()
+				: _localizer.RejectionInfo1())</h1>
     </header>
     <section class="text-center">
 		<div class="card-body p-0 m-0 ms-4">

EnvelopeGenerator.Web/Views/Envelope/EnvelopeSigned.cshtml

@@ -1,5 +1,11 @@
 @{
-    ViewData["Title"] = _localizer.DocSigned();
+    @using EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiver;
+    @using EnvelopeGenerator.Domain.Interfaces;
+    @model EnvelopeReceiverDto;
+    bool IsReadAndConfirm = Model!.Envelope!.IsReadAndConfirm();
+    ViewData["Title"] = IsReadAndConfirm
+        ? _localizer.DocConfirmed()
+        : _localizer.DocSigned();
 }
 <div class="page container p-5">
     <header class="text-center">
@@ -9,9 +15,13 @@
                 <path d="M15.354 3.354a.5.5 0 0 0-.708-.708L8 9.293 5.354 6.646a.5.5 0 1 0-.708.708l3 3a.5.5 0 0 0 .708 0l7-7z" />
             </svg>
         </div>
-        <h1>@_localizer["DocumentSuccessfullySigned"]</h1>
+        <h1>@(IsReadAndConfirm
+            ? _localizer["DocumentSuccessfullyConfirmed"]
+            : _localizer["DocumentSuccessfullySigned"])</h1>
     </header>
     <section class="text-center">
-        <p>@_localizer["DocumentSignedConfirmationMessage"]</p>
+        <p>@(IsReadAndConfirm
+            ? _localizer["DocumentConfirmedConfirmationMessage"]
+            : _localizer["DocumentSignedConfirmationMessage"])</p>
     </section>   
 </div>

EnvelopeGenerator.Web/Views/Envelope/ShowEnvelope.cshtml

@@ -9,6 +9,7 @@
 @using EnvelopeGenerator.Web.Extensions
 @using Newtonsoft.Json
 @using Newtonsoft.Json.Serialization
+@using EnvelopeGenerator.Domain.Interfaces
 @model EnvelopeReceiverDto;
 @{
     var userCulture = ViewData["UserCulture"] as Culture;
@@ -24,7 +25,13 @@
     if (ViewData["IsReadOnly"] is bool isReadOnly_bool)
         isReadOnly = isReadOnly_bool;
 
-    ViewData["Title"] = isReadOnly ? _localizer.ViewDoc() : _localizer.SignDoc();
+    var isReadAndConfirm = envelope.IsReadAndConfirm();
+
+    ViewData["Title"] = isReadOnly
+        ? _localizer.ViewDoc()
+        : isReadAndConfirm
+            ? _localizer.ConfirmDoc()
+            : _localizer.SignDoc();
 }
 <div class="envelope-view">
     @if (!isReadOnly)
@@ -62,7 +69,9 @@
                 <div class="progress-container">
                     <div id="signed-count-bar" class="progress"></div>
                     <span class="progress-text">
-                        <span id="signed-count">0</span>/<span id="signature-count">@signatureCount</span> @_localizer["Signatures"]
+                        <span id="signed-count">0</span>/<span id="signature-count">@signatureCount</span> @(isReadAndConfirm 
+                            ? _localizer["Confirmations"] 
+                            : _localizer["Signatures"])
                     </span>
                 </div>
                 }