Refactor and enhance PDF finalization process

- Added new imports to integrate additional services.
- Renamed `envelope` to `oEnvelopeEntity` for clarity.
- Improved envelope retrieval logic and error handling.
- Refactored `ReadOnly` envelope handling for readability.
- Reintroduced and enhanced annotation processing logic.
- Updated `BurnAnnotsToPDF` call with better logging.
- Added envelope domain model loading for report creation.
- Implemented signing certificate report generation.
- Merged burned document with signing certificate report.
- Updated output file naming and adjusted save logic.
- Improved method structure with clear steps and logging.

EnvelopeGenerator.BBTests/frmFinalizePDF.vb

@@ -1,6 +1,7 @@
 Imports System.IO
 Imports DigitalData.Modules.Database
 Imports DigitalData.Modules.Logging
+Imports EnvelopeGenerator.CommonServices
 Imports EnvelopeGenerator.CommonServices.Jobs
 Imports EnvelopeGenerator.CommonServices.Jobs.FinalizeDocument
 Imports GdPicture14
@@ -145,64 +146,91 @@ Public Class frmFinalizePDF
             log.AppendLine($"Document bytes: {oBuffer.Length}")
 
             ' 3. Check what BurnAnnotsToPDF will do internally
+            Dim oEnvelopeEntity As Envelope = Nothing
             Using scope = Factory.Shared.ScopeFactory.CreateScope()
                 Dim envRepo = scope.ServiceProvider.Repository(Of Envelope)()
-                Dim envelope = envRepo.Where(Function(env) env.Id = envelopeId).FirstOrDefault()
+                oEnvelopeEntity = envRepo.Where(Function(env) env.Id = envelopeId).FirstOrDefault()
 
-                If envelope Is Nothing Then
+                If oEnvelopeEntity Is Nothing Then
                     log.AppendLine("ERROR: Envelope not found in EF Core!")
                     txtResult.Text = log.ToString()
                     Return
                 End If
 
-                log.AppendLine($"Envelope found: Id={envelope.Id}, EnvelopeTypeId={envelope.EnvelopeTypeId}")
-                log.AppendLine($"ReadOnly (IsReadAndConfirm): {envelope.ReadOnly}")
+                log.AppendLine($"Envelope found: Id={oEnvelopeEntity.Id}, EnvelopeTypeId={oEnvelopeEntity.EnvelopeTypeId}")
+                log.AppendLine($"ReadOnly (IsReadAndConfirm): {oEnvelopeEntity.ReadOnly}")
 
-                If envelope.ReadOnly Then
-                    log.AppendLine(">>> EARLY RETURN: ReadOnly=True, original PDF returned without burning")
-                    txtResult.Text = log.ToString()
-                    Return
-                End If
-
-                Dim sigRepo = scope.ServiceProvider.Repository(Of DocReceiverElement)()
-                Dim elements = sigRepo _
-                    .Where(Function(sig) sig.Document.EnvelopeId = envelopeId) _
-                    .Include(Function(sig) sig.Annotations) _
-                    .ToList()
-
-                log.AppendLine($"Elements (Signature) count: {elements.Count}")
-
-                If elements.Any() Then
-                    log.AppendLine(">>> PATH: BurnElementAnnotsToPDF (new element-based path)")
-                    For Each elem In elements
-                        Dim annotCount = If(elem.Annotations IsNot Nothing, elem.Annotations.Count(), 0)
-                        log.AppendLine($"  Element Id={elem.Id}, Page={elem.Page}, X={elem.X}, Y={elem.Y}, W={elem.Width}, H={elem.Height}, Annotations={annotCount}")
-                        If elem.Annotations IsNot Nothing Then
-                            For Each annot In elem.Annotations
-                                log.AppendLine($"    Annot: Name={annot.Name}, Type={annot.Type}, X={annot.X}, Y={annot.Y}, W={annot.Width}, H={annot.Height}")
-                            Next
-                        End If
-                    Next
+                If oEnvelopeEntity.ReadOnly Then
+                    log.AppendLine(">>> ReadOnly=True: original PDF will be used without burning (annotations skipped)")
                 Else
