From b8829ab77d5b063ed1c3eda218472993c59fc21f Mon Sep 17 00:00:00 2001
From: Annamaria Sassi <annamaria.sassi@egalware.com>
Date: Thu, 6 Nov 2025 10:32:50 +0100
Subject: [PATCH] Aggiunto elemento di Loading mentre si aspetta la risposta
 delle opzioni

---
 Test.UI/Components/Pages/EditJWD.razor           |  4 ++--
 WebWindowComplex/Compo/AreaHwOption.razor        |  2 +-
 WebWindowComplex/Compo/AreaHwOption.razor.cs     |  3 ++-
 WebWindowComplex/Compo/CardSplit.razor.cs        |  2 ++
 WebWindowComplex/Compo/General.razor             |  6 +++---
 WebWindowComplex/TableComp.razor                 |  2 +-
 WebWindowComplex/TableComp.razor.cs              | 15 +++------------
 WebWindowComplex/WebWindowComplex.csproj         | 16 +++++++++++++++-
 .../WebWindowConfigurator.csproj                 |  8 +++++++-
 9 files changed, 36 insertions(+), 22 deletions(-)

diff --git a/Test.UI/Components/Pages/EditJWD.razor b/Test.UI/Components/Pages/EditJWD.razor
index 71ea354..7107545 100644
--- a/Test.UI/Components/Pages/EditJWD.razor
+++ b/Test.UI/Components/Pages/EditJWD.razor
@@ -86,8 +86,8 @@ else if (!string.IsNullOrEmpty(outSave))
         @outSave
     </div>
 }
-<div class="card">
+@* <div class="card">
     <div class="card-body small">
         @JsonSer
     </div>
-</div>
+</div> *@
diff --git a/WebWindowComplex/Compo/AreaHwOption.razor b/WebWindowComplex/Compo/AreaHwOption.razor
index a0d3482..b3977a0 100644
--- a/WebWindowComplex/Compo/AreaHwOption.razor
+++ b/WebWindowComplex/Compo/AreaHwOption.razor
@@ -13,7 +13,7 @@
     {
         <button class="btn btn-secondary" type="button" disabled>Loading</button>
     }
