From cb2fa4cf4f2af025741fe44bbb23f3aba571bbfc Mon Sep 17 00:00:00 2001
From: Annamaria Sassi <annamaria.sassi@egalware.com>
Date: Tue, 23 Dec 2025 14:29:43 +0100
Subject: [PATCH] Cambiata gestione lista threshold

---
 Test.UI/Components/Pages/EditJWD.razor        |  3 ---
 Test.UI/Components/Pages/EditJWD.razor.cs     |  8 +++----
 Test.UI/Components/Pages/Home.razor.cs        |  8 +++----
 WebWindowComplex/Compo/CardFrame.razor        |  2 +-
 WebWindowComplex/DTO/BaseListPayload.cs       |  2 +-
 WebWindowComplex/Json/JsonUtility.cs          |  1 +
 WebWindowComplex/Models/Frame.cs              | 24 +++++++++++++++++--
 WebWindowComplex/TableComp.razor              | 19 ++++++++-------
 WebWindowComplex/TableComp.razor.cs           |  2 +-
 WebWindowComplex/WebWindowComplex.csproj      |  7 +++++-
 .../WebWindowConfigurator.csproj              | 19 ++++++++++++++-
 11 files changed, 69 insertions(+), 26 deletions(-)

diff --git a/Test.UI/Components/Pages/EditJWD.razor b/Test.UI/Components/Pages/EditJWD.razor
index 500e82a..4323a12 100644
--- a/Test.UI/Components/Pages/EditJWD.razor
+++ b/Test.UI/Components/Pages/EditJWD.razor
@@ -88,9 +88,6 @@ else if (!string.IsNullOrEmpty(outSave))
 }
 
 <div class="card">
-    <div class="card-body small">
-        WindowUid: @windowUid
-    </div>
     <div class="card-body small">
         @JsonSer
     </div>
diff --git a/Test.UI/Components/Pages/EditJWD.razor.cs b/Test.UI/Components/Pages/EditJWD.razor.cs
index 96d8b25..897a52b 100644
--- a/Test.UI/Components/Pages/EditJWD.razor.cs
+++ b/Test.UI/Components/Pages/EditJWD.razor.cs
@@ -91,10 +91,10 @@ namespace Test.UI.Components.Pages
             new string("ProfiloSaomad")
         };
 
-        protected List<Threshold> AvailThresholdList { get; set; } = new List<Threshold>()
+        protected Dictionary<string, List<Threshold>> AvailThreshold { get; set; } = new Dictionary<string, List<Threshold>>()
         {
-            new Threshold(1, "Bottom"),
-            new Threshold(3, "Threshold")
+            {"Profilo78",  new List<Threshold>() { new Threshold(1, "Bottom"), new Threshold(3, "Threshold")}},
+            {"ProfiloSaomad",  new List<Threshold>(){ new Threshold(1, "Bottom"), new Threshold(2, "BottomWaterdrip"), new Threshold(3, "Threshold")}}
         };
 
         [Inject]
@@ -150,7 +150,7 @@ namespace Test.UI.Components.Pages
                 Hardware = AvailHardwareList,
                 Material = AvailMaterialList,
                 Profile = AvailProfileList,
-                Threshold = AvailThresholdList
+                Threshold = AvailThreshold
             };
             CurrData = new LivePayload()
             {
diff --git a/Test.UI/Components/Pages/Home.razor.cs b/Test.UI/Components/Pages/Home.razor.cs
index 8ed9c13..0f975e5 100644
--- a/Test.UI/Components/Pages/Home.razor.cs
+++ b/Test.UI/Components/Pages/Home.razor.cs
@@ -91,10 +91,10 @@ namespace Test.UI.Components.Pages
             new string("ProfiloSaomad")
         };
 
-        protected List<Threshold> AvailThresholdList { get; set; } = new List<Threshold>()
+        protected Dictionary<string, List<Threshold>> AvailThreshold { get; set; } = new Dictionary<string, List<Threshold>>()
         {
-            new Threshold(1, "Bottom"),
-            new Threshold(3, "Threshold")
+            {"Profilo78",  new List<Threshold>() { new Threshold(1, "Bottom"), new Threshold(3, "Threshold")}},
+            {"ProfiloSaomad",  new List<Threshold>(){ new Threshold(1, "Bottom"), new Threshold(2, "BottomWaterdrip"), new Threshold(3, "Threshold")}}
         };
 
         [Inject]
