From 7e2728369103fb5d1b2d1af2a3ff573dc412f4aa Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Fri, 12 Sep 2025 19:18:51 +0200
Subject: [PATCH] Update chiamate con nuova API x HW list

---
 EgwCoreLib.Lux.Core/Enums.cs                  | 30 ++++++++++++++++++-
 .../Services/DataLayerServices.cs             |  3 +-
 Lux.API/Controllers/WindowController.cs       |  6 ++--
 Lux.API/Lux.API.csproj                        |  3 +-
 Lux.API/Services/ExternalMessageProcessor.cs  |  2 +-
 Lux.UI.Client/Lux.UI.Client.csproj            |  1 +
 Lux.UI/Lux.UI.csproj                          |  4 ++-
 Resources/ChangeLog.html                      |  2 +-
 Resources/VersNum.txt                         |  2 +-
 Resources/manifest.xml                        |  2 +-
 10 files changed, 45 insertions(+), 10 deletions(-)

diff --git a/EgwCoreLib.Lux.Core/Enums.cs b/EgwCoreLib.Lux.Core/Enums.cs
index 70a59076..0940689e 100644
--- a/EgwCoreLib.Lux.Core/Enums.cs
+++ b/EgwCoreLib.Lux.Core/Enums.cs
@@ -1,4 +1,6 @@
-namespace EgwCoreLib.Lux.Core
+using System.Text.RegularExpressions;
+
+namespace EgwCoreLib.Lux.Core
 {
     public class Enums
     {
@@ -57,6 +59,9 @@
             BomAlt
         }
 
+        /// <summary>
+        /// Modo chiamata Engine
+        /// </summary>
 
         public enum EngineQueryType
         {
@@ -65,5 +70,28 @@
             Bom,
             HardwareModelList
         }
+
+        /// <summary>
+        /// SubMode di chiamata Engine
+        /// </summary>
+        public enum EngineSubMode
+        {
+            NULL = 0,
+            LIST = 1,
+            CALCSASH = 2,
+            SASHOPTIONS = 3
+        }
+
+
+        /// <summary>
+        /// Elenco produttori Hardware
+        /// </summary>
+        public enum EngineHwManufacturers
+        {
+            NULL = 0,
+            AGB = 1,
+            MAICO = 2,
+            ROTO = 3
+        }
     }
 }
diff --git a/EgwCoreLib.Lux.Data/Services/DataLayerServices.cs b/EgwCoreLib.Lux.Data/Services/DataLayerServices.cs
index d9b56765..c7850890 100644
--- a/EgwCoreLib.Lux.Data/Services/DataLayerServices.cs
+++ b/EgwCoreLib.Lux.Data/Services/DataLayerServices.cs
@@ -406,13 +406,14 @@ namespace EgwCoreLib.Lux.Data.Services
         /// <param name="execEnvironment">Environment dell'item</param>
         /// <param name="rawContent">HardwareModelList serializzata</param>
         /// <returns></returns>
