From 8f0b54e30f88d784855cc3861293bcd9e94a428f Mon Sep 17 00:00:00 2001
From: Annamaria Sassi <annamaria.sassi@egalware.com>
Date: Thu, 23 Apr 2026 16:48:37 +0200
Subject: [PATCH] Modificata aggiunta Inglesina in Frame e Vetro fisso

---
 WebWindowComplex/Compo/AreaSplit.razor        |  5 ++
 WebWindowComplex/Compo/AreaSplit.razor.cs     | 10 ++++
 WebWindowComplex/Compo/CardTree.razor         | 53 ++++++++++++-------
 WebWindowComplex/Compo/CardTree.razor.cs      | 28 ++++++++++
 WebWindowComplex/WebWindowComplex.csproj      |  9 +++-
 .../WebWindowConfigurator.csproj              | 11 +++-
 6 files changed, 96 insertions(+), 20 deletions(-)

diff --git a/WebWindowComplex/Compo/AreaSplit.razor b/WebWindowComplex/Compo/AreaSplit.razor
index 7d42284..21d3707 100644
--- a/WebWindowComplex/Compo/AreaSplit.razor
+++ b/WebWindowComplex/Compo/AreaSplit.razor
@@ -18,6 +18,11 @@
                     </div>
                 }
             </div>
+            <div class="col d-flex justify-content-center">
+                <div class="input-group mb-2 justify-content-center">
+                    <button class="btn btn-outline-secondary btn-sm" @onclick="() => RaiseAddInglesina()">Add Inglesina</button>
+                </div>
+            </div>
         </div>
     </div>
 </div>
diff --git a/WebWindowComplex/Compo/AreaSplit.razor.cs b/WebWindowComplex/Compo/AreaSplit.razor.cs
index e8178e8..bc86baf 100644
--- a/WebWindowComplex/Compo/AreaSplit.razor.cs
+++ b/WebWindowComplex/Compo/AreaSplit.razor.cs
@@ -60,6 +60,16 @@ namespace WebWindowComplex.Compo
             return EC_UpdateSplitted.InvokeAsync(CurrSplitted);
         }
 
+        /// <summary>
+        /// Metodo per aggiungere prima sash
+        /// </summary>
+        /// <returns></returns>
+        private Task RaiseAddInglesina()
+        {
+            CurrSplitted.AddInglesina();
+            return EC_UpdateSplitted.InvokeAsync(CurrSplitted);
+        }
+
         #endregion Private Methods
     }
 }
\ No newline at end of file
diff --git a/WebWindowComplex/Compo/CardTree.razor b/WebWindowComplex/Compo/CardTree.razor
index a41b7b7..592b846 100644
--- a/WebWindowComplex/Compo/CardTree.razor
+++ b/WebWindowComplex/Compo/CardTree.razor
@@ -80,7 +80,8 @@
                                                 </button>
                                             }
                                             @if (ItemTableList[i].Type is Json.WindowConst.AreaTypes.FRAME &&
-                                                ((SashGroupList.Count == 0 && SplitList.Count == 0) || !(FrameWindow.AreaList.First() is Split)))
+                                                ((SashGroupList.Count == 0 && SplitList.Count == 0) || !(FrameWindow.AreaList.First() is Split)) &&
+                                                 FrameWindow.AreaList.FirstOrDefault() != null && FrameWindow.AreaList.First()!.AreaList.Count == 0)
                                             {
                                                 <div class="dropdown px-4">
                                                     <button class="btn btn-sm dropdown-toggle" type="button" @onclick="ToggleDropdownFrame">
@@ -98,27 +99,43 @@
                                                     </ul>
                                                 </div>
                                             }
