AppStd/EnvelopeGenerator
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Refactor signature handling and PDF export logic

Browse Source 
Refactored the signature handling process by introducing a new
`Report` instance creation step in the `SignatureApplied` block
to streamline signed report generation. Added a validation check
in `ExportSignedPdfAsync` to ensure the `Report` object is not
null before proceeding with export. Removed redundant code for
manual signed report creation and simplified the export logic
by directly invoking `reportViewer!.ExportToAsync`. Incremented
`ViewerKey` to refresh the report viewer after signing.
This commit is contained in:
tekh
2026-05-31 08:01:10 +02:00
parent d97172b9cf
commit 697f85f805
1 changed files with 4 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
EnvelopeGenerator.ReceiverUI/Pages/ReportViewer.razor
View File

@@ -286,8 +286,10 @@
PopupValidationMessage = null; PopupValidationMessage = null;
SignatureValidationMessage = null; SignatureValidationMessage = null;
Report = CreateSignedReportInstance(signatureDataUrl, SignerFullName.Trim(), SignerPosition.Trim(), SignaturePlace.Trim());
SignatureApplied = true; SignatureApplied = true;
SignaturePopupVisible = false; SignaturePopupVisible = false;
ViewerKey++;
} }
async Task<string?> GetActiveSignatureDataUrlAsync() { async Task<string?> GetActiveSignatureDataUrlAsync() {
@@ -303,31 +305,14 @@
} }
async Task ExportSignedPdfAsync() { async Task ExportSignedPdfAsync() {
if(!SignatureApplied) { if(!SignatureApplied || Report is null) {
SignatureValidationMessage = "Bitte fuegen Sie die Unterschrift zuerst zum Bericht hinzu."; SignatureValidationMessage = "Bitte fuegen Sie die Unterschrift zuerst zum Bericht hinzu.";
return; return;
} }
try { try {
SignatureValidationMessage = null; SignatureValidationMessage = null;
await reportViewer!.ExportToAsync(ExportFormat.Pdf);
var signatureDataUrl = await GetActiveSignatureDataUrlAsync();
if(string.IsNullOrWhiteSpace(signatureDataUrl)) {
SignatureValidationMessage = "Die Unterschrift konnte nicht gelesen werden.";
return;
}
var signedKey = $"{EnvelopeKey}_signed";
var signedReport = new XtraReport();
var detail = new DevExpress.XtraReports.UI.DetailBand();
signedReport.Bands.Add(detail);
detail.Controls.Add(new DevExpress.XtraReports.UI.XRPdfContent { Source = PdfBytes });
ReportStorage.SetData(signedReport, signedKey);
Report = ReportStorage.TryGetReport(signedKey, out var stored) ? stored : signedReport;
ViewerKey++;
await InvokeAsync(StateHasChanged);
await Task.Delay(300);
await reportViewer.ExportToAsync(ExportFormat.Pdf);
} catch(Exception) { } catch(Exception) {
SignatureValidationMessage = "Das signierte PDF konnte nicht exportiert werden. Bitte laden Sie die Seite neu und versuchen Sie es erneut."; SignatureValidationMessage = "Das signierte PDF konnte nicht exportiert werden. Bitte laden Sie die Seite neu und versuchen Sie es erneut.";
} }