From 1584fd6f1ca366cefd4a2a82bc96ae90b9160738 Mon Sep 17 00:00:00 2001 From: Developer 02 Date: Mon, 8 Apr 2024 16:39:02 +0200 Subject: [PATCH] =?UTF-8?q?feat:=20Begr=C3=BC=C3=9Fung=20und=20Dokumentdet?= =?UTF-8?q?ails=20auf=20Umschlagseite=20aktualisiert?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Contracts/IEnvelopeService.cs | 2 +- .../Services/EnvelopeService.cs | 4 ++-- .../Contracts/IEnvelopeRepository.cs | 2 +- .../Repositories/EnvelopeRepository.cs | 8 ++++---- EnvelopeGenerator.Web/Controllers/HomeController.cs | 2 +- EnvelopeGenerator.Web/Views/Home/ShowEnvelope.cshtml | 12 +++++++----- 6 files changed, 16 insertions(+), 14 deletions(-) diff --git a/EnvelopeGenerator.Application/Contracts/IEnvelopeService.cs b/EnvelopeGenerator.Application/Contracts/IEnvelopeService.cs index 61008265..6ce6d9e3 100644 --- a/EnvelopeGenerator.Application/Contracts/IEnvelopeService.cs +++ b/EnvelopeGenerator.Application/Contracts/IEnvelopeService.cs @@ -9,6 +9,6 @@ namespace EnvelopeGenerator.Application.Contracts { Task>> ReadAllWithAsync(bool documents = false, bool receivers = false, bool history = false, bool documentReceiverElement = false); - Task> ReadByUuidAsync(string uuid, string? signature = null, bool withDocuments = false, bool withReceivers = false, bool withHistory = false, bool withDocumentReceiverElement = false); + Task> ReadByUuidAsync(string uuid, string? signature = null, bool withDocuments = false, bool withReceivers = false, bool withHistory = false, bool withDocumentReceiverElement = false, bool withAll = false); } } \ No newline at end of file diff --git a/EnvelopeGenerator.Application/Services/EnvelopeService.cs b/EnvelopeGenerator.Application/Services/EnvelopeService.cs index 4974cb9b..efd6055f 100644 --- a/EnvelopeGenerator.Application/Services/EnvelopeService.cs +++ b/EnvelopeGenerator.Application/Services/EnvelopeService.cs @@ -23,9 +23,9 @@ namespace EnvelopeGenerator.Application.Services return Successful(readDto); } - public async Task> ReadByUuidAsync(string uuid, string? signature = null, bool withDocuments = false, bool withReceivers = false, bool withHistory = false, bool withDocumentReceiverElement = false) + public async Task> ReadByUuidAsync(string uuid, string? signature = null, bool withDocuments = false, bool withReceivers = false, bool withHistory = false, bool withDocumentReceiverElement = false, bool withAll = false) { - var envelope = await _repository.ReadByUuidAsync(uuid: uuid, signature: signature, withDocuments: withDocuments, withReceivers: withReceivers, withHistory: withHistory, withDocumentReceiverElement: withDocumentReceiverElement); + var envelope = await _repository.ReadByUuidAsync(uuid: uuid, signature: signature, withDocuments: withDocuments, withReceivers: withReceivers, withHistory: withHistory, withDocumentReceiverElement: withDocumentReceiverElement, withAll:withAll); if (envelope is null) return Failed(); diff --git a/EnvelopeGenerator.Infrastructure/Contracts/IEnvelopeRepository.cs b/EnvelopeGenerator.Infrastructure/Contracts/IEnvelopeRepository.cs index 6a595b97..132c7d06 100644 --- a/EnvelopeGenerator.Infrastructure/Contracts/IEnvelopeRepository.cs +++ b/EnvelopeGenerator.Infrastructure/Contracts/IEnvelopeRepository.cs @@ -7,6 +7,6 @@ namespace EnvelopeGenerator.Infrastructure.Contracts { Task> ReadAllWithAsync(bool documents = false, bool receivers = false, bool history = false, bool documentReceiverElement = true); - Task ReadByUuidAsync(string uuid, string? signature = null, bool withDocuments = false, bool withReceivers = false, bool withHistory = false, bool withDocumentReceiverElement = false); + Task ReadByUuidAsync(string uuid, string? signature = null, bool withDocuments = false, bool withReceivers = false, bool withHistory = false, bool withDocumentReceiverElement = false, bool withAll = false); } } \ No newline at end of file diff --git a/EnvelopeGenerator.Infrastructure/Repositories/EnvelopeRepository.cs b/EnvelopeGenerator.Infrastructure/Repositories/EnvelopeRepository.cs index 56cd6c53..7629f3b0 100644 --- a/EnvelopeGenerator.Infrastructure/Repositories/EnvelopeRepository.cs +++ b/EnvelopeGenerator.Infrastructure/Repositories/EnvelopeRepository.cs @@ -31,23 +31,23 @@ namespace EnvelopeGenerator.Infrastructure.Repositories return await query.ToListAsync(); } - public async Task ReadByUuidAsync(string uuid, string? signature = null, bool withDocuments = false, bool withReceivers = false, bool withHistory = false, bool withDocumentReceiverElement = false) + public async Task ReadByUuidAsync(string uuid, string? signature = null, bool withDocuments = false, bool withReceivers = false, bool withHistory = false, bool withDocumentReceiverElement = false, bool withAll = false) { var query = _dbSet.Where(e => e.Uuid == uuid); if (signature is not null) query = query.Where(e => e.Receivers != null && e.Receivers.Any(er => er.Receiver != null && er.Receiver.Signature == signature)); - if (withDocuments) + if (withAll || withDocuments) if (withDocumentReceiverElement) query = query.Include(e => e.Documents!).ThenInclude(d => d.Elements); else query = query.Include(e => e.Documents); - if (withReceivers) + if (withAll || withReceivers) query = query.Include(e => e.Receivers!).ThenInclude(er => er.Receiver); - if (withHistory) + if (withAll || withHistory) query = query.Include(e => e.History); return await query.FirstOrDefaultAsync(); diff --git a/EnvelopeGenerator.Web/Controllers/HomeController.cs b/EnvelopeGenerator.Web/Controllers/HomeController.cs index 7378374c..156fcccc 100644 --- a/EnvelopeGenerator.Web/Controllers/HomeController.cs +++ b/EnvelopeGenerator.Web/Controllers/HomeController.cs @@ -80,7 +80,7 @@ namespace EnvelopeGenerator.Web.Controllers if (verification.IsSuccess) { - var envelope = await _envelopeService.ReadByUuidAsync(decodedId.EnvelopeUuid, decodedId.ReceiverSignature, true, true, true); + var envelope = await _envelopeService.ReadByUuidAsync(uuid: decodedId.EnvelopeUuid, signature: decodedId.ReceiverSignature, withAll:true); database.Services.actionService.EnterCorrectAccessCode(response.Envelope, response.Receiver); //for history ViewData["EnvelopeKey"] = envelopeReceiverId; ViewData["EnveResponse"] = response; diff --git a/EnvelopeGenerator.Web/Views/Home/ShowEnvelope.cshtml b/EnvelopeGenerator.Web/Views/Home/ShowEnvelope.cshtml index f91fc506..68502d18 100644 --- a/EnvelopeGenerator.Web/Views/Home/ShowEnvelope.cshtml +++ b/EnvelopeGenerator.Web/Views/Home/ShowEnvelope.cshtml @@ -7,8 +7,10 @@ @if (Model.IsSuccess && Model.Data is not null) { var envelope = Model.Data; - var defaultDocument = envelope.Documents?.FirstOrDefault(); - var pages = defaultDocument?.Elements?.Select(e => e.Page) ?? Array.Empty(); + var document = envelope.Documents?.FirstOrDefault(); + var receiver = envelope.Receivers?.FirstOrDefault(); + var receiverName = receiver?.Name ?? string.Empty; + var pages = document?.Elements?.Select(e => e.Page) ?? Array.Empty(); var stPageIndexes = string.Join(pages.Count() > 1 ? ", " : "", pages.Take(pages.Count() - 1)) + (pages.Count() > 1 ? " und " : "") + pages.LastOrDefault(); @@ -17,7 +19,7 @@ -
@envelope.Message
+
@($"Hallo {receiverName}, {@envelope.Message}")
...
@@ -32,8 +34,8 @@
-
@envelope.Title
-

@($"Sie haben {(pages.Count())} Briefe zu unterschreiben. Bitte prüfen Sie die Seiten {stPageIndexes}.")

+
@($"{envelope.Title}")
+

@($"Sie haben {(pages.Count())} Briefe zu unterschreiben. Bitte prüfen Sie die Seiten {stPageIndexes}.")

Erstellt am @envelope.AddedWhen