diff --git a/Lux.API/Lux.API.csproj b/Lux.API/Lux.API.csproj index cd2c56ee..f1fcd9a7 100644 --- a/Lux.API/Lux.API.csproj +++ b/Lux.API/Lux.API.csproj @@ -4,7 +4,7 @@ net8.0 enable enable - 0.9.2511.0510 + 0.9.2511.0519 diff --git a/Lux.API/Program.cs b/Lux.API/Program.cs index e9537634..038d35cb 100644 --- a/Lux.API/Program.cs +++ b/Lux.API/Program.cs @@ -60,6 +60,8 @@ var app = builder.Build(); string baseUrl = configuration.GetValue("ServerConf:BaseUrl") ?? ""; app.UsePathBase(baseUrl); logger.Info($"BaseUrl: {baseUrl}"); + +// log channels di ritorno UI List listParams = new List() { "PngChannel", "SubChannel", "PubChannel", "SvgChannel" }; foreach (var param in listParams) { diff --git a/Lux.API/Services/ExternalMessageProcessor.cs b/Lux.API/Services/ExternalMessageProcessor.cs index 7281c159..6f8b2469 100644 --- a/Lux.API/Services/ExternalMessageProcessor.cs +++ b/Lux.API/Services/ExternalMessageProcessor.cs @@ -63,9 +63,9 @@ namespace Lux.API.Services { // recupero UID ed SVG string UID = retData.Args["UID"]; - string newSvg = retData.Args["Png"]; + string newPng = retData.Args["Png"]; // reinvio in redis (cache + channel) - await cacheService.SavePngAsync(UID, retData.ExecEnvironment, newSvg); + await cacheService.SavePngAsync(UID, retData.ExecEnvironment, newPng); } diff --git a/Lux.API/appsettings.Development.json b/Lux.API/appsettings.Development.json index 5da17538..b0906ead 100644 --- a/Lux.API/appsettings.Development.json +++ b/Lux.API/appsettings.Development.json @@ -6,6 +6,14 @@ } }, "ServerConf": { + "PngChannel": "luxdev:png:img", + "SvgChannel": "luxdev:svg:img", + "ShapeChannel": "luxdev:shape:curr", + "HwListChannel": "luxdev:hw:list", + "HwOptChannel": "luxdev:hw:opt", + "ProfListChannel": "luxdev:prof:list", + "BomChannel": "luxdev:bom", + "UpdateChannel": "luxdev:update", "BaseUrl": "/lux/srv/", //"PubChannel": "EgwDevEngineInput", //"SubChannel": "EgwDevEngineOutput", diff --git a/Lux.API/appsettings.Production.json b/Lux.API/appsettings.Production.json index 535094eb..521e3972 100644 --- a/Lux.API/appsettings.Production.json +++ b/Lux.API/appsettings.Production.json @@ -7,6 +7,14 @@ }, "ServerConf": { "BaseUrl": "/lux/srv/", + "PngChannel": "Egw:png:img", + "SvgChannel": "Egw:svg:img", + "ShapeChannel": "Egw:shape:curr", + "HwListChannel": "Egw:hw:list", + "HwOptChannel": "Egw:hw:opt", + "ProfListChannel": "Egw:prof:list", + "BomChannel": "Egw:bom", + "UpdateChannel": "Egw:update", "PubChannel": "EgwEngineInput", "SubChannel": "EgwEngineOutput", "ImageBaseUrl": "https://office.egalware.com/lux/srv/api/window/" diff --git a/Lux.API/appsettings.Staging.json b/Lux.API/appsettings.Staging.json index c294297e..ccb18f94 100644 --- a/Lux.API/appsettings.Staging.json +++ b/Lux.API/appsettings.Staging.json @@ -6,6 +6,14 @@ } }, "ServerConf": { + "PngChannel": "luxstag:png:img", + "SvgChannel": "luxstag:svg:img", + "ShapeChannel": "luxstag:shape:curr", + "HwListChannel": "luxstag:hw:list", + "HwOptChannel": "luxstag:hw:opt", + "ProfListChannel": "luxstag:prof:list", + "BomChannel": "luxstag:bom", + "UpdateChannel": "luxstag:update", "BaseUrl": "/lux/srv/", "PubChannel": "EgwEngineInput", "SubChannel": "EgwEngineOutput" diff --git a/Lux.API/appsettings.json b/Lux.API/appsettings.json index cdd3a2bd..daf94e32 100644 --- a/Lux.API/appsettings.json +++ b/Lux.API/appsettings.json @@ -58,14 +58,24 @@ "CalcTag": "calc", "PubChannel": "EgwEngineInput", "SubChannel": "EgwEngineOutput", - "PngChannel": "Egw:png:img", - "SvgChannel": "Egw:svg:img", - "ShapeChannel": "Egw:shape:curr", - "HwListChannel": "Egw:hw:list", - "HwOptChannel": "Egw:hw:opt", - "ProfListChannel": "Egw:prof:list", - "BomChannel": "Egw:bom", - "UpdateChannel": "Egw:update", + + "PngChannel": "luxdev:png:img", + "SvgChannel": "luxdev:svg:img", + "ShapeChannel": "luxdev:shape:curr", + "HwListChannel": "luxdev:hw:list", + "HwOptChannel": "luxdev:hw:opt", + "ProfListChannel": "luxdev:prof:list", + "BomChannel": "luxdev:bom", + "UpdateChannel": "luxdev:update", + + //"PngChannel": "Egw:png:img", + //"SvgChannel": "Egw:svg:img", + //"ShapeChannel": "Egw:shape:curr", + //"HwListChannel": "Egw:hw:list", + //"HwOptChannel": "Egw:hw:opt", + //"ProfListChannel": "Egw:prof:list", + //"BomChannel": "Egw:bom", + //"UpdateChannel": "Egw:update", "BaseUrl": "/lux/srv/", "ImageBaseUrl": "https://iis01.egalware.com/lux/srv/api/window/", "ImageCalcTag": "svg-preview", diff --git a/Lux.UI/Components/Compo/FileMan/BtlPreview.razor b/Lux.UI/Components/Compo/FileMan/BtlPreview.razor index 18b5db0a..9bbb4d4c 100644 --- a/Lux.UI/Components/Compo/FileMan/BtlPreview.razor +++ b/Lux.UI/Components/Compo/FileMan/BtlPreview.razor @@ -2,7 +2,7 @@
- File Preview + Item: @CurrItem.OfferRowUID
@@ -18,8 +18,9 @@
  • Info BTL
  • # pezzi
  • -
  • # barre
  • +
  • # sezioni
  • somma metri
  • +
  • somma volume
  • tempo totale
