From 034e263c92f869a5d56e20c8449e66c74f31ce8a Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 13 Jan 2026 11:06:07 +0100 Subject: [PATCH] Aggiunta pagina download jwd aggiunta parziale test ricalcolo balance --- .../Controllers/LuxController.cs | 4 +- .../Services/DataLayerServices.cs | 2 +- Lux.API/Lux.API.csproj | 2 +- Lux.UI/Components/Compo/OfferRowMan.razor | 10 +- Lux.UI/Components/Compo/OfferRowMan.razor.cs | 29 +++ Lux.UI/Components/Pages/Download.cshtml | 5 + Lux.UI/Components/Pages/Download.cshtml.cs | 49 ++++++ .../Components/Pages/WorkLoadBalance.razor.cs | 15 +- Lux.UI/Lux.UI.csproj | 3 +- Lux.UI/Program.cs | 16 ++ Lux.UI/temp/SOR.25.00000044.jwd | 93 ++++++++++ Lux.UI/temp/SOR.25.00000048.jwd | 165 ++++++++++++++++++ Resources/ChangeLog.html | 2 +- Resources/VersNum.txt | 2 +- Resources/manifest.xml | 2 +- 15 files changed, 387 insertions(+), 12 deletions(-) create mode 100644 Lux.UI/Components/Pages/Download.cshtml create mode 100644 Lux.UI/Components/Pages/Download.cshtml.cs create mode 100644 Lux.UI/temp/SOR.25.00000044.jwd create mode 100644 Lux.UI/temp/SOR.25.00000048.jwd diff --git a/EgwCoreLib.Lux.Data/Controllers/LuxController.cs b/EgwCoreLib.Lux.Data/Controllers/LuxController.cs index 054ec1bb..c895865e 100644 --- a/EgwCoreLib.Lux.Data/Controllers/LuxController.cs +++ b/EgwCoreLib.Lux.Data/Controllers/LuxController.cs @@ -2503,7 +2503,7 @@ namespace EgwCoreLib.Lux.Data.Controllers { DateTime adesso = DateTime.Now; // recupero ordine... - var currRec = dbCtx + dbRec = dbCtx .DbSetOrder .Where(x => x.OrderID == orderId) .Include(x => x.OrderRowNav) @@ -3146,7 +3146,7 @@ namespace EgwCoreLib.Lux.Data.Controllers * - i successivi calcoli di balance/stima saranno fatti x questo SPECIFICO ID GROUP così da fare prima... a sto punto GroupIP potrebbe essere un int 0...n oppure l'id del record... forse meglio il counter 0..n * * */ - int grpIdx = 0; + int grpIdx = 1; // preparo x add nuovi ProductionGroup da analisi ritorno stime List listProdGroup2Add = new List(); // 1: non lavorabili... diff --git a/EgwCoreLib.Lux.Data/Services/DataLayerServices.cs b/EgwCoreLib.Lux.Data/Services/DataLayerServices.cs index 3864fbbc..5236c841 100644 --- a/EgwCoreLib.Lux.Data/Services/DataLayerServices.cs +++ b/EgwCoreLib.Lux.Data/Services/DataLayerServices.cs @@ -1276,7 +1276,7 @@ namespace EgwCoreLib.Lux.Data.Services // cerco in redis... string currKey = $"{redisBaseKey}:Orders:ById:{orderId}"; RedisValue rawData = await redisDb.StringGetAsync(currKey); - if (rawData.HasValue && !doForce) + if (rawData.HasValue && rawData.Length() > 2 && !doForce) { result = JsonConvert.DeserializeObject($"{rawData}"); source = "REDIS"; diff --git a/Lux.API/Lux.API.csproj b/Lux.API/Lux.API.csproj index 154de5e9..343e4a40 100644 --- a/Lux.API/Lux.API.csproj +++ b/Lux.API/Lux.API.csproj @@ -4,7 +4,7 @@ net8.0 enable enable - 0.9.2601.1219 + 0.9.2601.1311 diff --git a/Lux.UI/Components/Compo/OfferRowMan.razor b/Lux.UI/Components/Compo/OfferRowMan.razor index 1e0d3334..0b3a29b5 100644 --- a/Lux.UI/Components/Compo/OfferRowMan.razor +++ b/Lux.UI/Components/Compo/OfferRowMan.razor @@ -193,6 +193,14 @@ else @fSize(item.FileSize) } + @if (PreparedFile.Contains(item.OfferRowUID)) + { +
  • Download
  • + } + else + { +
  • + } @if (CurrEditMode == EditMode.RecData && EditRecord != null && EditRecord.OfferRowID == item.OfferRowID) @@ -376,7 +384,7 @@ else } } -@if(reqSellingItem) +@if (reqSellingItem) {