From 7bebc6e8ea60b71687568cabeb75351acf102eb7 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Fri, 26 Apr 2024 10:00:25 +0200 Subject: [PATCH] Fix confirm solo ove necessario --- .../Components/Hardware/HwSingleInstance.razor | 4 ++-- .../Components/Hardware/HwSingleInstance.razor.cs | 4 ++-- WebDoorCreator.UI/Pages/HwPdfConfirm.razor | 11 ++++++----- WebDoorCreator.UI/Pages/HwPdfConfirm.razor.cs | 6 ++++++ 4 files changed, 16 insertions(+), 9 deletions(-) diff --git a/WebDoorCreator.UI/Components/Hardware/HwSingleInstance.razor b/WebDoorCreator.UI/Components/Hardware/HwSingleInstance.razor index f315afe..f2faa58 100644 --- a/WebDoorCreator.UI/Components/Hardware/HwSingleInstance.razor +++ b/WebDoorCreator.UI/Components/Hardware/HwSingleInstance.razor @@ -9,7 +9,7 @@ else
@if (DoorOpInst.userConfirm != "" && DoorOpInst.DtConfirm != null) { - + @@ -160,7 +160,7 @@ else } else { - + diff --git a/WebDoorCreator.UI/Components/Hardware/HwSingleInstance.razor.cs b/WebDoorCreator.UI/Components/Hardware/HwSingleInstance.razor.cs index c21cb06..f1f620b 100644 --- a/WebDoorCreator.UI/Components/Hardware/HwSingleInstance.razor.cs +++ b/WebDoorCreator.UI/Components/Hardware/HwSingleInstance.razor.cs @@ -350,9 +350,9 @@ namespace WebDoorCreator.UI.Components.Hardware await SetSelectedData(); } - private string pathFinder(int id) + private string pathFinder(int id, bool reqConf) { - string answ = $"HwPdfConfirm?doorOpId={id}&doorId={DoorOpInst.DoorId}&objectId={DoorOpInst.ObjectId}"; + string answ = $"HwPdfConfirm?doorOpId={id}&doorId={DoorOpInst.DoorId}&objectId={DoorOpInst.ObjectId}&reqConf={reqConf}"; return answ; } diff --git a/WebDoorCreator.UI/Pages/HwPdfConfirm.razor b/WebDoorCreator.UI/Pages/HwPdfConfirm.razor index 1fb8a16..2bdf647 100644 --- a/WebDoorCreator.UI/Pages/HwPdfConfirm.razor +++ b/WebDoorCreator.UI/Pages/HwPdfConfirm.razor @@ -4,11 +4,12 @@ {
- Please press - - after reading the whole Document + @if (reqConf) + { + + }
@* *@
diff --git a/WebDoorCreator.UI/Pages/HwPdfConfirm.razor.cs b/WebDoorCreator.UI/Pages/HwPdfConfirm.razor.cs index 8c0e63d..53511da 100644 --- a/WebDoorCreator.UI/Pages/HwPdfConfirm.razor.cs +++ b/WebDoorCreator.UI/Pages/HwPdfConfirm.razor.cs @@ -32,6 +32,8 @@ namespace WebDoorCreator.UI.Pages protected int doorOpId { get; set; } = 0; + protected bool reqConf { get; set; } = false; + [Inject] protected NavigationManager NavManager { get; set; } = null!; @@ -135,6 +137,10 @@ namespace WebDoorCreator.UI.Pages { int.TryParse(sDoorId, out doorId); } + if (QueryHelpers.ParseQuery(uri.Query).TryGetValue("reqConf", out var sReqConf)) + { + reqConf = bool.Parse(sReqConf); + } if (QueryHelpers.ParseQuery(uri.Query).TryGetValue("doorOpId", out var sDoorOpId)) { doorOpId = int.Parse(sDoorOpId);