Fix: Add "Read and confirmed" label for RaC envelopes

Updated the Signature Certificate report to display the correct label "Read and confirmed" for "Read and Sign" envelopes. - Added `DocumentSignedRaC` resource key to `Model.resx` and `Model.en.resx` with localized values ("Gelesen und bestätigt" and "Read and confirmed"). - Updated `ReportItem.vb` to include conditional logic in `ItemStatusTranslated` for "Read and Sign" envelopes. - Added strongly-typed property for `DocumentSignedRaC` in `Model.Designer.cs`. - Updated `fix-report-label-read-and-confirmed.md` documentation to reflect changes, including testing steps and task completion. These changes ensure accurate status labels in the report for different envelope types.
2026-08-24 14:31:40 +02:00
parent ffb9e07466
commit f9cfcf1f19
6 changed files with 39 additions and 13 deletions
--- a/EnvelopeGenerator.CommonServices/Jobs/FinalizeDocument/ReportItem.vb
+++ b/EnvelopeGenerator.CommonServices/Jobs/FinalizeDocument/ReportItem.vb
@@ -1,5 +1,6 @@
 Imports EnvelopeGenerator.Domain.Constants
 Imports EnvelopeGenerator.Domain.Entities
+Imports EnvelopeGenerator.Domain.Interfaces

 Public Class ReportItem

@@ -11,8 +12,15 @@ Public Class ReportItem
    Public Property ItemStatus As EnvelopeStatus
    Public ReadOnly Property ItemStatusTranslated As String
        Get
-            Dim oStatus = ItemStatus.ToString()
-            Return My.Resources.Model.ResourceManager.GetString(oStatus)
+            Dim oStatusKey = ItemStatus.ToString()
+
+            If ItemStatus = EnvelopeStatus.DocumentSigned AndAlso
+               Envelope IsNot Nothing AndAlso
+               Envelope.IsReadAndConfirm() Then
+                oStatusKey = "DocumentSignedRaC"
+            End If
+
+            Return My.Resources.Model.ResourceManager.GetString(oStatusKey)
        End Get
    End Property

--- a/EnvelopeGenerator.CommonServices/Strings/Model.en.resx
+++ b/EnvelopeGenerator.CommonServices/Strings/Model.en.resx
@@ -168,6 +168,9 @@
  <data name="DocumentSigned" xml:space="preserve">
    <value>Document signed</value>
  </data>
+  <data name="DocumentSignedRaC" xml:space="preserve">
+    <value>Read and confirmed</value>
+  </data>
  <data name="Draft" xml:space="preserve">
    <value>Draft</value>
  </data>
--- a/EnvelopeGenerator.CommonServices/Strings/Model.resx
+++ b/EnvelopeGenerator.CommonServices/Strings/Model.resx
@@ -168,6 +168,9 @@
  <data name="DocumentSigned" xml:space="preserve">
    <value>Dokument unterzeichnet</value>
  </data>
+  <data name="DocumentSignedRaC" xml:space="preserve">
+    <value>Gelesen und bestätigt</value>
+  </data>
  <data name="Draft" xml:space="preserve">
    <value>Entwurf</value>
  </data>
--- a/EnvelopeGenerator.Domain/Resources/Model.Designer.cs
+++ b/EnvelopeGenerator.Domain/Resources/Model.Designer.cs
@@ -213,6 +213,15 @@ namespace My.Resources {
            }
        }
        
+        /// <summary>
+        ///   Looks up a localized string similar to Gelesen und bestätigt.
+        /// </summary>
+        public static string DocumentSignedRaC {
+            get {
+                return ResourceManager.GetString("DocumentSignedRaC", resourceCulture);
+            }
+        }
+        
        /// <summary>
        ///   Looks up a localized string similar to Entwurf.
        /// </summary>
--- a/EnvelopeGenerator.Domain/Resources/Model.resx
+++ b/EnvelopeGenerator.Domain/Resources/Model.resx
@@ -168,6 +168,9 @@
  <data name="DocumentSigned" xml:space="preserve">
    <value>Dokument unterzeichnet</value>
  </data>
+  <data name="DocumentSignedRaC" xml:space="preserve">
+    <value>Gelesen und bestätigt</value>
+  </data>
  <data name="Draft" xml:space="preserve">
    <value>Entwurf</value>
  </data>
--- a/fix-report-label-read-and-confirmed.md
+++ b/fix-report-label-read-and-confirmed.md
@@ -1,7 +1,7 @@
 # Fix: Report Label "Read and confirmed" for Read and Sign Envelopes

 ## Status
