diff --git a/MP-TAB-SERV/Components/ProdConfirm.razor.cs b/MP-TAB-SERV/Components/ProdConfirm.razor.cs index 50887bfa..3de7c130 100644 --- a/MP-TAB-SERV/Components/ProdConfirm.razor.cs +++ b/MP-TAB-SERV/Components/ProdConfirm.razor.cs @@ -18,7 +18,7 @@ namespace MP_TAB_SERV.Components /// registrato nuovo valore /// [Parameter] - public EventCallback E_newVal { get; set; } + public EventCallback> E_Updated { get; set; } /// /// registrato nuovo valore @@ -183,9 +183,16 @@ namespace MP_TAB_SERV.Components dtReqUpdate = DateTime.Now; numPzLasciati = 0; await doUpdate(); - isProcessing = false; await Task.Delay(1); - await E_newVal.InvokeAsync(true); + await RefreshData(); + isProcessing = false; + } + + private async Task RefreshData() + { + List ListMSE = await MDataService.MseGetAll(true); + await MServ.SaveMse(ListMSE); + await E_Updated.InvokeAsync(ListMSE); } protected void setConfirmBtn(bool newVal) diff --git a/MP-TAB-SERV/Components/SlideMenu.razor b/MP-TAB-SERV/Components/SlideMenu.razor index c96b7335..7bdbbe6d 100644 --- a/MP-TAB-SERV/Components/SlideMenu.razor +++ b/MP-TAB-SERV/Components/SlideMenu.razor @@ -4,15 +4,15 @@
-
- +
+
EgalWare
- Main Menu + MES Solutions
@@ -26,16 +26,30 @@
- @foreach (var item in MenuItems) { - @item.Testo + }
+
+
+
+ +
+
+
+ MAPO MES +
+
+ TAB Controller - MES Suite +
+
+
+
@@ -52,10 +66,23 @@ string answ = ""; if (navManager.Uri.Contains(currUri)) { - answ = "background-color: #212427; color: #fff"; + answ = "background-color: #212427; color: #fff"; } return answ; } + + protected async Task SetPage(string tgtUrl) + { + await Task.Delay(1); + navManager.NavigateTo(tgtUrl); + } + + protected string cssActive(string currUri) + { + return navManager.Uri.Contains(currUri)?"bg-dark text-light" : ""; + + } + } diff --git a/MP-TAB-SERV/MP-TAB-SERV.csproj b/MP-TAB-SERV/MP-TAB-SERV.csproj index 63f1a10e..5ff33e17 100644 --- a/MP-TAB-SERV/MP-TAB-SERV.csproj +++ b/MP-TAB-SERV/MP-TAB-SERV.csproj @@ -3,7 +3,7 @@ net6.0 enable - 6.16.2310.2711 + 6.16.2310.2718 enable MP_TAB_SERV diff --git a/MP-TAB-SERV/Pages/MachineDetail.razor b/MP-TAB-SERV/Pages/MachineDetail.razor index 804c9d54..ecda23b2 100644 --- a/MP-TAB-SERV/Pages/MachineDetail.razor +++ b/MP-TAB-SERV/Pages/MachineDetail.razor @@ -9,6 +9,6 @@ else { - + } diff --git a/MP-TAB-SERV/Resources/ChangeLog.html b/MP-TAB-SERV/Resources/ChangeLog.html index 446b1335..5f764a72 100644 --- a/MP-TAB-SERV/Resources/ChangeLog.html +++ b/MP-TAB-SERV/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo MAPOSPEC -

Versione: 6.16.2310.2711

+

Versione: 6.16.2310.2718


Note di rilascio:
  • diff --git a/MP-TAB-SERV/Resources/VersNum.txt b/MP-TAB-SERV/Resources/VersNum.txt index b9e9f813..b7770a1c 100644 --- a/MP-TAB-SERV/Resources/VersNum.txt +++ b/MP-TAB-SERV/Resources/VersNum.txt @@ -1 +1 @@ -6.16.2310.2711 +6.16.2310.2718 diff --git a/MP-TAB-SERV/Resources/manifest.xml b/MP-TAB-SERV/Resources/manifest.xml index b0ee80a8..2ec1aad7 100644 --- a/MP-TAB-SERV/Resources/manifest.xml +++ b/MP-TAB-SERV/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.16.2310.2711 + 6.16.2310.2718 https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/MP-TAB-SERV.zip https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/ChangeLog.html false diff --git a/MP.Data/Services/StatusData.cs b/MP.Data/Services/StatusData.cs index 30696304..fe431533 100644 --- a/MP.Data/Services/StatusData.cs +++ b/MP.Data/Services/StatusData.cs @@ -102,7 +102,7 @@ namespace MP.Data.Services return Task.FromResult(dbController.MacchineGetAll()); } - public async Task> MseGetAll() + public async Task> MseGetAll(bool forceDb = false) { int maxAge = 2000; int.TryParse(_configuration.GetValue("ServerConf:maxAge"), out maxAge); @@ -111,7 +111,7 @@ namespace MP.Data.Services List? result = new List(); // cerco in redis... RedisValue rawData = redisDb.StringGet(redisMseKey); - if (rawData.HasValue) + if (rawData.HasValue && !forceDb) { result = JsonConvert.DeserializeObject>($"{rawData}"); stopWatch.Stop();