From 1708911a6b48d5587d32df1c99c05770b4a2cff7 Mon Sep 17 00:00:00 2001 From: Annamaria Sassi Date: Fri, 27 Mar 2026 18:25:37 +0100 Subject: [PATCH] Gestione dizionario domande pendenti --- Test.UI/Components/Pages/EditJWD.razor | 3 ++- Test.UI/Components/Pages/EditJWD.razor.cs | 4 ++++ WebWindowComplex/SerialMan.cs | 5 +++++ WebWindowComplex/TableComp.razor | 14 ++++++++++++++ WebWindowComplex/TableComp.razor.cs | 16 +++++++++++++++- WebWindowComplex/WebWindowComplex.csproj | 4 +++- .../WebWindowConfigurator.csproj | 5 ++++- 7 files changed, 47 insertions(+), 4 deletions(-) diff --git a/Test.UI/Components/Pages/EditJWD.razor b/Test.UI/Components/Pages/EditJWD.razor index 77fadd9..913d191 100644 --- a/Test.UI/Components/Pages/EditJWD.razor +++ b/Test.UI/Components/Pages/EditJWD.razor @@ -75,7 +75,8 @@ baseUser="User" EC_ActionReq="DoAction" EC_DoUpdate="ExecRequest" - EC_OnClose="CloseObj"> + EC_OnClose="CloseObj" + EC_PendantAction="PendAction"> } else diff --git a/Test.UI/Components/Pages/EditJWD.razor.cs b/Test.UI/Components/Pages/EditJWD.razor.cs index 83bff2f..bae3fd5 100644 --- a/Test.UI/Components/Pages/EditJWD.razor.cs +++ b/Test.UI/Components/Pages/EditJWD.razor.cs @@ -325,6 +325,10 @@ namespace Test.UI.Components.Pages outSave = reqSave.ForceSave ? "Richiesto Close + Save!" : ""; doEdit = false; } + private void PendAction(Dictionary args) + { + + } private void ConfInit() { diff --git a/WebWindowComplex/SerialMan.cs b/WebWindowComplex/SerialMan.cs index f952d0b..7217fa5 100644 --- a/WebWindowComplex/SerialMan.cs +++ b/WebWindowComplex/SerialMan.cs @@ -50,6 +50,11 @@ namespace WebWindowComplex currWindow.sGlass = DictParameter.GetValueOrDefault("Glass")!; DictParameter.Remove("Glass"); } + if (!string.IsNullOrEmpty(DictParameter.GetValueOrDefault("Profile")) && + currWindow.sProfilePath.Equals(DictParameter.GetValueOrDefault("Profile"))) + { + DictParameter.Remove("Profile"); + } var CurrJwd = JsonConvert.SerializeObject(currWindow.Serialize(), Formatting.Indented); GeneralData datap = new GeneralData() { diff --git a/WebWindowComplex/TableComp.razor b/WebWindowComplex/TableComp.razor index 39451b7..d6ef827 100644 --- a/WebWindowComplex/TableComp.razor +++ b/WebWindowComplex/TableComp.razor @@ -63,6 +63,20 @@ } + else if (reqBool) + { +
+
+
+ +
+
+
Domande pendenti
+
+
+
+ + } else {
diff --git a/WebWindowComplex/TableComp.razor.cs b/WebWindowComplex/TableComp.razor.cs index 4d1c88c..12953e5 100644 --- a/WebWindowComplex/TableComp.razor.cs +++ b/WebWindowComplex/TableComp.razor.cs @@ -90,6 +90,12 @@ namespace WebWindowComplex [Parameter] public EventCallback> EC_ValidError { get; set; } + /// + /// Richiesta azione per le richieste pendenti + /// + [Parameter] + public EventCallback> EC_PendantAction { get; set; } + /// /// Elenco anagrafiche di base /// @@ -281,8 +287,16 @@ namespace WebWindowComplex } } isLoading = false; + // Controllo se ci sono domande pendenti + if(PendReq != null && PendReq.Count > 0) + { + //Implementazione di test + reqBool = true; + PendReq.Remove("Profile"); + await EC_PendantAction.InvokeAsync(PendReq); + } } - + private bool reqBool = false; #endregion Protected Methods #region Private Fields diff --git a/WebWindowComplex/WebWindowComplex.csproj b/WebWindowComplex/WebWindowComplex.csproj index 44a1545..6d32daa 100644 --- a/WebWindowComplex/WebWindowComplex.csproj +++ b/WebWindowComplex/WebWindowComplex.csproj @@ -6,7 +6,7 @@ net8.0 enable enable - 3.1.3.2717 + 3.1.3.2718 Annamaria Sassi Egalware Componente gestione Configurazioni avanzate Window per LUX @@ -88,6 +88,8 @@ + + diff --git a/WebWindowConfigurator/WebWindowConfigurator.csproj b/WebWindowConfigurator/WebWindowConfigurator.csproj index aed3968..0131c67 100644 --- a/WebWindowConfigurator/WebWindowConfigurator.csproj +++ b/WebWindowConfigurator/WebWindowConfigurator.csproj @@ -6,7 +6,7 @@ net8.0 enable enable - 3.1.3.2717 + 3.1.3.2718 Annamaria Sassi Egalware Componente gestione JWD per LUX @@ -96,6 +96,9 @@ + + +