diff --git a/Lux.API/Lux.API.csproj b/Lux.API/Lux.API.csproj index 205f3ef4..c3cd0c96 100644 --- a/Lux.API/Lux.API.csproj +++ b/Lux.API/Lux.API.csproj @@ -4,7 +4,7 @@ net8.0 enable enable - 0.9.2512.1518 + 0.9.2512.1614 diff --git a/Lux.API/Program.cs b/Lux.API/Program.cs index 83624824..7b80231d 100644 --- a/Lux.API/Program.cs +++ b/Lux.API/Program.cs @@ -57,11 +57,14 @@ builder.Services.AddSingleton(); string cleanupDayTTL = configuration.GetValue("ServerConf:CleanupDayTTL") ?? "360"; string rBaseKey = configuration.GetValue("ServerConf:RedisBaseKey") ?? "Lux"; int dayTTL = 360; +int archTTL = 2; int.TryParse(cleanupDayTTL, out dayTTL); builder.Services.AddSingleton(new CalcRuidService( + configuration, redisConn, + redisBaseKey: rBaseKey, retention: TimeSpan.FromDays(dayTTL), - redisBaseKey: rBaseKey + archivePeriod: TimeSpan.FromDays(archTTL) )); builder.Services.AddHostedService(); diff --git a/Lux.UI/Components/Compo/Stats/HistoricalStats.razor b/Lux.UI/Components/Compo/Stats/HistoricalStats.razor index b79ac3a5..eec6a263 100644 --- a/Lux.UI/Components/Compo/Stats/HistoricalStats.razor +++ b/Lux.UI/Components/Compo/Stats/HistoricalStats.razor @@ -5,8 +5,13 @@
-
-

Statistiche Storiche

+
+
+

Statistiche Storiche

+
+
+ +
@@ -19,19 +24,26 @@
-
-
- + @if (isLoading) + { + + } + else + { +
+
+ +
-
-
-
- +
+
+ +
+
+ +
-
- -
-
+ }
@@ -39,6 +51,7 @@ private DateTime from = DateTime.Now.AddHours(-24); private DateTime to = DateTime.Now; + private bool isLoading = false; private List labels = new(); private List reqData = new(); @@ -105,4 +118,18 @@ } }); } + + /// + /// Esecuzione ricalcolo da 24h indietro + /// + /// + private async Task RicalcolaStats() + { + isLoading = true; + await InvokeAsync(StateHasChanged); + TimeSpan defPeriod = TimeSpan.FromHours(24); + //await Calc.ArchiveOldStatsAsync(defPeriod, false); + isLoading = false; + + } } diff --git a/Lux.UI/Components/Pages/Offers.razor.cs b/Lux.UI/Components/Pages/Offers.razor.cs index a67eadb1..33eb1d5b 100644 --- a/Lux.UI/Components/Pages/Offers.razor.cs +++ b/Lux.UI/Components/Pages/Offers.razor.cs @@ -206,7 +206,7 @@ namespace Lux.UI.Components.Pages // compongo righiesta dictArgs.Add("UID", rigaOrd.OrderRowUID); // creo registrazione richiesta... - var ruid = await CRService.AddRequestAsync($"{newOrd.Envir}", $"{cMode}-{cSubMode}", rigaOrd.OrderRowUID); + var ruid = await CRService.AddRequestAsync($"{newOrd.Envir}", $"{(int)cMode}-{(int)cSubMode}", rigaOrd.OrderRowUID); // aggiungo RUID effettivo dictArgs.Add("RUID", ruid); dictArgs.Add("OrderUID", rigaOrd.OrderNav.OrderCode); diff --git a/Lux.UI/Components/Pages/Orders.razor.cs b/Lux.UI/Components/Pages/Orders.razor.cs index 7f7c437f..cbdba1ee 100644 --- a/Lux.UI/Components/Pages/Orders.razor.cs +++ b/Lux.UI/Components/Pages/Orders.razor.cs @@ -217,7 +217,7 @@ namespace Lux.UI.Components.Pages Dictionary dictArgs = new Dictionary(); dictArgs.Add("UID", rigaOrd.OrderRowUID); // creo registrazione richiesta... - var ruid = await CRService.AddRequestAsync($"{currRec.Envir}", $"{cMode}-{cSubMode}", rigaOrd.OrderRowUID); + var ruid = await CRService.AddRequestAsync($"{currRec.Envir}", $"{(int)cMode}-{(int)cSubMode}", rigaOrd.OrderRowUID); // aggiungo RUID effettivo dictArgs.Add("RUID", ruid); dictArgs.Add("OrderUID", rigaOrd.OrderNav.OrderCode); diff --git a/Lux.UI/Lux.UI.csproj b/Lux.UI/Lux.UI.csproj index 89681542..695375a7 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.2512.1518 + 0.9.2512.1614 diff --git a/Lux.UI/Program.cs b/Lux.UI/Program.cs index 60c1bba7..597125b7 100644 --- a/Lux.UI/Program.cs +++ b/Lux.UI/Program.cs @@ -74,11 +74,14 @@ builder.Services.AddSingleton(); string cleanupDayTTL = configuration.GetValue("ServerConf:CleanupDayTTL") ?? "360"; string rBaseKey = configuration.GetValue("ServerConf:RedisBaseKey") ?? "Lux"; int dayTTL = 360; +int archTTL = 2; int.TryParse(cleanupDayTTL, out dayTTL); builder.Services.AddSingleton(new CalcRuidService( + configuration, redisConn, + redisBaseKey: rBaseKey, retention: TimeSpan.FromDays(dayTTL), - redisBaseKey: rBaseKey + archivePeriod: TimeSpan.FromDays(archTTL) )); builder.Services.AddHostedService(); diff --git a/Resources/ChangeLog.html b/Resources/ChangeLog.html index af36ab9f..c45e6107 100644 --- a/Resources/ChangeLog.html +++ b/Resources/ChangeLog.html @@ -1,6 +1,6 @@ LUX - Web Windows MES -

Versione: 0.9.2512.1518

+

Versione: 0.9.2512.1614


Note di rilascio:
  • diff --git a/Resources/VersNum.txt b/Resources/VersNum.txt index e0cb7fe7..1ff3f9e0 100644 --- a/Resources/VersNum.txt +++ b/Resources/VersNum.txt @@ -1 +1 @@ -0.9.2512.1518 +0.9.2512.1614 diff --git a/Resources/manifest.xml b/Resources/manifest.xml index 9619741e..61300c97 100644 --- a/Resources/manifest.xml +++ b/Resources/manifest.xml @@ -1,6 +1,6 @@ - 0.9.2512.1518 + 0.9.2512.1614 http://nexus.steamware.net/repository/SWS/GPW/stable/GPW.UI.zip http://nexus.steamware.net/repository/SWS/GPW/stable/ChangeLog.html false