From d477fb9319695553ea1c20b301d61378f48aa945 Mon Sep 17 00:00:00 2001
From: Annamaria Sassi <annamaria.sassi@egalware.com>
Date: Thu, 23 Oct 2025 14:55:56 +0200
Subject: [PATCH] Inserimento shape negli oggetti sash

---
 Test.UI/Components/Pages/EditJWD.razor.cs        |  3 ++-
 WebWindowComplex/Compo/CardSashGroup.razor       |  4 ++--
 WebWindowComplex/Models/Area.cs                  |  3 ++-
 WebWindowComplex/Models/Sash.cs                  | 11 +++++++----
 WebWindowComplex/TableComp.razor.cs              | 10 +++++++---
 WebWindowComplex/WebWindowComplex.csproj         | 14 +++++++++++++-
 .../WebWindowConfigurator.csproj                 | 16 +++++++++++++++-
 7 files changed, 48 insertions(+), 13 deletions(-)

diff --git a/Test.UI/Components/Pages/EditJWD.razor.cs b/Test.UI/Components/Pages/EditJWD.razor.cs
index 2eec95d..88d3ecc 100644
--- a/Test.UI/Components/Pages/EditJWD.razor.cs
+++ b/Test.UI/Components/Pages/EditJWD.razor.cs
@@ -125,7 +125,8 @@ namespace Test.UI.Components.Pages
         protected override async Task OnInitializedAsync()
         {
             ConfInit();
-            InitialJwd = File.ReadAllText("Data\\FinestraDueAnteSeparate.jwd");
+            //InitialJwd = File.ReadAllText("Data\\FinestraDueAnteSeparate.jwd");
+            InitialJwd = File.ReadAllText("Data\\AntaDoppia.jwd");
             currJwd = InitialJwd;
             // rileggo altri dati
             await ReloadData();
diff --git a/WebWindowComplex/Compo/CardSashGroup.razor b/WebWindowComplex/Compo/CardSashGroup.razor
index 97374a8..6df14ac 100644
--- a/WebWindowComplex/Compo/CardSashGroup.razor
+++ b/WebWindowComplex/Compo/CardSashGroup.razor
@@ -92,8 +92,8 @@
                         }
                     </select>
                 </div>
-                @if (string.IsNullOrEmpty(CurrItem.sSashShape))
-                {
+                @if (string.IsNullOrEmpty(CurrItem.SashShape))
+            {
                     <div class="input-group mb-2">
                         <label class="input-group-text" for="Hardware">Type</label>
                         <select class="form-select" id="Hardware">
diff --git a/WebWindowComplex/Models/Area.cs b/WebWindowComplex/Models/Area.cs
index eb8d2ec..b0d4921 100644
--- a/WebWindowComplex/Models/Area.cs
+++ b/WebWindowComplex/Models/Area.cs
@@ -105,7 +105,8 @@ namespace WebWindowComplex.Models
             Area ParentArea = AreaList[0].ParentArea;
             // Creo area sash di default
             Sash SashArea = Sash.CreateSash(ParentArea);
-            // ricerco tra ttuti gli hw disponibili...
+            // ricerco tra tutti gli hw disponibili...
+            
             string sShape = FindSashShape();
             var listHwValid = Sash
                                 .m_HardwareCompleteList
diff --git a/WebWindowComplex/Models/Sash.cs b/WebWindowComplex/Models/Sash.cs
index fcc0624..2cbd581 100644
--- a/WebWindowComplex/Models/Sash.cs
+++ b/WebWindowComplex/Models/Sash.cs
@@ -441,9 +441,10 @@ namespace WebWindowComplex.Models
             }
         }
 
-        public string sSashShape
+        public string SashShape
         {
             get => m_CurrShape;
+            set => m_CurrShape = value;
         }
 
         #endregion Public Properties
@@ -545,7 +546,7 @@ namespace WebWindowComplex.Models
         }
 
         /// <summary>
-        /// Agfgiornamento HW List conseguente a ricezione nuiova Shape
+        /// Aggiornamento HW List conseguente a ricezione nuova Shape
         /// </summary>
         /// <param name="newShape"></param>
         public void UpdateShape(string newShape)
@@ -764,13 +765,15 @@ namespace WebWindowComplex.Models
 
         internal string SetSelFamilyHardwareFromIndex(string codHardware)
         {
+            string? item = "";
             if (string.IsNullOrEmpty(m_SelFamilyHardware))
             {
-                var item = m_HardwareCompleteList
+                item = m_HardwareCompleteList
                                         .Where(x => x.Id == codHardware)
                                         .Select(x => x.FamilyName)
                                         .FirstOrDefault();
-                SelFamilyHardware = item ?? "";
+                SetSelFamilyHardware(item ?? "");
+                //SelFamilyHardware = item ?? "";
             }
             return SelFamilyHardware;
         }
diff --git a/WebWindowComplex/TableComp.razor.cs b/WebWindowComplex/TableComp.razor.cs
index c952d3b..abdef19 100644
--- a/WebWindowComplex/TableComp.razor.cs
+++ b/WebWindowComplex/TableComp.razor.cs
@@ -563,7 +563,6 @@ namespace WebWindowComplex
         protected override async Task OnParametersSetAsync()
         {
             isLoading = true;
-
             // SOLO SE sono presenti...
             if (ListPayload.IsPopulated() && LiveData.IsValid())
             {
@@ -727,8 +726,13 @@ namespace WebWindowComplex
             // se ho i dizionari delle forme le aggiungo
             if (LiveData.DictShape.Count > 0)
             {
-                // ToDo....
-
+                // Inserisco le forme ricevuto nei sash group
+                foreach(var item in LiveData.DictShape)
+                {
+                    Sash sashNewShape = SashList.Where(x => x.GroupId == item.Key).ToList().First();
+                    sashNewShape.SashShape = item.Value;
+                    sashNewShape.UpdateShape(item.Value);
+                }
                 // aggiorno SVG
             }
         }
diff --git a/WebWindowComplex/WebWindowComplex.csproj b/WebWindowComplex/WebWindowComplex.csproj
index c28789d..bd74c69 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.10.2312</Version>
+    <Version>2.7.10.2314</Version>
     <Authors>Annamaria Sassi</Authors>
     <Company>Egalware</Company>
     <Description>Componente gestione Configurazioni avanzate Window per LUX</Description>
@@ -88,6 +88,18 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
diff --git a/WebWindowConfigurator/WebWindowConfigurator.csproj b/WebWindowConfigurator/WebWindowConfigurator.csproj
index 68d9011..e459d3c 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.10.2312</Version>
+        <Version>2.7.10.2314</Version>
         <Authors>Annamaria Sassi</Authors>
         <Company>Egalware</Company>
         <Description>Componente gestione JWD per LUX</Description>
@@ -159,6 +159,20 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+