From 38ab3eee81cdeabb536f062dac7fc21047d580d1 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Wed, 22 Oct 2025 19:20:31 +0200
Subject: [PATCH] Ancora update x gestione ritorno dizionario forme validate

---
 Test.UI/Components/Pages/EditJWD.razor.cs     | 25 +++++++++++++------
 WebWindowComplex/TableComp.razor.cs           |  4 +--
 WebWindowComplex/WebWindowComplex.csproj      |  2 ++
 .../WebWindowConfigurator.csproj              |  4 ++-
 4 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/Test.UI/Components/Pages/EditJWD.razor.cs b/Test.UI/Components/Pages/EditJWD.razor.cs
index 1569213..d3d3379 100644
--- a/Test.UI/Components/Pages/EditJWD.razor.cs
+++ b/Test.UI/Components/Pages/EditJWD.razor.cs
@@ -48,6 +48,8 @@ namespace Test.UI.Components.Pages
         protected Dictionary<string, string> m_CurrArgs = new Dictionary<string, string>();
         protected string prevJwd = "";
 
+        protected Dictionary<int, string> currGroupShape = new Dictionary<int, string>();
+
         /// <summary>
         /// Configurazione elenchi anagrafiche
         /// </summary>
@@ -143,7 +145,8 @@ namespace Test.UI.Components.Pages
             CurrData = new LivePayload()
             {
                 CurrJwd = InitialJwd,
-                SvgPreview = currSvg
+                SvgPreview = currSvg,
+                DictShape = currGroupShape
             };
             DLService.PipeSvg.EA_NewMessage += PipeSvg_EA_NewMessage;
             DLService.PipeShape.EA_NewMessage += PipeShape_EA_NewMessage;
@@ -214,7 +217,7 @@ namespace Test.UI.Components.Pages
             calcTag = Config.GetValue<string>("ServerConf:CalcTag") ?? "";
             svgChannel = Config.GetValue<string>("ServerConf:SvgChannel") ?? "";
             shapeChannel = Config.GetValue<string>("ServerConf:ShapeChannel") ?? "";
-            
+
         }
 
         private async Task ExecRequest(Dictionary<string, string> CurrArgs)
@@ -241,18 +244,26 @@ namespace Test.UI.Components.Pages
         }
 
         private async void PipeShape_EA_NewMessage(object? sender, EventArgs e)
-        { 
+        {
             // aggiorno visualizzazione
             PubSubEventArgs currArgs = (PubSubEventArgs)e;
             // conversione on-the-fly SVG da mostrare
             if (!string.IsNullOrEmpty(currArgs.newMessage))
             {
-                if (currArgs.msgUid.Equals($"{shapeChannel}:{windowUid}"))
+                if (currArgs.msgUid.StartsWith($"{shapeChannel}:{windowUid}:"))
                 {
-#if false
+                    int groupId = 0;
                     // verifica del groupID...
-                    CurrData.Shape = "Rectangle";// currArgs.newMessage;  
-#endif
+                    int.TryParse(currArgs.msgUid.Replace($"{shapeChannel}:{windowUid}:", ""), out groupId);
+                    if (currGroupShape.ContainsKey(groupId))
+                    {
+                        currGroupShape[groupId] = currArgs.newMessage;
+                    }
+                    else
+                    {
+                        currGroupShape.Add(groupId, currArgs.newMessage);
+                    }
+                    CurrData.DictShape = currGroupShape;
                 }
                 await InvokeAsync(StateHasChanged);
             }
diff --git a/WebWindowComplex/TableComp.razor.cs b/WebWindowComplex/TableComp.razor.cs
index fb4b2b2..c745f40 100644
--- a/WebWindowComplex/TableComp.razor.cs
+++ b/WebWindowComplex/TableComp.razor.cs
@@ -582,9 +582,7 @@ namespace WebWindowComplex
                             {
                                 CurrJwd = LiveData.CurrJwd,
                                 OptionsXml = LiveData.OptionsXml,
-#if false
-                                Shape = LiveData.Shape, 
-#endif
+                                DictShape = LiveData.DictShape,
                                 SvgPreview = LiveData.SvgPreview
                             };
                             m_SelSVG = LiveData.SvgPreview;
diff --git a/WebWindowComplex/WebWindowComplex.csproj b/WebWindowComplex/WebWindowComplex.csproj
index f36fcc3..ca37ebc 100644
--- a/WebWindowComplex/WebWindowComplex.csproj
+++ b/WebWindowComplex/WebWindowComplex.csproj
@@ -72,6 +72,8 @@
 
 
 
+
+
 
 
 
diff --git a/WebWindowConfigurator/WebWindowConfigurator.csproj b/WebWindowConfigurator/WebWindowConfigurator.csproj
index 18a7ee5..ba95b44 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.2216</Version>
+        <Version>2.7.10.2219</Version>
         <Authors>Annamaria Sassi</Authors>
         <Company>Egalware</Company>
         <Description>Componente gestione JWD per LUX</Description>
@@ -144,6 +144,8 @@
 
 
 
+
+