diff --git a/EgwCoreLib.Lux.Core/EgwCoreLib.Lux.Core.csproj b/EgwCoreLib.Lux.Core/EgwCoreLib.Lux.Core.csproj
index 9d5cc78d..e276cff4 100644
--- a/EgwCoreLib.Lux.Core/EgwCoreLib.Lux.Core.csproj
+++ b/EgwCoreLib.Lux.Core/EgwCoreLib.Lux.Core.csproj
@@ -21,6 +21,6 @@
-
+
diff --git a/EgwCoreLib.Lux.Core/RestPayload/CalcRequestDTO.cs b/EgwCoreLib.Lux.Core/RestPayload/CalcRequestDTO.cs
index 88eaa020..8d234f41 100644
--- a/EgwCoreLib.Lux.Core/RestPayload/CalcRequestDTO.cs
+++ b/EgwCoreLib.Lux.Core/RestPayload/CalcRequestDTO.cs
@@ -14,7 +14,7 @@ namespace EgwCoreLib.Lux.Core.RestPayload
/// Tipologia di richiesta da inviare al calcolo
///
///[JsonConverter(typeof(StringEnumConverter))]
- public EgwMultiEngineManager.Data.Constants.ENVIRONMENTS EnvType { get; set; } = EgwMultiEngineManager.Data.Constants.ENVIRONMENTS.NULL;
+ public EgwMultiEngineManager.Data.Constants.EXECENVIRONMENTS EnvType { get; set; } = EgwMultiEngineManager.Data.Constants.EXECENVIRONMENTS.NULL;
///
/// Dizionario completo dei parametri da inviare
diff --git a/EgwCoreLib.Lux.Data/Services/ImageCacheService.cs b/EgwCoreLib.Lux.Data/Services/ImageCacheService.cs
index 3f2dd039..0a6a195d 100644
--- a/EgwCoreLib.Lux.Data/Services/ImageCacheService.cs
+++ b/EgwCoreLib.Lux.Data/Services/ImageCacheService.cs
@@ -143,7 +143,7 @@ namespace EgwCoreLib.Lux.Data.Services
///
///
///
- public async Task SaveBomAsync(string imgId, EgwMultiEngineManager.Data.Constants.ENVIRONMENTS env, string bomContent)
+ public async Task SaveBomAsync(string imgId, EgwMultiEngineManager.Data.Constants.EXECENVIRONMENTS env, string bomContent)
{
// salvo img in cache
string currKey = $"{redisBaseKey}:{env}:BOM:{imgId.Replace("/", ":")}";
@@ -160,7 +160,7 @@ namespace EgwCoreLib.Lux.Data.Services
///
///
///
- public bool SaveSvg(string imgId, EgwMultiEngineManager.Data.Constants.ENVIRONMENTS env, string svgContent)
+ public bool SaveSvg(string imgId, EgwMultiEngineManager.Data.Constants.EXECENVIRONMENTS env, string svgContent)
{
// salvo img in cache
string currKey = $"{redisBaseKey}:{env}:Images:{imgId.Replace("/", ":")}";
@@ -177,7 +177,7 @@ namespace EgwCoreLib.Lux.Data.Services
///
///
///
- public async Task SaveSvgAsync(string imgId, EgwMultiEngineManager.Data.Constants.ENVIRONMENTS env, string svgContent)
+ public async Task SaveSvgAsync(string imgId, EgwMultiEngineManager.Data.Constants.EXECENVIRONMENTS env, string svgContent)
{
// salvo img in cache
string currKey = $"{redisBaseKey}:{env}:Images:{imgId.Replace("/", ":")}";
diff --git a/Lux.API/Controllers/GenericController.cs b/Lux.API/Controllers/GenericController.cs
index ce430bda..67140b99 100644
--- a/Lux.API/Controllers/GenericController.cs
+++ b/Lux.API/Controllers/GenericController.cs
@@ -59,7 +59,7 @@ namespace Lux.API.Controllers
}
int nId = 1;
// da modificare con tipo richiesta...
- EgwMultiEngineManager.Data.Question currArgs = new EgwMultiEngineManager.Data.Question(nId, currReq.EnvType, DictExec);
+ EgwMultiEngineManager.Data.QuestionDTO currArgs = new EgwMultiEngineManager.Data.QuestionDTO(nId, currReq.EnvType, DictExec);
await _redisService.PublishAsync(pubChannel, currArgs.sProcessArgs);
svgContent = "DONE";
diff --git a/Lux.API/Controllers/WindowController.cs b/Lux.API/Controllers/WindowController.cs
index 3b953422..a1311081 100644
--- a/Lux.API/Controllers/WindowController.cs
+++ b/Lux.API/Controllers/WindowController.cs
@@ -62,7 +62,7 @@ namespace Lux.API.Controllers
DictExec.Add("Jwd", currJwd);
int nId = 1;
// da modificare con tipo richiesta...
- EgwMultiEngineManager.Data.Question currArgs = new EgwMultiEngineManager.Data.Question(nId, EgwMultiEngineManager.Data.Constants.ENVIRONMENTS.WINDOW, DictExec);
+ EgwMultiEngineManager.Data.QuestionDTO currArgs = new EgwMultiEngineManager.Data.QuestionDTO(nId, EgwMultiEngineManager.Data.Constants.EXECENVIRONMENTS.WINDOW, DictExec);
await _redisService.PublishAsync(pubChannel, currArgs.sProcessArgs);
svgContent = "DONE";
@@ -79,7 +79,7 @@ namespace Lux.API.Controllers
/// id oggetto
///
[HttpGet("svg/{id}")]
- public async Task> svg(string id)
+ public ActionResult svg(string id)
{
Stopwatch sw = new Stopwatch();
sw.Start();
@@ -158,7 +158,7 @@ namespace Lux.API.Controllers
DictExec.Add("Jwd", currJwd);
int nId = 1;
// da modificare con tipo richiesta...
- EgwMultiEngineManager.Data.Question currArgs = new EgwMultiEngineManager.Data.Question(nId, EgwMultiEngineManager.Data.Constants.ENVIRONMENTS.WINDOW, DictExec);
+ EgwMultiEngineManager.Data.QuestionDTO currArgs = new EgwMultiEngineManager.Data.QuestionDTO(nId, EgwMultiEngineManager.Data.Constants.EXECENVIRONMENTS.WINDOW, DictExec);
await _redisService.PublishAsync(pubChannel, currArgs.sProcessArgs);
svgContent = "DONE";
diff --git a/Lux.API/Lux.API.csproj b/Lux.API/Lux.API.csproj
index d784faf2..9bc0bf2e 100644
--- a/Lux.API/Lux.API.csproj
+++ b/Lux.API/Lux.API.csproj
@@ -4,7 +4,7 @@
net8.0
enable
enable
- 0.9.2508.0616
+ 0.9.2508.0617
@@ -58,7 +58,7 @@
-
+
diff --git a/Lux.API/Services/ExternalMessageProcessor.cs b/Lux.API/Services/ExternalMessageProcessor.cs
index ca7fab53..119df3f2 100644
--- a/Lux.API/Services/ExternalMessageProcessor.cs
+++ b/Lux.API/Services/ExternalMessageProcessor.cs
@@ -31,7 +31,7 @@ namespace Lux.API.Services
{
try
{
- var retData = JsonConvert.DeserializeObject(rawData);
+ var retData = JsonConvert.DeserializeObject(rawData);
if (retData != null)
{
if (retData.Args != null && retData.Args.Count > 0)
@@ -42,14 +42,14 @@ namespace Lux.API.Services
// salvo SVG
string newSvg = retData.Args["Svg"];
string UID = retData.Args["UID"];
- await _cacheService.SaveSvgAsync(UID, retData.Environment, newSvg);
+ await _cacheService.SaveSvgAsync(UID, retData.ExecEnvironment, newSvg);
}
if(retData.Args.ContainsKey("BOM"))
{
// salvo BOM ricevuta
string newBom = retData.Args["BOM"];
string UID = retData.Args["UID"];
- await _cacheService.SaveBomAsync(UID, retData.Environment, newBom);
+ await _cacheService.SaveBomAsync(UID, retData.ExecEnvironment, newBom);
}
}
}
diff --git a/Lux.UI/Components/Pages/ResetCache.razor b/Lux.UI/Components/Pages/ResetCache.razor
index e68af44d..0acd7067 100644
--- a/Lux.UI/Components/Pages/ResetCache.razor
+++ b/Lux.UI/Components/Pages/ResetCache.razor
@@ -1,6 +1,5 @@
@page "/ResetCache"
@using EgwCoreLib.Lux.Data.Services
-@using EgwCoreLib.Lux.Data.Services
diff --git a/Lux.UI/Lux.UI.csproj b/Lux.UI/Lux.UI.csproj
index be96bac5..f179341b 100644
--- a/Lux.UI/Lux.UI.csproj
+++ b/Lux.UI/Lux.UI.csproj
@@ -5,7 +5,7 @@
enable
enable
aspnet-Lux.UI-a758c101-a2f4-4e38-977d-1c4887dbbd50
- 0.9.2508.0616
+ 0.9.2508.0617
@@ -19,7 +19,7 @@
-
+
diff --git a/Resources/ChangeLog.html b/Resources/ChangeLog.html
index 5f84353f..1980de14 100644
--- a/Resources/ChangeLog.html
+++ b/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
LUX - Web Windows MES
- Versione: 0.9.2508.0616
+ Versione: 0.9.2508.0617
Note di rilascio:
-
diff --git a/Resources/VersNum.txt b/Resources/VersNum.txt
index ea57fdd8..ecda55b0 100644
--- a/Resources/VersNum.txt
+++ b/Resources/VersNum.txt
@@ -1 +1 @@
-0.9.2508.0616
+0.9.2508.0617
diff --git a/Resources/manifest.xml b/Resources/manifest.xml
index 1d6816bc..9c5e9a53 100644
--- a/Resources/manifest.xml
+++ b/Resources/manifest.xml
@@ -1,6 +1,6 @@
-
- 0.9.2508.0616
+ 0.9.2508.0617
http://nexus.steamware.net/repository/SWS/GPW/stable/GPW.UI.zip
http://nexus.steamware.net/repository/SWS/GPW/stable/ChangeLog.html
false