From f9cfcf1f197ae05c00d669768068257dc97ccc5f Mon Sep 17 00:00:00 2001 From: TekH Date: Mon, 24 Aug 2026 14:31:40 +0200 Subject: [PATCH] Fix: Add "Read and confirmed" label for RaC envelopes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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. --- .../Jobs/FinalizeDocument/ReportItem.vb | 12 ++++++++-- .../Strings/Model.en.resx | 3 +++ .../Strings/Model.resx | 3 +++ .../Resources/Model.Designer.cs | 9 ++++++++ EnvelopeGenerator.Domain/Resources/Model.resx | 3 +++ fix-report-label-read-and-confirmed.md | 22 +++++++++---------- 6 files changed, 39 insertions(+), 13 deletions(-) diff --git a/EnvelopeGenerator.CommonServices/Jobs/FinalizeDocument/ReportItem.vb b/EnvelopeGenerator.CommonServices/Jobs/FinalizeDocument/ReportItem.vb index 411162d5..ebe7a979 100644 --- 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 diff --git a/EnvelopeGenerator.CommonServices/Strings/Model.en.resx b/EnvelopeGenerator.CommonServices/Strings/Model.en.resx index 968bdc87..ce64c72f 100644 --- a/EnvelopeGenerator.CommonServices/Strings/Model.en.resx +++ b/EnvelopeGenerator.CommonServices/Strings/Model.en.resx @@ -168,6 +168,9 @@ Document signed + + Read and confirmed + Draft diff --git a/EnvelopeGenerator.CommonServices/Strings/Model.resx b/EnvelopeGenerator.CommonServices/Strings/Model.resx index 55a32cb7..aed48c9c 100644 --- a/EnvelopeGenerator.CommonServices/Strings/Model.resx +++ b/EnvelopeGenerator.CommonServices/Strings/Model.resx @@ -168,6 +168,9 @@ Dokument unterzeichnet + + Gelesen und bestätigt + Entwurf diff --git a/EnvelopeGenerator.Domain/Resources/Model.Designer.cs b/EnvelopeGenerator.Domain/Resources/Model.Designer.cs index 5708d48d..700eafb1 100644 --- a/EnvelopeGenerator.Domain/Resources/Model.Designer.cs +++ b/EnvelopeGenerator.Domain/Resources/Model.Designer.cs @@ -213,6 +213,15 @@ namespace My.Resources { } } + /// + /// Looks up a localized string similar to Gelesen und bestätigt. + /// + public static string DocumentSignedRaC { + get { + return ResourceManager.GetString("DocumentSignedRaC", resourceCulture); + } + } + /// /// Looks up a localized string similar to Entwurf. /// diff --git a/EnvelopeGenerator.Domain/Resources/Model.resx b/EnvelopeGenerator.Domain/Resources/Model.resx index 3c18817d..1712d3b2 100644 --- a/EnvelopeGenerator.Domain/Resources/Model.resx +++ b/EnvelopeGenerator.Domain/Resources/Model.resx @@ -168,6 +168,9 @@ Dokument unterzeichnet + + Gelesen und bestätigt + Entwurf diff --git a/fix-report-label-read-and-confirmed.md b/fix-report-label-read-and-confirmed.md index c0b05970..a4966063 100644 --- 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`) � 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�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�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 `` block inserted **directly after** the existing ```xml - Gelesen und bestätigt + Gelesen und best�tigt Read and confirmed @@ -115,7 +115,7 @@ Each file needs one new `` block inserted **directly after** the existing ```csharp /// -/// Looks up a localized string similar to Gelesen und bestätigt. +/// Looks up a localized string similar to Gelesen und best�tigt. /// 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�tigt"** (DE) - Regular (non-RaC) envelopes still show **"Document signed"** / **"Dokument unterzeichnet"**