From 6cb04fd803219e1eba6fea8c5067041bf7a40675 Mon Sep 17 00:00:00 2001
From: Annamaria Sassi <annamaria.sassi@egalware.com>
Date: Fri, 14 Aug 2026 16:07:43 +0200
Subject: [PATCH] Traduzioni

---
 Test.UI/Traduzioni/Traduzione.json            | 67 ++++++++++---------
 WebWindowComplex/Compo/AreaFrame.razor.cs     |  2 +-
 WebWindowComplex/Compo/CardFill.razor         | 10 +--
 WebWindowComplex/Compo/CardFill.razor.cs      | 47 +++++++++++--
 WebWindowComplex/Compo/CardFrame.razor.cs     |  2 +-
 WebWindowComplex/TableComp.razor              | 18 ++---
 WebWindowComplex/WebWindowComplex.csproj      |  3 +
 .../WebWindowConfigurator.csproj              |  8 +++
 8 files changed, 104 insertions(+), 53 deletions(-)

diff --git a/Test.UI/Traduzioni/Traduzione.json b/Test.UI/Traduzioni/Traduzione.json
index ff0016d..410f5c2 100644
--- a/Test.UI/Traduzioni/Traduzione.json
+++ b/Test.UI/Traduzioni/Traduzione.json
@@ -1,34 +1,37 @@
 {
-  "CWFrame_BottomRail":"Zoccolo",
-  "CWFrame_Dimension":"Dimensioni",
-  "CWFrame_Element":"Elementi",
-  "CWFrame_Frame":"Telaio",
-  "CWFrame_Joints":"Giunzioni",
-  "CWFrame_Quantity":"Quantità",
-  "CWFrame_Shape":"Forma",
-  "CWFrame_Threshold":"Soglia",
-  "CWFrame_Tipology":"Tipologia",
-  "CWAreaF_AreaFrame":"Area Telaio",
-  "CWAreaF_AggSash":"Aggiungi Ante",
-  "CWAreaF_AggSplit":"Aggiungi divisione",
-  "CWAreaF_AggInglesina":"Aggiungi ingesina",
-  "CWTableC_Reset":"Reset",
-  "CWTableC_Save":"Salva",
-  "CWTableC_Close":"Chiudi",
-  "CWTableC_MissingParam":"Parametri mancanti!",
-  "CWTableC_MissingJWD":"JWD mancante!",
-  "CWTableC_ValidError":"Errore validazione!",
-  "CWTableC_ConfigError":"Errore configurazione",
-  "CWTableC_MissingValue":"Mancata corrispondenza valori",
-  "CWTableC_Tree":"Struttura",
-  "CWTableC_General":"Generale",
-  "CWFill_AllFill":"Tutti riempimenti",
-  "CWFill_AllGlass":"Tutti vetro",
-  "CWFill_AllWood":"Tutti legno",
-  "CWTree_Remove":"Elimina",
-  "CWTree_Sash":"Ante",
-  "CWTree_Split":"Divisione",
-  "CWTree_AddInglesina":"Aggiungi Inglesina",
-  "CWTree_AddSash":"Aggiungi Ante",
-  "CWTree_CopySash":"Copia Anta"
+  "CWFrame_BottomRail": "Zoccolo",
+  "CWFrame_Dimension": "Dimensioni",
+  "CWFrame_Element": "Elementi",
+  "CWFrame_Frame": "Telaio",
+  "CWFrame_Joints": "Giunzioni",
+  "CWFrame_Quantity": "Quantità",
+  "CWFrame_Shape": "Forma",
+  "CWFrame_Threshold": "Soglia",
+  "CWFrame_Tipology": "Tipologia",
+  "CWAreaF_AreaFrame": "Area Telaio",
+  "CWAreaF_AggSash": "Aggiungi Ante",
+  "CWAreaF_AggSplit": "Aggiungi divisione",
+  "CWAreaF_AggInglesina": "Aggiungi ingesina",
+  "CWTableC_Reset": "Reset",
+  "CWTableC_Save": "Salva",
+  "CWTableC_Close": "Chiudi",
+  "CWTableC_MissingParam": "Parametri mancanti!",
+  "CWTableC_MissingJWD": "JWD mancante!",
+  "CWTableC_ValidError": "Errore validazione!",
+  "CWTableC_ConfigError": "Errore configurazione",
+  "CWTableC_MissingValue": "Mancata corrispondenza valori",
+  "CWTableC_Tree": "Struttura",
+  "CWTableC_General": "Generale",
+  "CWTableC_AllFill": "Tutti riempimenti",
+  "CWTableC_AllGlass": "Tutti vetro",
+  "CWTableC_AllWood": "Tutti legno",
+  "CWTree_Remove": "Elimina",
+  "CWTree_Sash": "Ante",
+  "CWTree_Split": "Divisione",
+  "CWTree_AddInglesina": "Aggiungi Inglesina",
+  "CWTree_AddSash": "Aggiungi Ante",
+  "CWTree_CopySash": "Copia Anta",
+  "CWFill_Fill": "Riempimento",
+  "CWFill_Glass": "Vetro",
+  "CWFill_Wood": "Legno"
 }
