From 14aa91637ad5c051bdecd1469a9ae2c5f77204bc Mon Sep 17 00:00:00 2001
From: Annamaria Sassi <annamaria.sassi@egalware.com>
Date: Tue, 15 Jul 2025 14:32:48 +0200
Subject: [PATCH] - corretti titoli delle tabs - aggiunti combobox per joint
 del telaio

---
 WebWindowConfigurator/WebWindowMaker.razor    | 50 +++++++++++++++----
 WebWindowConfigurator/WebWindowMaker.razor.cs |  7 ++-
 WebWindowConfigurator/Window.cs               |  4 +-
 3 files changed, 45 insertions(+), 16 deletions(-)

diff --git a/WebWindowConfigurator/WebWindowMaker.razor b/WebWindowConfigurator/WebWindowMaker.razor
index 0f86050..e58e2eb 100644
--- a/WebWindowConfigurator/WebWindowMaker.razor
+++ b/WebWindowConfigurator/WebWindowMaker.razor
@@ -13,23 +13,33 @@
                 }
             </li>
             <li class="nav-item">
-                @if (currStep == CompileStep.Shape)
+                @if (currStep == CompileStep.Sash)
                 {
-                    <a href="#" data-target="#Shape" class="nav-link active" aria-current="true" @onclick="() => AdvStep(CompileStep.Shape)">Shape</a>
+                    <a href="#" data-target="#Sash" class="nav-link active" aria-current="true" @onclick="() => AdvStep(CompileStep.Sash)">Sash</a>
                 }
                 else
                 {
-                    <a href="#" data-target="#Shape" class="nav-link" @onclick="() => AdvStep(CompileStep.Shape)">Shape</a>
+                    <a href="#" data-target="#Sash" class="nav-link" @onclick="() => AdvStep(CompileStep.Sash)">Sash</a>
                 }
             </li>
             <li class="nav-item">
-                @if (currStep == CompileStep.Dimension)
+                @if (currStep == CompileStep.Split)
                 {
-                    <a href="#" data-target="#Dimension" class="nav-link active" aria-current="true" @onclick="() => AdvStep(CompileStep.Dimension)">Dimension</a>
+                    <a href="#" data-target="#Split" class="nav-link active" aria-current="true" @onclick="() => AdvStep(CompileStep.Split)">Split</a>
                 }
                 else
                 {
-                    <a href="#" data-target="#Dimension" class="nav-link" @onclick="() => AdvStep(CompileStep.Dimension)">Dimension</a>
+                    <a href="#" data-target="#Split" class="nav-link" @onclick="() => AdvStep(CompileStep.Split)">Split</a>
+                }
+            </li>
+            <li class="nav-item">
+                @if (currStep == CompileStep.Fill)
+                {
+                    <a href="#" data-target="#Fill" class="nav-link active" aria-current="true" @onclick="() => AdvStep(CompileStep.Fill)">Fill</a>
+                }
+                else
+                {
+                    <a href="#" data-target="#Fill" class="nav-link" @onclick="() => AdvStep(CompileStep.Fill)">Fill</a>
                 }
             </li>
         </ul>
@@ -59,6 +69,19 @@
                         <option value="7">Triangle</option>
                     </select>
                 </div>
+                <div class="input-group w-50">
+                    @foreach (Joint joint in m_frame.JointList)
+                    {
+                        <div class="input-group mb-3 w-50">
+                            <label class="input-group-text" for="inputGroupSelect02">Giunzioni telaio @joint.nIndex</label>
+                            <select class="form-select" @bind="@joint.SelJointTypeIndex">
+                                <option value="0">Angled</option>
+                                <option value="1">Full H</option>
+                                <option value="2">Full V</option>
+                            </select>
+                        </div>
+                    }
+                </div>
                 <div class="d-flex justify-content-start fs-5 mb-3 w-25">
                     <div class="p-2">
                         <input class="form-check-input ml-auto" type="checkbox" name="BottomRail" id="BottomRail" @bind="@m_frame.BottomRail"> 
@@ -73,17 +96,24 @@
                 </div>
                 @*<button class="btn btn-sm btn-primary" title="Reset selezione" @onclick="DoReset"><i class="fa-solid fa-arrow-rotate-right"></i></button> *@
             }
-            else if (currStep == CompileStep.Shape)
+            else if (currStep == CompileStep.Sash)
             {
                 <div class="alert alert-light text-center display-4">
-                    aggiungi
+                    aggiungi finestre
                     @* <button class="btn btn-sm btn-primary" title="Reset selezione" @onclick="DoReset"><i class="fa-solid fa-arrow-rotate-right"></i></button> *@
                 </div>
             }
-            else if (currStep == CompileStep.Dimension)
+            else if (currStep == CompileStep.Split)
             {
                 <div class="alert alert-info text-center display-4">
-                    aggiungi dimensioni
+                    aggiungi montanti
+                    @* <button class="btn btn-sm btn-primary" title="Reset selezione" @onclick="DoReset"><i class="fa-solid fa-arrow-rotate-right"></i></button> *@
+                </div>
+            }
+            else if (currStep == CompileStep.Fill)
+            {
+                <div class="alert alert-info text-center display-4">
+                    aggiungi riempimento
                     @* <button class="btn btn-sm btn-primary" title="Reset selezione" @onclick="DoReset"><i class="fa-solid fa-arrow-rotate-right"></i></button> *@
                 </div>
             }
diff --git a/WebWindowConfigurator/WebWindowMaker.razor.cs b/WebWindowConfigurator/WebWindowMaker.razor.cs
index 0e15905..b183c99 100644
--- a/WebWindowConfigurator/WebWindowMaker.razor.cs
+++ b/WebWindowConfigurator/WebWindowMaker.razor.cs
@@ -14,9 +14,9 @@ namespace WebWindowConfigurator
         {
             Draft = 0,
             General = 1,
-            Shape,
-            Dimension,
-            Open
+            Sash,
+            Split,
+            Fill
         }
 
         private CompileStep currStep = CompileStep.Draft;
@@ -65,7 +65,6 @@ namespace WebWindowConfigurator
             Frame NewFrame = (Frame)Frame.CreateFrame(m_CurrWindow);
             m_CurrWindow.AreaList.Add(NewFrame);
             m_SelArea = NewFrame;
-            var cc= m_frame.Shape;
         }
 
         private Window m_CurrWindow { get; set; } = new Window();
diff --git a/WebWindowConfigurator/Window.cs b/WebWindowConfigurator/Window.cs
index 9611d2e..e0e537f 100644
--- a/WebWindowConfigurator/Window.cs
+++ b/WebWindowConfigurator/Window.cs
@@ -1408,8 +1408,8 @@ namespace WebWindowConfigurator
         private List<IdNameStruct> m_JointTypeList = new List<IdNameStruct>
     {
         new IdNameStruct((int)Joints.ANGLED, "Angled"),
-            new IdNameStruct((int)Joints.FULL_H, "Full H"),
-            new IdNameStruct((int)Joints.FULL_V, "Full V")
+        new IdNameStruct((int)Joints.FULL_H, "Full H"),
+        new IdNameStruct((int)Joints.FULL_V, "Full V")
     };
     public List<IdNameStruct> JointTypeList
     {