-                                            @if (ItemTableList[i].Type is Json.WindowConst.AreaTypes.FILL && SplittedList != null && SplittedList.Count > 0)
+                                            @if (ItemTableList[i].Type is Json.WindowConst.AreaTypes.FILL)
                                             {
                                                 int currIndexFill = ItemTableList[i].IndexItem;
-                                                Splitted? currSplitted = SplittedList.Where(x => x.AreaList.First().Equals(FillList[currIndexFill])).FirstOrDefault();
-                                                @if (currSplitted != null)
+                                                if (FillList.ElementAt(currIndexFill).ParentArea is Frame)
                                                 {
-                                                    @if (currSplitted.ParentArea != null && currSplitted.ParentWindow != null)
+                                                    <div class="dropdown px-4">
+                                                        <button class="btn btn-sm dropdown-toggle" type="button" @onclick="() => ToggleDropdownFill(currIndexFill)">
+                                                            <i class="fa-solid fa-plus"></i>
+                                                        </button>
+                                                        <ul class="dropdown-menu @(isOpenFill.ElementAt(currIndexFill) ? "show" : "")" style="min-width:5rem; max-width:10rem">
+                                                            <li><button class="dropdown-item" @onclick="() => AddInglesinaIntoFill(currIndexFill)">Add Inglesina</button></li>
+                                                        </ul>
+                                                    </div>
+                                                }
+                                                else if (SplittedList != null && SplittedList.Count > 0)
+                                                {
+                                                Splitted? currSplitted = SplittedList.Where(x => x.AreaList.First().Equals(FillList[currIndexFill])).FirstOrDefault();
+                                                    @if (currSplitted != null)
                                                     {
-                                                        <div class="dropdown px-4">
-                                                            <button class="btn btn-sm dropdown-toggle" type="button" @onclick="() => ToggleDropdownFill(currIndexFill)">
-                                                                <i class="fa-solid fa-plus"></i>
-                                                            </button>
-                                                            <ul class="dropdown-menu @(isOpenFill.ElementAt(currIndexFill) ? "show" : "")" style="min-width:5rem; max-width:10rem">
-                                                                <li><button class="dropdown-item" @onclick="() => AddSashIntoFill(currIndexFill)">Add Sash</button></li>
-                                                                @for (int k = 0; k < SashGroupList.Count; k++)
-                                                                {
-                                                                    int Index = k;
-                                                                    <li><button class="dropdown-item" @onclick="() => CopySashIntoFill(Index, currIndexFill)">Copy Sash @(SashGroupList.Count == 1 ? "" : (Index + 1))</button></li>
-                                                                }
-                                                            </ul>
-                                                        </div>
+                                                        @if (currSplitted.ParentArea != null && currSplitted.ParentWindow != null
+                                                             && currSplitted.AreaList.FirstOrDefault() != null && currSplitted.AreaList.First()!.AreaList.Count == 0)
+                                                        {
+                                                            <div class="dropdown px-4">
+                                                                <button class="btn btn-sm dropdown-toggle" type="button" @onclick="() => ToggleDropdownFill(currIndexFill)">
+                                                                    <i class="fa-solid fa-plus"></i>
+                                                                </button>
+                                                                <ul class="dropdown-menu @(isOpenFill.ElementAt(currIndexFill) ? "show" : "")" style="min-width:5rem; max-width:10rem">
+                                                                    <li><button class="dropdown-item" @onclick="() => AddInglesinaIntoFill(currIndexFill)">Add Inglesina</button></li>
+                                                                    <li><button class="dropdown-item" @onclick="() => AddSashIntoFill(currIndexFill)">Add Sash</button></li>
+                                                                    @for (int k = 0; k < SashGroupList.Count; k++)
+                                                                    {
+                                                                        int Index = k;
+                                                                        <li><button class="dropdown-item" @onclick="() => CopySashIntoFill(Index, currIndexFill)">Copy Sash @(SashGroupList.Count == 1 ? "" : (Index + 1))</button></li>
+                                                                    }
+                                                                </ul>
+                                                            </div>
+                                                        }
                                                     }
                                                 }
                                             }
diff --git a/WebWindowComplex/Compo/CardTree.razor.cs b/WebWindowComplex/Compo/CardTree.razor.cs
index 2ef9437..d5e0392 100644
--- a/WebWindowComplex/Compo/CardTree.razor.cs
+++ b/WebWindowComplex/Compo/CardTree.razor.cs
@@ -219,6 +219,34 @@ namespace WebWindowComplex.Compo
             return EC_UpdateSplitted.InvokeAsync(currSplitted);
         }
 
+        /// <summary>
+        /// Chiamata per aggiungere inglesina in un fill
+        /// </summary>
+        /// <param name="currIndexFill"> indice del fill </param>
+        /// <returns></returns>
+        private Task AddInglesinaIntoFill(int currIndexFill)
+        {
+            Splitted? currSplitted;
+            Frame? currFrame;
+            if (FillList.ElementAt(currIndexFill).ParentArea is Splitted)
+            {
+                currSplitted = (Splitted)FillList.ElementAt(currIndexFill).ParentArea;
+                currSplitted.AddInglesina();
+                return EC_UpdateSplitted.InvokeAsync(currSplitted);
+            }
+            else if(FillList.ElementAt(currIndexFill).ParentArea is Frame)
+            {
+                currFrame = (Frame)FillList.ElementAt(currIndexFill).ParentArea;
+                currFrame.AddInglesina();
+                DataUpdateFrame args = new DataUpdateFrame()
+                {
+                    currFrame = currFrame
+                };
+                return EC_UpdateFrame.InvokeAsync(args);
+            }
+            return null;
+        }
+
         /// <summary>
         /// Chiamata per copiare sash in fill
         /// </summary>
diff --git a/WebWindowComplex/WebWindowComplex.csproj b/WebWindowComplex/WebWindowComplex.csproj
index 9de1408..05513ec 100644
--- a/WebWindowComplex/WebWindowComplex.csproj
+++ b/WebWindowComplex/WebWindowComplex.csproj
@@ -6,7 +6,7 @@
     <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
-    <Version>3.1.4.1713</Version>
+    <Version>3.1.4.2316</Version>
     <Authors>Annamaria Sassi</Authors>
     <Company>Egalware</Company>
     <Description>Componente gestione Configurazioni avanzate Window per LUX</Description>
@@ -168,6 +168,13 @@
 
 
 
+
+
+
+
+
+
+
 
 
 
diff --git a/WebWindowConfigurator/WebWindowConfigurator.csproj b/WebWindowConfigurator/WebWindowConfigurator.csproj
index 96f5746..6f0e597 100644
--- a/WebWindowConfigurator/WebWindowConfigurator.csproj
+++ b/WebWindowConfigurator/WebWindowConfigurator.csproj
@@ -6,7 +6,7 @@
         <TargetFramework>net8.0</TargetFramework>
         <Nullable>enable</Nullable>
         <ImplicitUsings>enable</ImplicitUsings>
-        <Version>3.1.4.1714</Version>
+        <Version>3.1.4.2316</Version>
         <Authors>Annamaria Sassi</Authors>
         <Company>Egalware</Company>
         <Description>Componente gestione JWD per LUX</Description>
@@ -269,6 +269,15 @@
 
 
 
+
+
+
+
+
+
+
+
+