From 6838723e50b39496ae3bbbb1375bc470ffd2f233 Mon Sep 17 00:00:00 2001 From: "zaccaria.majid" Date: Thu, 13 Apr 2023 17:59:06 +0200 Subject: [PATCH] gestione avanzamento step --- WebDoorCreator.Core/Enum.cs | 2 +- .../Components/DoorDef/StepsList.razor | 6 +++--- .../Components/DoorDef/StepsList.razor.cs | 12 +++++++++++- .../Components/Hardware/HwSingleInstance.razor | 3 ++- .../Hardware/HwSingleInstance.razor.cs | 2 ++ .../Hardware/HwSingleInstance.razor.css | 7 +++++++ .../Hardware/HwSingleInstance.razor.less | 8 ++++++++ .../Hardware/HwSingleInstance.razor.min.css | 2 +- WebDoorCreator.UI/Pages/DoorDefinition.razor | 17 +++++++++++------ WebDoorCreator.UI/Pages/DoorDefinition.razor.cs | 6 ++++++ 10 files changed, 52 insertions(+), 13 deletions(-) diff --git a/WebDoorCreator.Core/Enum.cs b/WebDoorCreator.Core/Enum.cs index e869fc4..b725c03 100644 --- a/WebDoorCreator.Core/Enum.cs +++ b/WebDoorCreator.Core/Enum.cs @@ -28,7 +28,7 @@ { Door = 0, Hardware, - report + Report } #endregion Public Enums diff --git a/WebDoorCreator.UI/Components/DoorDef/StepsList.razor b/WebDoorCreator.UI/Components/DoorDef/StepsList.razor index 65c5325..7206c45 100644 --- a/WebDoorCreator.UI/Components/DoorDef/StepsList.razor +++ b/WebDoorCreator.UI/Components/DoorDef/StepsList.razor @@ -1,5 +1,5 @@ 
-
Door
-
Hardware
-
Report
+
Door
+
Hardware
+
Report
\ No newline at end of file diff --git a/WebDoorCreator.UI/Components/DoorDef/StepsList.razor.cs b/WebDoorCreator.UI/Components/DoorDef/StepsList.razor.cs index 88d0b83..694a2ac 100644 --- a/WebDoorCreator.UI/Components/DoorDef/StepsList.razor.cs +++ b/WebDoorCreator.UI/Components/DoorDef/StepsList.razor.cs @@ -7,6 +7,9 @@ namespace WebDoorCreator.UI.Components.DoorDef [Parameter] public Core.Enum.DoorDefStep DoorDefStep { get; set; } = Core.Enum.DoorDefStep.Door; + [Parameter] + public EventCallback E_StepChanged { get; set; } + protected string doorCSS { get; set; } = "btn-secondary"; protected string hwCSS { get; set; } = "btn-secondary"; protected string reportCSS { get; set; } = "btn-secondary"; @@ -25,12 +28,19 @@ namespace WebDoorCreator.UI.Components.DoorDef doorCSS = "btn-success"; hwCSS = "btn-success"; } - else if(DoorDefStep == Core.Enum.DoorDefStep.report) + else if(DoorDefStep == Core.Enum.DoorDefStep.Report) { doorCSS = "btn-success"; hwCSS = "btn-success"; reportCSS = "btn-success"; } } + + protected async Task doChangeStep(Core.Enum.DoorDefStep actDoorDefStep) + { + await Task.Delay(1); + + await E_StepChanged.InvokeAsync(actDoorDefStep); + } } } \ No newline at end of file diff --git a/WebDoorCreator.UI/Components/Hardware/HwSingleInstance.razor b/WebDoorCreator.UI/Components/Hardware/HwSingleInstance.razor index cd37b79..58a6b0b 100644 --- a/WebDoorCreator.UI/Components/Hardware/HwSingleInstance.razor +++ b/WebDoorCreator.UI/Components/Hardware/HwSingleInstance.razor @@ -141,7 +141,8 @@ else }
-
diff --git a/WebDoorCreator.UI/Components/Hardware/HwSingleInstance.razor.cs b/WebDoorCreator.UI/Components/Hardware/HwSingleInstance.razor.cs index 3401b58..1b045ee 100644 --- a/WebDoorCreator.UI/Components/Hardware/HwSingleInstance.razor.cs +++ b/WebDoorCreator.UI/Components/Hardware/HwSingleInstance.razor.cs @@ -170,6 +170,7 @@ namespace WebDoorCreator.UI.Components.Hardware List doorOpAddList = new List() { doorOpToAdd }; // salvo! await WDCService.DoorOpInsert(DoorOpInst.DoorId, doorOpAddList); + await FullReloadData(true); } protected async Task doConfirm() @@ -187,6 +188,7 @@ namespace WebDoorCreator.UI.Components.Hardware if (done) { await WDCService.DoorOpDelete(DoorOpInst); + await FullReloadData(true); } } diff --git a/WebDoorCreator.UI/Components/Hardware/HwSingleInstance.razor.css b/WebDoorCreator.UI/Components/Hardware/HwSingleInstance.razor.css index 263f835..d99eeb5 100644 --- a/WebDoorCreator.UI/Components/Hardware/HwSingleInstance.razor.css +++ b/WebDoorCreator.UI/Components/Hardware/HwSingleInstance.razor.css @@ -86,4 +86,11 @@ input { border-bottom: 2px solid black; background: none; height: 2rem; +} +i { + display: flex; + align-items: center; + justify-content: center; + flex-wrap: wrap; + font-size: 1.1rem; } \ No newline at end of file diff --git a/WebDoorCreator.UI/Components/Hardware/HwSingleInstance.razor.less b/WebDoorCreator.UI/Components/Hardware/HwSingleInstance.razor.less index cd0512c..3d0b631 100644 --- a/WebDoorCreator.UI/Components/Hardware/HwSingleInstance.razor.less +++ b/WebDoorCreator.UI/Components/Hardware/HwSingleInstance.razor.less @@ -85,3 +85,11 @@ select, input { background: none; height: 2rem; } + +i { + display: flex; + align-items: center; + justify-content: center; + flex-wrap: wrap; + font-size: 1.1rem; +} diff --git a/WebDoorCreator.UI/Components/Hardware/HwSingleInstance.razor.min.css b/WebDoorCreator.UI/Components/Hardware/HwSingleInstance.razor.min.css index c615887..59a0540 100644 --- a/WebDoorCreator.UI/Components/Hardware/HwSingleInstance.razor.min.css +++ b/WebDoorCreator.UI/Components/Hardware/HwSingleInstance.razor.min.css @@ -1 +1 @@ -.btnGen{border-radius:50%;width:3.5rem;height:3.5rem;border:5px solid #00838f;}.btnDelete{border-radius:50%;width:3.5rem;height:3.5rem;border:5px solid #00838f;background:#b71c1c;transform:translate(25px,-12px);}.btnClone{border-radius:50%;width:3.5rem;height:3.5rem;border:5px solid #00838f;background:#fff;transform:translate(1.6rem,-1rem);}.btnPDFSuccess{border-radius:50%;width:3.5rem;height:3.5rem;border:5px solid #00838f;background:#8e44ad;transform:translate(25px,12px);}.btnPDFPending{border-radius:50%;width:3.5rem;height:3.5rem;border:5px solid #00838f;background:#f1c40f;transform:translate(25px,12px);}.btnHighlight{border-radius:50%;width:3.5rem;height:3.5rem;border:5px solid #00838f;background:#03a9f4;transform:translate(1.6rem,1rem);}.btnHeadTail{width:100%;padding:.8rem 0 .8rem 0;background:none;border:0;}.btnConfirm{width:100%;padding:.8rem 0 .8rem 0;background:none;border:0;border-bottom:3px solid #000;}.btnHead{width:100%;padding:.8rem 0 .8rem 0;background:none;border:0;}.borderTop{border-top:7px solid #00838f;}.borderBottom{border-bottom:7px solid #00838f;width:100%;}.modal-dialog{overflow-y:initial!important;}.modal-body{height:18.75rem;overflow-y:auto;}.testata{width:100%;}select,input{border:0;border-bottom:2px solid #000;background:none;height:2rem;} \ No newline at end of file +.btnGen{border-radius:50%;width:3.5rem;height:3.5rem;border:5px solid #00838f;}.btnDelete{border-radius:50%;width:3.5rem;height:3.5rem;border:5px solid #00838f;background:#b71c1c;transform:translate(25px,-12px);}.btnClone{border-radius:50%;width:3.5rem;height:3.5rem;border:5px solid #00838f;background:#fff;transform:translate(1.6rem,-1rem);}.btnPDFSuccess{border-radius:50%;width:3.5rem;height:3.5rem;border:5px solid #00838f;background:#8e44ad;transform:translate(25px,12px);}.btnPDFPending{border-radius:50%;width:3.5rem;height:3.5rem;border:5px solid #00838f;background:#f1c40f;transform:translate(25px,12px);}.btnHighlight{border-radius:50%;width:3.5rem;height:3.5rem;border:5px solid #00838f;background:#03a9f4;transform:translate(1.6rem,1rem);}.btnHeadTail{width:100%;padding:.8rem 0 .8rem 0;background:none;border:0;}.btnConfirm{width:100%;padding:.8rem 0 .8rem 0;background:none;border:0;border-bottom:3px solid #000;}.btnHead{width:100%;padding:.8rem 0 .8rem 0;background:none;border:0;}.borderTop{border-top:7px solid #00838f;}.borderBottom{border-bottom:7px solid #00838f;width:100%;}.modal-dialog{overflow-y:initial!important;}.modal-body{height:18.75rem;overflow-y:auto;}.testata{width:100%;}select,input{border:0;border-bottom:2px solid #000;background:none;height:2rem;}i{display:flex;align-items:center;justify-content:center;flex-wrap:wrap;font-size:1.1rem;} \ No newline at end of file diff --git a/WebDoorCreator.UI/Pages/DoorDefinition.razor b/WebDoorCreator.UI/Pages/DoorDefinition.razor index 61557dc..c3ae040 100644 --- a/WebDoorCreator.UI/Pages/DoorDefinition.razor +++ b/WebDoorCreator.UI/Pages/DoorDefinition.razor @@ -12,13 +12,18 @@
- +
- @**@ - @**@ - - - + @if (currDefStep == Core.Enum.DoorDefStep.Door) + { + + } + else if (currDefStep == Core.Enum.DoorDefStep.Hardware) + { + + + + }
diff --git a/WebDoorCreator.UI/Pages/DoorDefinition.razor.cs b/WebDoorCreator.UI/Pages/DoorDefinition.razor.cs index 54a3861..22cfade 100644 --- a/WebDoorCreator.UI/Pages/DoorDefinition.razor.cs +++ b/WebDoorCreator.UI/Pages/DoorDefinition.razor.cs @@ -121,6 +121,12 @@ namespace WebDoorCreator.UI.Pages StateHasChanged(); //Task.Run(async () => await ReloadData()); } + Core.Enum.DoorDefStep currDefStep { get; set; } = Core.Enum.DoorDefStep.Door; + protected async Task catchCurrStep(Core.Enum.DoorDefStep caughtDefStep) + { + await Task.Delay(1); + currDefStep = caughtDefStep; + } #endregion Private Methods }