-    @if (!hwOptCollapsed)
+    @if (!hwOptCollapsed || !isLoadingHwOpt)
     {
         @foreach (var currOpt in CurrSash.HwOptionList)
         {
diff --git a/WebWindowComplex/Compo/AreaHwOption.razor.cs b/WebWindowComplex/Compo/AreaHwOption.razor.cs
index 71f517d..f109208 100644
--- a/WebWindowComplex/Compo/AreaHwOption.razor.cs
+++ b/WebWindowComplex/Compo/AreaHwOption.razor.cs
@@ -31,9 +31,10 @@ namespace WebWindowComplex.Compo
         /// </summary>
         [Parameter]
         public EventCallback<int> EC_FirstHwOptionList { get; set; }
+       
+        private bool isLoadingHwOpt {  get; set; }
 
         private bool hwOptCollapsed { get; set; }
-        private bool isLoadingHwOpt {  get; set; }
 
         private async Task changeCollapsed()
         {
diff --git a/WebWindowComplex/Compo/CardSplit.razor.cs b/WebWindowComplex/Compo/CardSplit.razor.cs
index f85f9f8..72e18e9 100644
--- a/WebWindowComplex/Compo/CardSplit.razor.cs
+++ b/WebWindowComplex/Compo/CardSplit.razor.cs
@@ -78,6 +78,8 @@ namespace WebWindowComplex.Compo
         /// <returns></returns>
         protected async Task RemoveArea(Split item)
         {
+            // richiesta reset dict shape
+            await EC_ReqResetDictShape.InvokeAsync(true);
             await EC_RemoveArea.InvokeAsync(item);
         }
 
diff --git a/WebWindowComplex/Compo/General.razor b/WebWindowComplex/Compo/General.razor
index ae75860..fb2306d 100644
--- a/WebWindowComplex/Compo/General.razor
+++ b/WebWindowComplex/Compo/General.razor
@@ -12,7 +12,7 @@
     </div>
     <div class="card-body py-2">
         <div class="row">
-            <div class="col-sm-6">
+            <div class="col-md-6 col-sm-12 d-flex flex-column gap-2">
                 <div class="input-group mb-2 justify-content-center">
                     <label class="input-group-text">Material</label>
                     <select class="form-select @(cssValid("Material"))" @bind="CurrMaterial">
@@ -35,7 +35,7 @@
         </div>
         <hr />
         <div class="row">
-            <div class="col-sm-6">
+            <div class="col-md-6 col-sm-12 d-flex flex-column gap-2">
                 <div class="row">
                     <h5>Fill type</h5>
                 </div>
@@ -59,7 +59,7 @@
                     </div>
                 </div>
             </div>
-            <div class="col-sm-6">
+            <div class="col-md-6 col-sm-12 d-flex flex-column gap-2">
                 <div class="row">
                     <h5 class="card-title">Color</h5>
                 </div>
diff --git a/WebWindowComplex/TableComp.razor b/WebWindowComplex/TableComp.razor
index 77f71be..5402f66 100644
--- a/WebWindowComplex/TableComp.razor
+++ b/WebWindowComplex/TableComp.razor
@@ -41,7 +41,7 @@
                 <div class="card text-center table-svg shadow rounded">
                     <div class="card-header" style="background-color: #d5f1f2;">
                         <div class="d-flex justify-content-between align-middle">
-                            <div class="@headerCss()">
+                            <div class="col-8 d-grid px-2 d-md-flex justify-content-md-start">
                                 <ul class="nav nav-tabs card-header-tabs">
                                     @if (string.IsNullOrEmpty(LiveData.CurrJwd))
                                     {
diff --git a/WebWindowComplex/TableComp.razor.cs b/WebWindowComplex/TableComp.razor.cs
index 61fb9aa..94f2018 100644
--- a/WebWindowComplex/TableComp.razor.cs
+++ b/WebWindowComplex/TableComp.razor.cs
@@ -562,7 +562,7 @@ namespace WebWindowComplex
         }
 
         /// <summary>
-        /// Metodo di reset dei dati a quelli del template
+        /// Metodo di reset
         /// </summary>
         protected async Task DoReset()
         {
@@ -746,7 +746,7 @@ namespace WebWindowComplex
                 // Inserisco le forme ricevuto nei sash group
                 foreach (var item in LiveData.DictShape)
                 {
-                    Sash sashFromGroupId = SashList.Where(x => x.GroupId == item.Key).ToList().First();
+                    Sash sashFromGroupId = SashList.Where(x => x.GroupId == item.Key).First();
                     sashFromGroupId.SashShape = item.Value;
                     sashFromGroupId.UpdateShape(item.Value);
                 }
@@ -1117,15 +1117,6 @@ namespace WebWindowComplex
             await DoPreviewSvg();
         }
 
-        /// <summary>
-        /// Calcola larghezza colonna header nav
-        /// </summary>
-        /// <returns></returns>
-        private string headerCss()
-        {
-            return (currStep == CompileStep.Template) ? "col-8 d-grid px-2 d-md-flex justify-content-md-start" : "col-8 d-grid px-2 d-md-flex justify-content-md-start";
-        }
-
         private void M_CurrWindow_OnHwOption(object? sender, OnReqHwOptEventArgs e)
         {
             Dictionary<string, string> Args = new Dictionary<string, string>();
@@ -1162,7 +1153,7 @@ namespace WebWindowComplex
         /// <returns></returns>
         private string mainCss()
         {
-            return (currStep == CompileStep.Template) ? "col-12" : "col-6";
+            return (currStep == CompileStep.Template) ? "col-12 d-flex flex-column" : "col-6 d-flex flex-column";
         }
 
         /// <summary>
diff --git a/WebWindowComplex/WebWindowComplex.csproj b/WebWindowComplex/WebWindowComplex.csproj
index 375c5e4..6ce36b7 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.11.516</Version>
+    <Version>2.7.11.610</Version>
     <Authors>Annamaria Sassi</Authors>
     <Company>Egalware</Company>
     <Description>Componente gestione Configurazioni avanzate Window per LUX</Description>
@@ -274,6 +274,20 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
diff --git a/WebWindowConfigurator/WebWindowConfigurator.csproj b/WebWindowConfigurator/WebWindowConfigurator.csproj
index 065f4fc..8cd7f22 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.11.516</Version>
+        <Version>2.7.11.610</Version>
         <Authors>Annamaria Sassi</Authors>
         <Company>Egalware</Company>
         <Description>Componente gestione JWD per LUX</Description>
@@ -403,6 +403,12 @@
 
 
 
+
+
+
+
+
+