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

Fehler behoben: Signaturfilter in Envelope.Documents.Elements in EnvelopeReceiverRepository hinzugefügt

Browse Source
This commit is contained in:
Developer 02 2024-05-22 15:48:37 +02:00
parent a6635f4a20
commit 1f4cf54406
4 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
EnvelopeGenerator.Infrastructure/Repositories/EnvlopeReceiverRepository.cs
View File

@ -25,7 +25,7 @@ namespace EnvelopeGenerator.Infrastructure.Repositories
if (withEnvelope) if (withEnvelope)
query = query query = query
.Include(er => er.Envelope).ThenInclude(e => e!.Documents!).ThenInclude(d => d.Elements) .Include(er => er.Envelope).ThenInclude(e => e!.Documents!).ThenInclude(d => d.Elements!.Where(e => signature == null || e.Receiver!.Signature == signature))
.Include(er => er.Envelope).ThenInclude(e => e!.History) .Include(er => er.Envelope).ThenInclude(e => e!.History)
.Include(er => er.Envelope).ThenInclude(e => e!.User); .Include(er => er.Envelope).ThenInclude(e => e!.User);

4
EnvelopeGenerator.Web/Controllers/HomeController.cs
View File

@ -77,7 +77,7 @@ namespace EnvelopeGenerator.Web.Controllers
} }
[HttpGet("EnvelopeKey/{envelopeReceiverId}/Locked")] [HttpGet("EnvelopeKey/{envelopeReceiverId}/Locked")]
public async Task<IActionResult> EnvelopeLocked([FromRoute] string envelopeReceiverId, [FromQuery] string? culture) public async Task<IActionResult> EnvelopeLocked([FromRoute] string envelopeReceiverId, [FromQuery] string? culture = null)
{ {
try try
{ {
@ -90,9 +90,7 @@ namespace EnvelopeGenerator.Web.Controllers
return Redirect($"{Request.Headers["Referer"]}?culture={_cultures.Default.Language}"); return Redirect($"{Request.Headers["Referer"]}?culture={_cultures.Default.Language}");
} }
else if (UserLanguage is not null && culture is not null) else if (UserLanguage is not null && culture is not null)
{
return Redirect($"Locked"); return Redirect($"Locked");
}
ViewData["UserLanguage"] = UserLanguage ?? culture; ViewData["UserLanguage"] = UserLanguage ?? culture;

6
EnvelopeGenerator.Web/Views/Home/ShowEnvelope.cshtml
View File

@ -45,6 +45,7 @@
</div> </div>
</div> </div>
</div> </div>
<button class="btn btn-success position-fixed bottom-0 end-0 mb-3 me-3 py-2" type="button">Abschließen</button>
<script nonce="@nonce"> <script nonce="@nonce">
const collapseNav = () => { const collapseNav = () => {
document.addEventListener('click', function (event) { document.addEventListener('click', function (event) {
@ -79,10 +80,7 @@
var byteArray = new Uint8Array(byteNumbers); var byteArray = new Uint8Array(byteNumbers);
var documentArrayBuffer = byteArray.buffer; var documentArrayBuffer = byteArray.buffer;
document.addEventListener("DOMContentLoaded", async () => { document.addEventListener("DOMContentLoaded", async () => await new App("@envelopeKey.TrySanitize(_sanitizer)", @Html.Raw(envelopeReceiverJson.TrySanitize(_sanitizer)), documentArrayBuffer, "@ViewData["PSPDFKitLicenseKey"]").init())
const app = new App("#app", "@envelopeKey.TrySanitize(_sanitizer)", @Html.Raw(envelopeReceiverJson.TrySanitize(_sanitizer)), documentArrayBuffer, "@ViewData["PSPDFKitLicenseKey"]");
await app.init();
})
</script> </script>
} }
<div id='app'></div> <div id='app'></div>

2
EnvelopeGenerator.Web/appsettings.json
View File

@ -15,7 +15,7 @@
"Default": "Server=SDD-VMP04-SQL17\\DD_DEVELOP01;Database=DD_ECM;User Id=sa;Password=dd;Encrypt=false;TrustServerCertificate=True;" "Default": "Server=SDD-VMP04-SQL17\\DD_DEVELOP01;Database=DD_ECM;User Id=sa;Password=dd;Encrypt=false;TrustServerCertificate=True;"
}, },
"AdminPassword": "dd", "AdminPassword": "dd",
"PSPDFKitLicenseKey": null, "PSPDFKitLicenseKey_SignFlow": "y8VgCpBgUfNlpKJZC-GwjpPs-S-KFBHv4RywfHbqpBAbO0XxRuWDaMGZtIaMrXBDlndlJLk---Ve93xjI_ZR4sbFymf4Ot97yTYUMeDdL2LYXhspkEnSAtkXf9zqepNL1v_0DMibjpqXFQMkVB1y3D5xdnOg-iJuCCZEMhZ780qg04_H_nmx63uSgxjN0GJxC8YvsbnRcUZ2l_idImMvWL0HMqB5B7oEpNenasA0RK0uapFRTa7NIQok0phpTHZYKB4qvj7od2yxlytGB7qBl4-lwT70DSQ9mrLkCWbuzZ9cV9D8fDzdFXr6WoZdOYpkrUadRbsy2bhPq_ukxszDWN4JGhebo0XKUK_YfgvSlS7lFOxHNblHeC9B7gZ8T-VuQ_z1QA2JYRf1dmhSuclnW00diShIg-N0I79PWGsQE4j40XtVpyWcN9uT9hMuiRpL0LzHV4YgsgBrgKgs_moqL7f0L4-MwaS25Dx4Wcz4ttKaerLavwMM4CJHI3DNqTC5UUEG6EViFxBQtrmuAS7kiw2nWjvXO7kUA24NARtsRCphjWE4l6wSMdh7kpqhfbV7_hdb5xXYGALNPkv8En6zPpFIew8DDcOH9dgxfKMI34LLhkEWqovZW_7fXNJTEIHVpR0DSPbZrmyEwkECnbDcNzjyFk2M1fzstJj_dSotyZvS57XJK2DgojbRgXL9pncs",
"UseCSPInDev": false, "UseCSPInDev": false,
"Content-Security-Policy": [ // The first format parameter {0} will be replaced by the nonce value. "Content-Security-Policy": [ // The first format parameter {0} will be replaced by the nonce value.
"default-src 'self'", "default-src 'self'",