-        public async Task SaveHamlAsync(string uID, Constants.EXECENVIRONMENTS execEnvironment, string rawContent)
+        public async Task SaveHmlAsync(string uID, Constants.EXECENVIRONMENTS execEnvironment, string rawContent)
         {
             // salvo sul DB il risultato della BOM
             if (!string.IsNullOrEmpty(rawContent))
             {
                 try
                 {
+                    // salvo il set come oggetti deserializzati/testati?
 #if false
                     // deserializzo la Bom...
                     var bomList = JsonConvert.DeserializeObject<List<BomItemDTO>>(rawContent);
diff --git a/Lux.API/Controllers/WindowController.cs b/Lux.API/Controllers/WindowController.cs
index 499c5b2b..a1df77c4 100644
--- a/Lux.API/Controllers/WindowController.cs
+++ b/Lux.API/Controllers/WindowController.cs
@@ -88,8 +88,10 @@ namespace Lux.API.Controllers
             string hwContent = "";
             Dictionary<string, string> DictExec = new Dictionary<string, string>();
             DictExec.Add("Mode", $"{(int)Enums.EngineQueryType.HardwareModelList}");
-            DictExec.Add("UID", "NONE");
-            //DictExec.Add("Jwd", demoJwd);
+            // da rivedere?
+            DictExec.Add("UID", "HW.AGB");
+            DictExec.Add("SubMode", $"{(int)Enums.EngineSubMode.LIST}");
+            DictExec.Add("Manufacturer", $"{(int)Enums.EngineHwManufacturers.AGB}");
             int nId = 1;
             // da modificare con tipo richiesta...
             QuestionDTO currArgs = new QuestionDTO(nId, EgwMultiEngineManager.Data.Constants.EXECENVIRONMENTS.WINDOW, DictExec);
diff --git a/Lux.API/Lux.API.csproj b/Lux.API/Lux.API.csproj
index e8f2153f..828812cd 100644
--- a/Lux.API/Lux.API.csproj
+++ b/Lux.API/Lux.API.csproj
@@ -4,7 +4,7 @@
         <TargetFramework>net8.0</TargetFramework>
         <Nullable>enable</Nullable>
         <ImplicitUsings>enable</ImplicitUsings>
-        <Version>0.9.2509.1216</Version>
+        <Version>0.9.2509.1218</Version>
     </PropertyGroup>
 
     <ItemGroup>
@@ -65,6 +65,7 @@
     </ItemGroup>
 
     <ItemGroup>
+        <PackageReference Include="Egw.Lux.WebWindow.Base" Version="2.7.9-beta.1217" />
         <PackageReference Include="EgwMultiEngineManager.Data" Version="2.7.8.5" />
         <PackageReference Include="NLog" Version="6.0.1" />
         <PackageReference Include="NLog.Web.AspNetCore" Version="6.0.1" />
diff --git a/Lux.API/Services/ExternalMessageProcessor.cs b/Lux.API/Services/ExternalMessageProcessor.cs
index c3c686d0..d85d223e 100644
--- a/Lux.API/Services/ExternalMessageProcessor.cs
+++ b/Lux.API/Services/ExternalMessageProcessor.cs
@@ -65,7 +65,7 @@ namespace Lux.API.Services
                                 string newHml = retData.Args["HardwareModelList"];
                                 string UID = retData.Args["UID"];
                                 await cacheService.SaveHmlAsync(UID, retData.ExecEnvironment, newHml);
-                                await dbService.SaveHamlAsync(UID, retData.ExecEnvironment, newHml);
+                                await dbService.SaveHmlAsync(UID, retData.ExecEnvironment, newHml);
                             }
                         }
                     }
diff --git a/Lux.UI.Client/Lux.UI.Client.csproj b/Lux.UI.Client/Lux.UI.Client.csproj
index e6d2cdcd..1670c088 100644
--- a/Lux.UI.Client/Lux.UI.Client.csproj
+++ b/Lux.UI.Client/Lux.UI.Client.csproj
@@ -9,6 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Egw.Lux.WebWindow.Base" Version="2.7.9-beta.1217" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.17" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="8.0.17" />
   </ItemGroup>
diff --git a/Lux.UI/Lux.UI.csproj b/Lux.UI/Lux.UI.csproj
index 4816c28e..11318e30 100644
--- a/Lux.UI/Lux.UI.csproj
+++ b/Lux.UI/Lux.UI.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
     <PropertyGroup>
         <TargetFramework>net8.0</TargetFramework>
@@ -17,6 +17,8 @@
     </ItemGroup>
 
     <ItemGroup>
+        <PackageReference Include="Egw.Lux.WebWindow.Base" Version="2.7.9-beta.1217" />
+        <PackageReference Include="Egw.Lux.WebWindowComplex" Version="2.7.9-beta.1217" />
         <PackageReference Include="Egw.Lux.WebWindowConfigurator" Version="2.7.9.415" />
         <PackageReference Include="EgwCoreLib.Razor" Version="1.5.2507.1815" />
         <PackageReference Include="EgwCoreLib.Utils" Version="1.5.2507.1815" />
diff --git a/Resources/ChangeLog.html b/Resources/ChangeLog.html
index 7bfe64e5..b22ab198 100644
--- a/Resources/ChangeLog.html
+++ b/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>LUX - Web Windows MES</i>
-    <h4>Versione: 0.9.2509.1216</h4>
+    <h4>Versione: 0.9.2509.1218</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/Resources/VersNum.txt b/Resources/VersNum.txt
index 142ebf00..6b5afbb4 100644
--- a/Resources/VersNum.txt
+++ b/Resources/VersNum.txt
@@ -1 +1 @@
-0.9.2509.1216
+0.9.2509.1218
diff --git a/Resources/manifest.xml b/Resources/manifest.xml
index 9101b1aa..c85f81fc 100644
--- a/Resources/manifest.xml
+++ b/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>0.9.2509.1216</version>
+  <version>0.9.2509.1218</version>
   <url>http://nexus.steamware.net/repository/SWS/GPW/stable/GPW.UI.zip</url>
   <changelog>http://nexus.steamware.net/repository/SWS/GPW/stable/ChangeLog.html</changelog>
   <mandatory>false</mandatory>