diff --git a/Lux.UI/Components/Compo/FileMan/BtlPreview.razor.cs b/Lux.UI/Components/Compo/FileMan/BtlPreview.razor.cs index f3686d60..73372ffb 100644 --- a/Lux.UI/Components/Compo/FileMan/BtlPreview.razor.cs +++ b/Lux.UI/Components/Compo/FileMan/BtlPreview.razor.cs @@ -73,6 +73,7 @@ namespace Lux.UI.Components.Compo.FileMan { // init dizionari arg richiesta update Dictionary fileArgs = new Dictionary(); + Dictionary bomArgs = new Dictionary(); // leggo il contenuto del PRIMO (singolo) file IBrowserFile file = e.File; @@ -88,29 +89,46 @@ namespace Lux.UI.Components.Compo.FileMan CurrItem.FileResource = trustedFileName; CurrItem.FileName = file.Name; CurrItem.FileSize = rawContent.LongCount(); + // aggiungo contenuto come SerStruct (in attesa di valutare FS save...) + CurrItem.SerStruct = rawContent; // salvo sul DB i dati (nome, nome sicuro, size...) await DLService.OffertRowUpdateFileData(CurrItem); // parametri richiesta + fileArgs.Add("FileName", $"{file.Name}"); + fileArgs.Add("SerializedData", rawContent); fileArgs.Add("Mode", $"{(int)Egw.Window.Data.Enums.QuestionModes.PREVIEW}"); fileArgs.Add("SubMode", "2"); - fileArgs.Add("FileName", $"{file.Name}"); fileArgs.Add("Height", "1200"); fileArgs.Add("Width", "1800"); - //fileArgs.Add("Btl", rawContent); - fileArgs.Add("SerializedData", rawContent); // invio! - CalcRequestDTO calcRequestDTO = new CalcRequestDTO(); - calcRequestDTO.EnvType = EgwMultiEngineManager.Data.Constants.EXECENVIRONMENTS.BEAM; - calcRequestDTO.DictExec = fileArgs; + CalcRequestDTO calcRequestDTO = new CalcRequestDTO() + { + EnvType = EgwMultiEngineManager.Data.Constants.EXECENVIRONMENTS.BEAM, + DictExec = fileArgs + }; + // richiesta PNG await ICService.CallRestPost($"{ApiUrl}/{GenericBasePath}", $"{CalcTag}/{CurrItem.OfferRowUID}", calcRequestDTO); - // ora chiedo anche la BOM! + + // aggiungo info x BOM + bomArgs.Add("FileName", $"{file.Name}"); + bomArgs.Add("SerializedData", rawContent); + bomArgs.Add("Mode", $"{(int)Egw.Window.Data.Enums.QuestionModes.BOM}"); + // ...infine chiedo anche la BOM! + calcRequestDTO = new CalcRequestDTO() + { + EnvType = EgwMultiEngineManager.Data.Constants.EXECENVIRONMENTS.BEAM, + DictExec = bomArgs + }; + // richiesta BOM + await ICService.CallRestPost($"{ApiUrl}/{GenericBasePath}", $"{CalcTag}/{CurrItem.OfferRowUID}", calcRequestDTO); #if false // salvo in locale il file: SISTEMARE PERMESSI saveFileContent(EditFileRecord.OfferRowUID, trustedFileName, rawContent); #endif + } #endregion Private Methods diff --git a/Lux.UI/Lux.UI.csproj b/Lux.UI/Lux.UI.csproj index 8c1edeee..9aab1a33 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.2511.0510 + 0.9.2511.0519 diff --git a/Lux.UI/appsettings.Development.json b/Lux.UI/appsettings.Development.json index 88683eed..f0316739 100644 --- a/Lux.UI/appsettings.Development.json +++ b/Lux.UI/appsettings.Development.json @@ -6,6 +6,14 @@ } }, "ServerConf": { + "PngChannel": "luxdev:png:img", + "SvgChannel": "luxdev:svg:img", + "ShapeChannel": "luxdev:shape:curr", + "HwListChannel": "luxdev:hw:list", + "HwOptChannel": "luxdev:hw:opt", + "ProfListChannel": "luxdev:prof:list", + "BomChannel": "luxdev:bom", + "UpdateChannel": "luxdev:update", "PubChannel": "EgwDevEngineInput", "SubChannel": "EgwDevEngineOutput" } diff --git a/Lux.UI/appsettings.json b/Lux.UI/appsettings.json index 4cb25216..efd933d7 100644 --- a/Lux.UI/appsettings.json +++ b/Lux.UI/appsettings.json @@ -63,16 +63,27 @@ //"Prog.ApiUrl": "https://office.egalware.com/lux/srv/api", "ImageBaseUrl": "Image", "RouteBaseUrl": "window", - "BomChannel": "Egw:bom", - "HwListChannel": "Egw:hw:list", - "HwOptChannel": "Egw:hw:opt", - "ProfListChannel": "Egw:prof:list", + + "PngChannel": "luxdev:png:img", + "SvgChannel": "luxdev:svg:img", + "ShapeChannel": "luxdev:shape:curr", + "HwListChannel": "luxdev:hw:list", + "HwOptChannel": "luxdev:hw:opt", + "ProfListChannel": "luxdev:prof:list", + "BomChannel": "luxdev:bom", + "UpdateChannel": "luxdev:update", + + //"BomChannel": "Egw:bom", + //"HwListChannel": "Egw:hw:list", + //"HwOptChannel": "Egw:hw:opt", + //"ProfListChannel": "Egw:prof:list", + //"ShapeChannel": "Egw:shape:curr", + //"PngChannel": "Egw:png:img", + //"SvgChannel": "Egw:svg:img", + //"UpdateChannel": "Egw:update", + "PubChannel": "EgwEngineInput", - "ShapeChannel": "Egw:shape:curr", "SubChannel": "EgwEngineOutput", - "PngChannel": "Egw:png:img", - "SvgChannel": "Egw:svg:img", - "UpdateChannel": "Egw:update", "ImageCalcTag": "live", "ImageFileTag": "cache", "ImageLiveTag": "svg", diff --git a/Resources/ChangeLog.html b/Resources/ChangeLog.html index 1e764d59..82f9edba 100644 --- a/Resources/ChangeLog.html +++ b/Resources/ChangeLog.html @@ -1,6 +1,6 @@ LUX - Web Windows MES -

Versione: 0.9.2511.0510

+

Versione: 0.9.2511.0519


Note di rilascio:
  • diff --git a/Resources/VersNum.txt b/Resources/VersNum.txt index 1fe287b5..042632f4 100644 --- a/Resources/VersNum.txt +++ b/Resources/VersNum.txt @@ -1 +1 @@ -0.9.2511.0510 +0.9.2511.0519 diff --git a/Resources/manifest.xml b/Resources/manifest.xml index c4340941..051c5be4 100644 --- a/Resources/manifest.xml +++ b/Resources/manifest.xml @@ -1,6 +1,6 @@ - 0.9.2511.0510 + 0.9.2511.0519 http://nexus.steamware.net/repository/SWS/GPW/stable/GPW.UI.zip http://nexus.steamware.net/repository/SWS/GPW/stable/ChangeLog.html false