-?? **IN PROGRESS**
+✅ **COMPLETED**

 ## Git Branch
 ```
@@ -13,11 +13,11 @@ fix/report-label-read-and-confirmed
 ## Problem

 In the **Signature Certificate report** (`Signierungszertifikat`), the history event
-list always showed **"Document signed"** for status `DocumentSigned` (code `2005`) —
+list always showed **"Document signed"** for status `DocumentSigned` (code `2005`) <EFBFBD>
 even when the envelope type was **"Read and Sign"** (`EnvelopeTypeId = 2`).

 For "Read and Sign" envelopes the correct label must be **"Read and confirmed"**
-(DE: **"Gelesen und bestätigt"**).
+(DE: **"Gelesen und best<EFBFBD>tigt"**).

 ### Screenshot reference
 The report shows a table with columns *Ereignis | Benutzer | Zeitstempel*.  
@@ -57,7 +57,7 @@ Read-and-Sign label variants across all resource files:

 | Resource file | Value |
 |---|---|
-| `Model.resx` (DE, default) | `Gelesen und bestätigt` |
+| `Model.resx` (DE, default) | `Gelesen und best<EFBFBD>tigt` |
 | `Model.en.resx` (EN) | `Read and confirmed` |

 ### Logic change in `ReportItem.vb`
@@ -89,10 +89,10 @@ when `EnvelopeTypeId == 2`.
 | # | File | Change | Status |
 |---|---|---|---|
 | 1 | `EnvelopeGenerator.CommonServices\Jobs\FinalizeDocument\ReportItem.vb` | Added `RaC` branching logic to `ItemStatusTranslated` | ? Done |
-| 2 | `EnvelopeGenerator.Domain\Resources\Model.resx` | Added `DocumentSignedRaC` = `Gelesen und bestätigt` | ?? Pending |
-| 3 | `EnvelopeGenerator.CommonServices\Strings\Model.resx` | Added `DocumentSignedRaC` = `Gelesen und bestätigt` | ?? Pending |
-| 4 | `EnvelopeGenerator.CommonServices\Strings\Model.en.resx` | Added `DocumentSignedRaC` = `Read and confirmed` | ?? Pending |
-| 5 | `EnvelopeGenerator.Domain\Resources\Model.Designer.cs` | Added `DocumentSignedRaC` strongly-typed property | ?? Pending |
+| 2 | `EnvelopeGenerator.Domain\Resources\Model.resx` | Added `DocumentSignedRaC` = `Gelesen und bestätigt` | ✅ Done |
+| 3 | `EnvelopeGenerator.CommonServices\Strings\Model.resx` | Added `DocumentSignedRaC` = `Gelesen und bestätigt` | ✅ Done |
+| 4 | `EnvelopeGenerator.CommonServices\Strings\Model.en.resx` | Added `DocumentSignedRaC` = `Read and confirmed` | ✅ Done |
+| 5 | `EnvelopeGenerator.Domain\Resources\Model.Designer.cs` | Added `DocumentSignedRaC` strongly-typed property | ✅ Done |

 ---

@@ -104,7 +104,7 @@ Each file needs one new `<data>` block inserted **directly after** the existing

 ```xml
 <data name="DocumentSignedRaC" xml:space="preserve">
-  <value>Gelesen und bestätigt</value>   <!-- DE files -->
+  <value>Gelesen und best<EFBFBD>tigt</value>   <!-- DE files -->
  <!-- OR -->
  <value>Read and confirmed</value>       <!-- EN file -->
 </data>
@@ -115,7 +115,7 @@ Each file needs one new `<data>` block inserted **directly after** the existing

 ```csharp
 /// <summary>
-///   Looks up a localized string similar to Gelesen und bestätigt.
+///   Looks up a localized string similar to Gelesen und best<EFBFBD>tigt.
 /// </summary>
 public static string DocumentSignedRaC {
    get {
@@ -131,5 +131,5 @@ public static string DocumentSignedRaC {
 After changes, generate a Signature Certificate report for a **Read and Sign**
 envelope and verify:
 - History row with status 2005 shows **"Read and confirmed"** (EN)
- History row with status 2005 shows **"Gelesen und bestätigt"** (DE)
+- History row with status 2005 shows **"Gelesen und best<EFBFBD>tigt"** (DE)
 - Regular (non-RaC) envelopes still show **"Document signed"** / **"Dokument unterzeichnet"**