\ No newline at end of file
diff --git a/WebWindowComplex/Compo/AreaFrame.razor.cs b/WebWindowComplex/Compo/AreaFrame.razor.cs
index 9f6d701..bd2b64a 100644
--- a/WebWindowComplex/Compo/AreaFrame.razor.cs
+++ b/WebWindowComplex/Compo/AreaFrame.razor.cs
@@ -26,7 +26,7 @@ namespace WebWindowComplex.Compo
         public List<Split> SplitList { get; set; } = null!;
 
         /// <summary>
-        /// Evento per richiesta traduzioni
+        /// Vocabolario con traduzione lingua corrente
         /// </summary>
         [CascadingParameter(Name = "Vocabulary")]
         public Dictionary<string, string> Vocabulary { get; set; } = null!;
diff --git a/WebWindowComplex/Compo/CardFill.razor b/WebWindowComplex/Compo/CardFill.razor
index 655d384..4e9e8fa 100644
--- a/WebWindowComplex/Compo/CardFill.razor
+++ b/WebWindowComplex/Compo/CardFill.razor
@@ -3,7 +3,7 @@
     <div class="card-header bg-light bg-opacity-25">
         <div class="d-flex justify-content-between align-items-center">
             <div class="px-2">
-                <h5>Fill @(CurrIndex + 1)</h5>
+                <h5>@Traduci("CWFill_Fill") @(CurrIndex + 1)</h5>
             </div>
             <div class="px-2">
                 <button class="btn btn-close" @onclick="ReqClose"></button>
@@ -19,11 +19,11 @@
                 <div class="input-group mb-2 justify-content-center">
                     @if (BaseUser)
                     {
-                        <button class="@buttonFillCss(WebWindowComplex.Json.WindowConst.FillTypes.GLASS)">Glass</button>
+                        <button class="@buttonFillCss(WebWindowComplex.Json.WindowConst.FillTypes.GLASS)">@Traduci("CWFill_Glass")</button>
                     }
                     else
                     {
-                        <button class="@buttonFillCss(WebWindowComplex.Json.WindowConst.FillTypes.GLASS)" @onclick="() => ChangeOneFill(WebWindowComplex.Json.WindowConst.FillTypes.GLASS)">Glass</button>
+                        <button class="@buttonFillCss(WebWindowComplex.Json.WindowConst.FillTypes.GLASS)" @onclick="() => ChangeOneFill(WebWindowComplex.Json.WindowConst.FillTypes.GLASS)">@Traduci("CWFill_Glass")</button>
                     }
                 </div>
             </div>
@@ -31,11 +31,11 @@
                 <div class="input-group mb-2 justify-content-center">
                     @if (BaseUser)
                     {
-                        <button class="@buttonFillCss(WebWindowComplex.Json.WindowConst.FillTypes.WOOD)">Wood</button>
+                        <button class="@buttonFillCss(WebWindowComplex.Json.WindowConst.FillTypes.WOOD)">@Traduci("CWFill_Wood")</button>
                     }
                     else
                     {
-                        <button class="@buttonFillCss(WebWindowComplex.Json.WindowConst.FillTypes.WOOD)" @onclick="() => ChangeOneFill(WebWindowComplex.Json.WindowConst.FillTypes.WOOD)">Wood</button>
+                        <button class="@buttonFillCss(WebWindowComplex.Json.WindowConst.FillTypes.WOOD)" @onclick="() => ChangeOneFill(WebWindowComplex.Json.WindowConst.FillTypes.WOOD)">@Traduci("CWFill_Wood")</button>
                     }
                 </div>
             </div>
