Egalware/lux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update chiamate con nuova API x HW list

Browse Source
This commit is contained in:
Samuele Locatelli
2025-09-12 19:18:51 +02:00
parent 1dca647a0d
commit 7e27283691
10 changed files with 45 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
EgwCoreLib.Lux.Core/Enums.cs
+29 -1
View File
@@ -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
}
}
}
EgwCoreLib.Lux.Data/Services/DataLayerServices.cs
+2 -1
View File
@@ -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);
Lux.API/Controllers/WindowController.cs
+4 -2
View File
@@ -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);
Lux.API/Lux.API.csproj
+2 -1
View File
@@ -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" />
Lux.API/Services/ExternalMessageProcessor.cs
+1 -1
View File
@@ -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);
}
}
}
Lux.UI.Client/Lux.UI.Client.csproj
+1
View File
@@ -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>
Lux.UI/Lux.UI.csproj
+3 -1
View File
@@ -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" />
Resources/ChangeLog.html
+1 -1
View File
@@ -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>
Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
0.9.2509.1216
0.9.2509.1218
Resources/manifest.xml
+1 -1
View File
@@ -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>