@@ -357,7 +357,7 @@ namespace Test.UI.Components.Pages
                 Hardware = AvailHardwareList,
                 Material = AvailMaterialList,
                 Profile = AvailProfileList,
-                Threshold = AvailThresholdList
+                Threshold = AvailThreshold
             };
         }
 
diff --git a/WebWindowComplex/Compo/CardFrame.razor b/WebWindowComplex/Compo/CardFrame.razor
index dc7de7d..fa94103 100644
--- a/WebWindowComplex/Compo/CardFrame.razor
+++ b/WebWindowComplex/Compo/CardFrame.razor
@@ -43,7 +43,7 @@
                 <div class="input-group mb-2">
                     <label class="input-group-text">Tipology</label>
                     <select class="form-select" @bind="SelThreshold">
-                        @foreach (var item in Frame.m_ThresholdList)
+                        @foreach (var item in CurrFrameWindow.ThresholdList)
                         {
                             <option value="@(item.Type)">@(item.Name)</option>
                         }
diff --git a/WebWindowComplex/DTO/BaseListPayload.cs b/WebWindowComplex/DTO/BaseListPayload.cs
index 43096ee..f7acbb9 100644
--- a/WebWindowComplex/DTO/BaseListPayload.cs
+++ b/WebWindowComplex/DTO/BaseListPayload.cs
@@ -47,7 +47,7 @@ namespace WebWindowComplex.DTO
         /// <summary>
         /// Elenco profili ammessi
         /// </summary>
-        public List<Threshold> Threshold { get; set; } = null!;
+        public Dictionary<string,List<Threshold>> Threshold { get; set; } = null!;
 
         /// <summary>
         /// Verifica di validità dell'intero Payload
diff --git a/WebWindowComplex/Json/JsonUtility.cs b/WebWindowComplex/Json/JsonUtility.cs
index 5a0bf63..a9a594b 100644
--- a/WebWindowComplex/Json/JsonUtility.cs
+++ b/WebWindowComplex/Json/JsonUtility.cs
@@ -277,6 +277,7 @@ namespace WebWindowComplex.Json
             newFrame.SetGroupId(GroupId);
             newFrame.SetAreaType(AreaTypes.FRAME);
             newFrame.SetSelShape(m_Shape);
+            newFrame.RefreshThresholdList();
             newFrame.SetSelThresholdFromName(m_Threshold);
             newFrame.SetBottomRail(m_bBottomRail);
             newFrame.SetBottomRailQty(m_nBottomRailQty);
diff --git a/WebWindowComplex/Models/Frame.cs b/WebWindowComplex/Models/Frame.cs
index 451b5f7..a814cf0 100644
--- a/WebWindowComplex/Models/Frame.cs
+++ b/WebWindowComplex/Models/Frame.cs
@@ -14,7 +14,7 @@ namespace WebWindowComplex.Models
         #region Public Fields
 
         // Lista hardware completa passata dal chiamante del componente
-        public static List<Threshold> m_ThresholdList = new List<Threshold>();
+        public static Dictionary<string,List<Threshold>> m_AllThresholdList = new Dictionary<string, List<Threshold>>();
 
         #endregion Public Fields
 
@@ -52,6 +52,18 @@ namespace WebWindowComplex.Models
             }
         }
 
