From 1919c562ccc9a6cb12832506f560aa6bae85b8ed Mon Sep 17 00:00:00 2001 From: Developer 02 Date: Sat, 5 Oct 2024 03:20:39 +0200 Subject: [PATCH] =?UTF-8?q?feat(ShowEnvelope-View):=20ReadOnlyMessage=20wu?= =?UTF-8?q?rde=20f=C3=BCr=20verschiedene=20Kulturen=20erstellt.=20Zu=20Vie?= =?UTF-8?q?w=20hinzugef=C3=BCgt.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - View-Benutzernachrichten sind so organisiert, dass sie davon abhängen, ob der Umschlag schreibgeschützt ist oder nicht. --- .../Resources/Resource.de-DE.resx | 3 +++ .../Resources/Resource.en-US.resx | 3 +++ .../Controllers/HomeController.cs | 1 + .../Views/Home/ShowEnvelope.cshtml | 18 ++++++++++++++++++ 4 files changed, 25 insertions(+) diff --git a/EnvelopeGenerator.Application/Resources/Resource.de-DE.resx b/EnvelopeGenerator.Application/Resources/Resource.de-DE.resx index c7d98b63..7a39a3aa 100644 --- a/EnvelopeGenerator.Application/Resources/Resource.de-DE.resx +++ b/EnvelopeGenerator.Application/Resources/Resource.de-DE.resx @@ -177,6 +177,9 @@ Dokument erfordert einen Zugriffscode + + Weitergeleitet von {0}. Gültig bis {1}. + Ablehnen diff --git a/EnvelopeGenerator.Application/Resources/Resource.en-US.resx b/EnvelopeGenerator.Application/Resources/Resource.en-US.resx index 6cf39478..999c5ae8 100644 --- a/EnvelopeGenerator.Application/Resources/Resource.en-US.resx +++ b/EnvelopeGenerator.Application/Resources/Resource.en-US.resx @@ -177,6 +177,9 @@ Document requires an access code + + Forwarded by {0}. Valid until {1}. + Reject diff --git a/EnvelopeGenerator.Web/Controllers/HomeController.cs b/EnvelopeGenerator.Web/Controllers/HomeController.cs index 4bf469aa..c2fd5407 100644 --- a/EnvelopeGenerator.Web/Controllers/HomeController.cs +++ b/EnvelopeGenerator.Web/Controllers/HomeController.cs @@ -344,6 +344,7 @@ namespace EnvelopeGenerator.Web.Controllers ViewData["EnvelopeKey"] = envelopeKey; ViewData["DocumentBytes"] = bytes; ViewData["IsReadOnly"] = true; + ViewData["ReadOnly"] = erro; ViewData["PSPDFKitLicenseKey"] = _configuration["PSPDFKitLicenseKey"]; return View("ShowEnvelope", er); } diff --git a/EnvelopeGenerator.Web/Views/Home/ShowEnvelope.cshtml b/EnvelopeGenerator.Web/Views/Home/ShowEnvelope.cshtml index 96f33d1e..5cb56ee0 100644 --- a/EnvelopeGenerator.Web/Views/Home/ShowEnvelope.cshtml +++ b/EnvelopeGenerator.Web/Views/Home/ShowEnvelope.cshtml @@ -5,6 +5,7 @@ @using DigitalData.Core.DTO; @using EnvelopeGenerator.Application.DTOs; @using EnvelopeGenerator.Application.DTOs.EnvelopeReceiver +@using EnvelopeGenerator.Application.DTOs.EnvelopeReceiverReadOnly @using Newtonsoft.Json @using Newtonsoft.Json.Serialization @model EnvelopeReceiverDto; @@ -15,12 +16,16 @@ @{ var userCulture = ViewData["UserCulture"] as Culture; var envelope = Model.Envelope; + var receiver_name = Model.Name; var document = Model.Envelope?.Documents?.FirstOrDefault(); var sender = Model.Envelope?.User; var pages = document?.Elements?.Select(e => e.Page) ?? Array.Empty(); int? signatureCount = document?.Elements?.Count(); var stPageIndexes = string.Join(pages.Count() > 1 ? ", " : "", pages.Take(pages.Count() - 1)) + (pages.Count() > 1 ? $" {_localizer[WebKey.and].TrySanitize(_sanitizer)} " : "") + pages.LastOrDefault(); + var isReadOnly = false; + if (ViewData["IsReadOnly"] is bool isReadOnly_bool) + isReadOnly = isReadOnly_bool; }
@@ -57,7 +62,17 @@ logo

@($"{envelope?.Title}".TrySanitize(_sanitizer))

+ @if (isReadOnly) + { + var dateTimeSt = string.Empty; + if (ViewData["ReadOnly"] is EnvelopeReceiverReadOnlyDto readOnly) + dateTimeSt = readOnly.DateValid.ToLongDateString() + " - " + readOnly.DateValid.ToShortTimeString(); +
@string.Format(_localizer["ReadOnlyMessage"], receiver_name, dateTimeSt)
+ } + else + {
@($"{@envelope?.Message}".TrySanitize(_sanitizer))
+ }

@Html.Raw(string.Format(_localizer[WebKey.EnvelopeInfo2], /* sanitize separately but don't sanitize the URI */ @@ -70,12 +85,15 @@ sender?.Email.TrySanitize(_sanitizer)))

+ @if (!isReadOnly) + {
0/@signatureCount Unterschriften
+ }