diff --git a/WebWindowComplex/Compo/CardFill.razor.cs b/WebWindowComplex/Compo/CardFill.razor.cs
index a3d71ee..402294b 100644
--- a/WebWindowComplex/Compo/CardFill.razor.cs
+++ b/WebWindowComplex/Compo/CardFill.razor.cs
@@ -26,6 +26,12 @@ namespace WebWindowComplex.Compo
         [Parameter]
         public bool BaseUser { get; set; } = false!;
 
+        /// <summary>
+        /// Vocabolario con traduzione lingua corrente
+        /// </summary>
+        [Parameter]
+        public Dictionary<string, string> Vocabulary { get; set; } = null!;
+
         /// <summary>
         /// Evento per cambiare tutti i fill
         /// </summary>
@@ -38,25 +44,39 @@ namespace WebWindowComplex.Compo
         [Parameter]
         public EventCallback<bool> EC_ReqClose { get; set; }
 
+        /// <summary>
+        /// Evento per richiesta traduzione
+        /// </summary>
+        [Parameter]
+        public EventCallback<List<string>> EC_ReqTraduzione { get; set; }
+
         #endregion Public Properties
 
-        #region Protected Methods
+        #region Protected Properties
+        protected override async Task OnInitializedAsync()
+        {
+            Dictionary<string, string> FillDict = Vocabulary.Where(x => x.Key.Contains("CWFill_")).ToDictionary(x => x.Key, y => y.Value);
+            if (FillDict == null || FillDict.Count != 3)
+            {
+                List<string> tradList = new List<string>() { "CWFill_Fill", "CWFill_Glass", "CWFill_Wood"};
+                await EC_ReqTraduzione.InvokeAsync(tradList);
+            }
+        }
+        #endregion Protected Properties
+
+        #region Private Methods
 
         /// <summary>
         /// Metodo per cambiare solo il Fill corrente
         /// </summary>
         /// <param name="reqFillType"> Tipo di fill richiesto </param>
         /// <returns></returns>
-        protected Task ChangeOneFill(FillTypes reqFillType)
+        private Task ChangeOneFill(FillTypes reqFillType)
         {
             CurrFill.SelFillType = reqFillType;
             return EC_UpdateFill.InvokeAsync(CurrFill);
         }
 
-        #endregion Protected Methods
-
-        #region Private Methods
-
         /// <summary>
         /// Metodo per tornare alla pagina Tree
         /// </summary>
@@ -74,6 +94,21 @@ namespace WebWindowComplex.Compo
             return (CurrFill.SelFillType == reqFillTypes) ? "btn btn-secondary btn-sm" : "btn btn-outline-secondary btn-sm";
         }
 
+        /// <summary>
+        /// Metodo per traduzione in lingua corrente
+        /// </summary>
+        /// <param name="lemma"></param>
+        /// <returns></returns>
+        private string Traduci(string lemma)
+        {
+            string ans = lemma;
+            if (Vocabulary != null && Vocabulary.ContainsKey(lemma))
+            {
+                ans = Vocabulary.GetValueOrDefault(lemma) ?? "";
+            }
+            return ans;
+        }
+
         #endregion Private Methods
 
     }
diff --git a/WebWindowComplex/Compo/CardFrame.razor.cs b/WebWindowComplex/Compo/CardFrame.razor.cs
index a909db1..acfccc8 100644
--- a/WebWindowComplex/Compo/CardFrame.razor.cs
+++ b/WebWindowComplex/Compo/CardFrame.razor.cs
@@ -69,7 +69,7 @@ namespace WebWindowComplex.Compo
         public bool BaseUser { get; set; } = false!;
 
         /// <summary>
-        /// Evento per richiesta traduzioni
+        /// Vocabolario con traduzione lingua corrente
         /// </summary>
         [CascadingParameter(Name = "Vocabulary")]
         public Dictionary<string, string> Vocabulary { get; set; } = null!;
diff --git a/WebWindowComplex/TableComp.razor b/WebWindowComplex/TableComp.razor
index eb10b68..a6ca8ac 100644
--- a/WebWindowComplex/TableComp.razor
+++ b/WebWindowComplex/TableComp.razor
@@ -136,7 +136,7 @@
                                         <CascadingValue Value="FrameWindow" Name="CurrFrameWindow">
                                             <CascadingValue Value="SashGroupList" Name="SashGroupList">
                                                 <CascadingValue Value="SplitList" Name="SplitList">