-                    log.AppendLine(">>> PATH: BurnInstantJSONAnnotsToPDF (old JSON-based path)")
+                    Dim sigRepo = scope.ServiceProvider.Repository(Of DocReceiverElement)()
+                    Dim elements = sigRepo _
+                        .Where(Function(sig) sig.Document.EnvelopeId = envelopeId) _
+                        .Include(Function(sig) sig.Annotations) _
+                        .ToList()
+
+                    log.AppendLine($"Elements (Signature) count: {elements.Count}")
+
+                    If elements.Any() Then
+                        log.AppendLine(">>> PATH: BurnElementAnnotsToPDF (new element-based path)")
+                        For Each elem In elements
+                            Dim annotCount = If(elem.Annotations IsNot Nothing, elem.Annotations.Count(), 0)
+                            log.AppendLine($"  Element Id={elem.Id}, Page={elem.Page}, X={elem.X}, Y={elem.Y}, W={elem.Width}, H={elem.Height}, Annotations={annotCount}")
+                            If elem.Annotations IsNot Nothing Then
+                                For Each annot In elem.Annotations
+                                    log.AppendLine($"    Annot: Name={annot.Name}, Type={annot.Type}, X={annot.X}, Y={annot.Y}, W={annot.Width}, H={annot.Height}")
+                                Next
+                            End If
+                        Next
+                    Else
+                        log.AppendLine(">>> PATH: BurnInstantJSONAnnotsToPDF (old JSON-based path)")
+                    End If
                 End If
             End Using
 
-            ' 4. Actually call BurnAnnotsToPDF (same as Service)
+            ' 4. Burn annotations (ReadOnly envelopes return original PDF unchanged)
             log.AppendLine("")
             log.AppendLine("Calling BurnAnnotsToPDF...")
-            Dim oNewBuffer = PDFBurner.BurnAnnotsToPDF(oBuffer, oJsonList, envelopeId)
-            log.AppendLine($"Result bytes: {oNewBuffer.Length}")
-            log.AppendLine($"Same as input: {oBuffer.Length = oNewBuffer.Length AndAlso oBuffer.SequenceEqual(oNewBuffer)}")
+            Dim oBurnedBuffer As Byte() = PDFBurner.BurnAnnotsToPDF(oBuffer, oJsonList, envelopeId)
+            log.AppendLine($"Burned bytes: {oBurnedBuffer.Length}")
+            log.AppendLine($"Unchanged (ReadOnly): {oBuffer.Length = oBurnedBuffer.Length AndAlso oBuffer.SequenceEqual(oBurnedBuffer)}")
 
-            ' 5. Write output
+            ' 5. Build State and load Envelope domain model for ReportCreator
+            log.AppendLine("")
+            log.AppendLine("Loading envelope domain model for report...")
+            Dim oState As New State() With {
+                .Database = Database,
+                .LogConfig = LogConfig
+            }
+            Dim oEnvelopeModel As New EnvelopeModel(oState)
+            Dim oEnvelope = oEnvelopeModel.GetById(envelopeId)
+            If oEnvelope Is Nothing Then
+                log.AppendLine("ERROR: Envelope not found via EnvelopeModel!")
+                txtResult.Text = log.ToString()
+                Return
+            End If
+            log.AppendLine($"Envelope loaded: {oEnvelope.Id}")
+
+            ' 6. Create signing certificate report
+            log.AppendLine("Creating signing certificate report...")
+            Dim oReportCreator As New ReportCreator(LogConfig, oState)
+            Dim oReportBuffer As Byte() = oReportCreator.CreateReport(oEnvelope)
+            log.AppendLine($"Report bytes: {oReportBuffer.Length}")
+
+            ' 7. Merge burned document + report (last page)
+            log.AppendLine("Merging documents...")
+            Dim oMerger As New PDFMerger(LogConfig, pGDPictureLicenseKey)
+            Dim oMergedBuffer As Byte() = oMerger.MergeDocuments(oBurnedBuffer, oReportBuffer)
+            log.AppendLine($"Merged bytes: {oMergedBuffer.Length}")
+
+            ' 8. Save and open
             Dim desktopPath As String = Environment.GetFolderPath(Environment.SpecialFolder.Desktop)
-            Dim oNewPath = Path.Combine(desktopPath, $"E{txtEnvelope.Text}_FullTest.burned.pdf")
-            File.WriteAllBytes(oNewPath, oNewBuffer)
-            log.AppendLine($"Output: {oNewPath}")
+            Dim oMergedPath = Path.Combine(desktopPath, $"E{txtEnvelope.Text}_FullTest.merged.pdf")
+            File.WriteAllBytes(oMergedPath, oMergedBuffer)
+            log.AppendLine($"Output: {oMergedPath}")
 
             txtResult.Text = log.ToString()
