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

Update progress bar to show Confirmations or Signatures
Progress bar label now displays "Confirmations" if isReadAndConfirm is true, otherwise it shows "Signatures". This improves clarity for users based on the envelope's required action.
2026-03-06 09:54:26 +01:00 · 2026-03-06 09:52:12 +01:00 · 2026-03-06 09:50:33 +01:00 · 2026-03-06 09:43:16 +01:00 · 2026-03-06 09:31:19 +01:00 · 2026-03-06 09:28:12 +01:00
5 changed files with 67 additions and 7 deletions
--- a/EnvelopeGenerator.Application/Resources/Resource.cs
+++ b/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>
--- a/EnvelopeGenerator.Web/Controllers/EnvelopeController.cs
+++ b/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

--- a/EnvelopeGenerator.Web/Views/Envelope/EnvelopeRejected.cshtml
+++ b/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">
--- a/EnvelopeGenerator.Web/Views/Envelope/EnvelopeSigned.cshtml
+++ b/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>
--- a/EnvelopeGenerator.Web/Views/Envelope/ShowEnvelope.cshtml
+++ b/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>
                }
Author	SHA1	Message	Date
TekH	9b042d8f45	Merge branch 'master' of http://git.dd:3000/AppStd/EnvelopeGenerator	2026-03-06 09:54:26 +01:00
TekH	f6d57b1e38	Update progress bar to show Confirmations or Signatures Progress bar label now displays "Confirmations" if isReadAndConfirm is true, otherwise it shows "Signatures". This improves clarity for users based on the envelope's required action.	2026-03-06 09:52:12 +01:00
TekH	b64d2b7478	Refactor: cache IsReadAndConfirm() result in variable Store envelope.IsReadAndConfirm() in isReadAndConfirm variable to avoid redundant calls and improve code readability when setting ViewData["Title"]. No change to logic or behavior.	2026-03-06 09:50:33 +01:00
TekH	44edef8ba1	Update envelope view title logic for confirm state Refined the logic for setting ViewData["Title"] in ShowEnvelope.cshtml. Now, if the envelope requires read and confirm, the title displays "Confirm Document" instead of just "Sign Document" or "View Document", providing clearer context for users.	2026-03-06 09:43:16 +01:00
TekH	647c5d2353	Add localization extensions for confirmation resources Added three new extension methods to the Extensions class in Resource.cs: ConfirmDoc, ConfirmAgree, and ConfirmationProcessTitle. Each method retrieves the localized value for its respective resource key and includes XML documentation, consistent with existing localization methods.	2026-03-06 09:31:19 +01:00
TekH	4ce1d2a370	Add RejectionInfo1ForConfirmation extension method Introduced a new extension method, RejectionInfo1ForConfirmation, to the Extensions class in Resource.cs. This method retrieves the localized string for "RejectionInfo1ForConfirmation" from an IStringLocalizer instance, providing functionality similar to the existing RejectionInfo1 method.	2026-03-06 09:28:12 +01:00
TekH	bcc53bf9f1	Update rejection header for read and confirm envelopes Add logic to display a specific rejection message when an envelope is rejected as part of a "read and confirm" process. The header now distinguishes between external, confirmation-related, and default rejection scenarios for improved user feedback.	2026-03-06 09:27:41 +01:00
TekH	f1e38e3bd3	Reverse IsReadAndConfirm logic for envelope status texts Swapped the display logic for localized titles and messages based on the IsReadAndConfirm flag. Now, "confirmed" texts are shown when IsReadAndConfirm is true, and "signed" texts when false. This update ensures correct status messaging throughout the envelope confirmation flow.	2026-03-06 09:17:17 +01:00
TekH	e095860b17	Update EnvelopeSigned page to handle confirm vs sign Add conditional logic to EnvelopeSigned.cshtml to display different headings and confirmation messages based on whether the document was signed or confirmed, using the IsReadAndConfirm flag. This improves user feedback by distinguishing between signing and confirming actions.	2026-03-06 01:25:07 +01:00
TekH	9cfc74aa88	Refactor title logic and fix localizer syntax in view Refactored EnvelopeSigned.cshtml to use a local variable for IsReadAndConfirm when setting the page title, improving readability. Also updated Razor syntax for localizer calls in <h1> and <p> elements to ensure correct evaluation and formatting.	2026-03-06 01:23:06 +01:00
TekH	7cd6ca3a5f	Update EnvelopeSigned view model and title logic Set model to EnvelopeReceiverDto and import required types. Update ViewData["Title"] to use DocSigned or DocConfirmed based on Envelope.IsReadAndConfirm() result.	2026-03-06 01:20:47 +01:00
TekH	9b660cb25a	Pass model to EnvelopeSigned view on already signed check Previously, the "EnvelopeSigned" view was returned without a model when an envelope was already signed. Now, the er model object is passed to the view to provide additional context or data.	2026-03-06 01:20:25 +01:00
TekH	3d43d1896d	Add DocConfirmed extension method to Resource.cs Added a new DocConfirmed extension method to the Extensions class in Resource.cs. This method enables retrieval of the "DocConfirmed" localized string via IStringLocalizer, similar to the existing DocSigned method.	2026-03-06 01:20:12 +01:00