-                                                    <CascadingValue Value="@(RestrictDict(new List<string>(){"CWFrame_", "CWAreaF_"}))" Name="Vocabulary">
+                                                    <CascadingValue Value="Vocabulary" Name="Vocabulary">
                                                         <CardFrame EC_ReqResetDict="ReqResetDict"
                                                                    EC_ReqOptionHw="UpdateHwOptionsFrame"
                                                                    EC_ReqElement="UpdateElementFrame"
@@ -234,34 +234,36 @@
                                     {
                                         <CardFill CurrIndex="currFillIndex"
                                                   CurrFill="FillList[currFillIndex]"
-                                                  User="BaseUser"
+                                                  BaseUser="BaseUser"
+                                                  Vocabulary="Vocabulary"
                                                   EC_UpdateFill="UpdatePreviewFill"
-                                                  EC_ReqClose="ReturnTree">
+                                                  EC_ReqClose="ReturnTree"
+                                                  EC_ReqTraduzione="DoReqTraduzione">
                                         </CardFill>
                                         <div class="card shadow-sm rounded mb-2">
                                             <div class="card-body py-2">
                                                 <div class="d-flex justify-content-between align-items-center">
                                                     <div class="col-4 d-flex justify-content-left">
-                                                        <h5 class="text-center text-nowrap">@Traduci("CWFill_AllFill")</h5>
+                                                        <h5 class="text-center text-nowrap">@Traduci("CWTableC_AllFill")</h5>
                                                     </div>
                                                     <div class="input-group mb-2 justify-content-center">
                                                         @if (BaseUser)
                                                         {
-                                                            <button class="@buttonFillCss(Json.WindowConst.FillTypes.GLASS)">@Traduci("CWFill_AllGlass")</button>
+                                                            <button class="@buttonFillCss(Json.WindowConst.FillTypes.GLASS)">@Traduci("CWTableC_AllGlass")</button>
                                                         }
                                                         else
                                                         {
-                                                            <button class="@buttonFillCss(Json.WindowConst.FillTypes.GLASS)" @onclick="() => ChangeAllFill(WebWindowComplex.Json.WindowConst.FillTypes.GLASS)">@Traduci("CWFill_AllGlass")</button>
+                                                            <button class="@buttonFillCss(Json.WindowConst.FillTypes.GLASS)" @onclick="() => ChangeAllFill(WebWindowComplex.Json.WindowConst.FillTypes.GLASS)">@Traduci("CWTableC_AllGlass")</button>
                                                         }
                                                     </div>
                                                     <div class="input-group mb-2 justify-content-center">
                                                         @if (BaseUser)
                                                         {
-                                                            <button class="@buttonFillCss(Json.WindowConst.FillTypes.WOOD)">@Traduci("CWFill_AllWood")</button>
+                                                            <button class="@buttonFillCss(Json.WindowConst.FillTypes.WOOD)">@Traduci("CWTableC_AllWood")</button>
                                                         }
                                                         else
                                                         {
-                                                            <button class="@buttonFillCss(Json.WindowConst.FillTypes.WOOD)" @onclick="() => ChangeAllFill(WebWindowComplex.Json.WindowConst.FillTypes.WOOD)">@Traduci("CWFill_AllWood")</button>
+                                                            <button class="@buttonFillCss(Json.WindowConst.FillTypes.WOOD)" @onclick="() => ChangeAllFill(WebWindowComplex.Json.WindowConst.FillTypes.WOOD)">@Traduci("CWTableC_AllWood")</button>
                                                         }
                                                     </div>
                                                 </div>
diff --git a/WebWindowComplex/WebWindowComplex.csproj b/WebWindowComplex/WebWindowComplex.csproj
index 90488c3..206eb04 100644
--- a/WebWindowComplex/WebWindowComplex.csproj
+++ b/WebWindowComplex/WebWindowComplex.csproj
@@ -244,6 +244,9 @@
 
 
 
+
+
+
 
 
 
diff --git a/WebWindowConfigurator/WebWindowConfigurator.csproj b/WebWindowConfigurator/WebWindowConfigurator.csproj
index 0cd714e..2db8e85 100644
--- a/WebWindowConfigurator/WebWindowConfigurator.csproj
+++ b/WebWindowConfigurator/WebWindowConfigurator.csproj
@@ -551,6 +551,14 @@
 
 
 
+
+
+
+
+
+
+
+