-            Process.Start(oNewPath)
+            Process.Start(oMergedPath)
 
         Catch ex As Exception
             txtResult.Text = $"ERROR: {ex.Message}{vbCrLf}{vbCrLf}{ex.ToString()}"

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
 

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>

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>

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>

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>

EnvelopeGenerator.sln

@@ -22,6 +22,7 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{134D4164-B291-4E19-99B9-E4FA3AFAB62C}"
 	ProjectSection(SolutionItems) = preProject
 		COPILOT_CONTEXT.md = COPILOT_CONTEXT.md
+		fix-report-label-read-and-confirmed.md = fix-report-label-read-and-confirmed.md
 		FORM_APPLICATION_CONTEXT.md = FORM_APPLICATION_CONTEXT.md
 		RECEIVER_PDF_VIEWER_CONTEXT.md = RECEIVER_PDF_VIEWER_CONTEXT.md
 	EndProjectSection

fix-report-label-read-and-confirmed.md

@@ -0,0 +1,135 @@
+# Fix: Report Label "Read and confirmed" for Read and Sign Envelopes
+
+## Status
+✅ **COMPLETED**
+
+## Git Branch
+```
+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`) <20>
+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<73>tigt"**).
+
+### Screenshot reference
+The report shows a table with columns *Ereignis | Benutzer | Zeitstempel*.  
+The row with status 2005 displayed "Document signed" where "Read and confirmed"
+was expected.
+
+---
+
+## Root Cause
+
+`ReportItem.ItemStatusTranslated` in
+`EnvelopeGenerator.CommonServices\Jobs\FinalizeDocument\ReportItem.vb`
+resolved the display label by calling:
+
+```vb
+My.Resources.Model.ResourceManager.GetString(ItemStatus.ToString())
+```
+
+There was **no branching logic** to handle the Read and Sign envelope type.
+The same `DocumentSigned` key was always used regardless of envelope type.
+
+---
+
+## Solution
+
+### Convention followed
+The project already uses a `RaC` (**R**ead **a**nd **C**onfirm) suffix for
+Read-and-Sign label variants across all resource files:
+
+| Existing RaC keys |
+|---|
+| `DocumentRejectedRaC` |
+| `EnvelopeReportCreatedRaC` |
+| `MessageConfirmationSentRaC` |
+
+### New resource key added: `DocumentSignedRaC`
+
+| Resource file | Value |
+|---|---|
+| `Model.resx` (DE, default) | `Gelesen und best<73>tigt` |
+| `Model.en.resx` (EN) | `Read and confirmed` |
+
+### Logic change in `ReportItem.vb`
+
+```vb
+Public ReadOnly Property ItemStatusTranslated As String
+    Get
+        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
+```
+
+`Envelope.IsReadAndConfirm()` is defined in
+`EnvelopeGenerator.Domain\Interfaces\IEnvelope.cs` and returns `true`
+when `EnvelopeTypeId == 2`.
+
+---
+
+## Files Changed
+
+| # | 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` | ✅ 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 |
+
+---
+
+## How to resume (for next agent)
+
+All pending items are **resource file additions only**.  
+Each file needs one new `<data>` block inserted **directly after** the existing
+`DocumentSigned` entry:
+
+```xml
+<data name="DocumentSignedRaC" xml:space="preserve">
+  <value>Gelesen und best<73>tigt</value>   <!-- DE files -->
+  <!-- OR -->
+  <value>Read and confirmed</value>       <!-- EN file -->
+</data>
+```
+
+`Model.Designer.cs` also needs a new strongly-typed property added after
+`DocumentSigned`:
+
+```csharp
+/// <summary>
+///   Looks up a localized string similar to Gelesen und best<73>tigt.
+/// </summary>
+public static string DocumentSignedRaC {
+    get {
+        return ResourceManager.GetString("DocumentSignedRaC", resourceCulture);
+    }
+}
+```
+
+---
+
+## Testing
+
+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<73>tigt"** (DE)
+- Regular (non-RaC) envelopes still show **"Document signed"** / **"Dokument unterzeichnet"**