+        public List<Threshold> ThresholdList
+        {
+            get
+            {
+                return m_ThresholdList;
+            }
+            set
+            {
+                m_ThresholdList = value;
+            }
+        }
+
         public Threshold SelThreshold
         {
             get
@@ -340,6 +352,11 @@ namespace WebWindowComplex.Models
 
         #region Public Methods
 
+        public void RefreshThresholdList()
+        {
+            m_ThresholdList.Clear();
+            m_ThresholdList = m_AllThresholdList.GetValueOrDefault(ParentWindow.sProfilePath);
+        }
         public override Frame Copy(Area ParentArea)
         {
             return null;
@@ -361,7 +378,8 @@ namespace WebWindowComplex.Models
             newFrame.SetSelShape(Shapes.RECTANGLE);
             newFrame.SetBottomRail(false);
             newFrame.SetBottomRailQty(0);
-            newFrame.SetSelThresholdFromName(m_ThresholdList.FirstOrDefault().Name);
+            newFrame.RefreshThresholdList();
+            newFrame.SetSelThresholdFromName(m_AllThresholdList.GetValueOrDefault(Window.sProfilePath).FirstOrDefault().Name);
             //newFrame.FrameArcElem = null;
             return newFrame;
         }
@@ -525,6 +543,8 @@ namespace WebWindowComplex.Models
 
         private Threshold m_SelThreshold;
 
+        private List<Threshold> m_ThresholdList = new List<Threshold>();
+
         private List<FrameDimension> m_DimensionList = new List<FrameDimension>();
 
         private List<Joint> m_JointList = new List<Joint>();
diff --git a/WebWindowComplex/TableComp.razor b/WebWindowComplex/TableComp.razor
index 9fac3ff..49f5fe8 100644
--- a/WebWindowComplex/TableComp.razor
+++ b/WebWindowComplex/TableComp.razor
@@ -170,13 +170,16 @@
                                         </div>
                                     </div>
                                 </div>
-                                Splitted currSplitted = SplittedList.Where(x => x.AreaList.First().Equals(FillList[currFillIndex])).FirstOrDefault();
-                                @if (currSplitted != null) {
-                                    <AreaSplit SashList="SashList"
-                                               SplittedList="SplittedList"
-                                               CurrSplitted="currSplitted"
-                                               EC_UpdateSplitted="UpdatePreviewSplitted">
-                                    </AreaSplit>
+                                @if(SplittedList != null && SplittedList.Count > 0)
+                                {
+                                    Splitted currSplitted = SplittedList.Where(x => x.AreaList.First().Equals(FillList[currFillIndex])).FirstOrDefault();
+                                    @if (currSplitted != null) {
+                                        <AreaSplit SashList="SashList"
+                                                   SplittedList="SplittedList"
+                                                   CurrSplitted="currSplitted"
+                                                   EC_UpdateSplitted="UpdatePreviewSplitted">
+                                        </AreaSplit>
+                                    }
                                 }
                                 @* @foreach (var currSplitted in m_SplittedList)
                                 {
@@ -192,7 +195,7 @@
                             <General CurrWindow="m_CurrWindow"
                                      ListPayload="ListPayload" 
                                      ListWarnings="listWarnings" 
-                                     EC_UpdateGeneral="UpdatePreviewGeneral" 
+                                     EC_UpdateGeneral="UpdatePreviewGeneral"
                                      EC_ReqClose="ReturnTree">
                             </General>
                         }
diff --git a/WebWindowComplex/TableComp.razor.cs b/WebWindowComplex/TableComp.razor.cs
index 13053e3..d2e5839 100644
--- a/WebWindowComplex/TableComp.razor.cs
+++ b/WebWindowComplex/TableComp.razor.cs
@@ -744,7 +744,7 @@ namespace WebWindowComplex
         /// </summary>
         protected void UpdateSelParameter()
         {
-            Frame.m_ThresholdList = ListPayload.Threshold;
+            Frame.m_AllThresholdList = ListPayload.Threshold;
             Sash.m_HardwareCompleteList = ListPayload.Hardware;
             Sash.s_FamilyHardwareList = ListPayload.FamilyHardware;
             if (CurrSelection != null && CurrSelection.IsValid())
diff --git a/WebWindowComplex/WebWindowComplex.csproj b/WebWindowComplex/WebWindowComplex.csproj
index 88d8c97..4ae47d0 100644
--- a/WebWindowComplex/WebWindowComplex.csproj
+++ b/WebWindowComplex/WebWindowComplex.csproj
@@ -6,7 +6,7 @@
     <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
-    <Version>2.7.12.2312</Version>
+    <Version>2.7.12.2314</Version>
     <Authors>Annamaria Sassi</Authors>
     <Company>Egalware</Company>
     <Description>Componente gestione Configurazioni avanzate Window per LUX</Description>
@@ -429,6 +429,11 @@
 
 
 
+
+
+
+
+
 
 
 
diff --git a/WebWindowConfigurator/WebWindowConfigurator.csproj b/WebWindowConfigurator/WebWindowConfigurator.csproj
index 01f1737..19322dd 100644
--- a/WebWindowConfigurator/WebWindowConfigurator.csproj
+++ b/WebWindowConfigurator/WebWindowConfigurator.csproj
@@ -6,7 +6,7 @@
         <TargetFramework>net8.0</TargetFramework>
         <Nullable>enable</Nullable>
         <ImplicitUsings>enable</ImplicitUsings>
-        <Version>2.7.12.2312</Version>
+        <Version>2.7.12.2314</Version>
         <Authors>Annamaria Sassi</Authors>
         <Company>Egalware</Company>
         <Description>Componente gestione JWD per LUX</Description>
@@ -528,6 +528,23 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+