From 6026c029a83639bb358518e235962f46a86936be Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Wed, 29 May 2024 10:30:49 +0200 Subject: [PATCH] Fix gestione zero impianti operatore --> logout --- MP-TAB3/MP-TAB3.csproj | 2 +- MP-TAB3/Pages/StatusMap.razor | 26 +++++++++++++++++++++++--- MP-TAB3/Pages/StatusMap.razor.cs | 13 ++++++++++++- MP-TAB3/Resources/ChangeLog.html | 2 +- MP-TAB3/Resources/VersNum.txt | 2 +- MP-TAB3/Resources/manifest.xml | 2 +- 6 files changed, 39 insertions(+), 8 deletions(-) diff --git a/MP-TAB3/MP-TAB3.csproj b/MP-TAB3/MP-TAB3.csproj index ecc96afa..d8fb19b0 100644 --- a/MP-TAB3/MP-TAB3.csproj +++ b/MP-TAB3/MP-TAB3.csproj @@ -3,7 +3,7 @@ net6.0 enable - 6.16.2405.2909 + 6.16.2405.2910 enable MP_TAB3 diff --git a/MP-TAB3/Pages/StatusMap.razor b/MP-TAB3/Pages/StatusMap.razor index 4b25f6b4..22989052 100644 --- a/MP-TAB3/Pages/StatusMap.razor +++ b/MP-TAB3/Pages/StatusMap.razor @@ -4,9 +4,29 @@
@if (ListMSE == null || ListMSE.Count == 0 || isCalcSize) { -
- -
+ if (ListMachineEnabled == null || ListMachineEnabled.Count == 0) + { +
+

+ Attenzione! +

+ +
+ Nessun impianto abilitato per l'operatore. +
+ + + + LogOut + +
+ } + else + { +
+ +
+ } } else { diff --git a/MP-TAB3/Pages/StatusMap.razor.cs b/MP-TAB3/Pages/StatusMap.razor.cs index 0cb404f1..afa603c1 100644 --- a/MP-TAB3/Pages/StatusMap.razor.cs +++ b/MP-TAB3/Pages/StatusMap.razor.cs @@ -111,6 +111,18 @@ namespace MP_TAB3.Pages return answ; } + protected async Task DoLogout() + { + string tgtUrl = "logout"; + await Task.Delay(1); + if (tgtUrl.Contains("status-map")) + { + await MsgServ.IdxMaccSet(""); + } + await MsgServ.LastOpenedPageSet(tgtUrl); + NavMan.NavigateTo(tgtUrl, true); + } + protected async Task getWDim() { var dimension = await JSRuntime.InvokeAsync("getWindowDimensions"); @@ -186,7 +198,6 @@ namespace MP_TAB3.Pages // rileggo elenco macchine operatore... ListMachineEnabled = await TabDServ.MacchineByMatrOper(MatrOpr); // salvo valori ricevuti - //ListMSE = newList; AllDataMSE = newList; // filtro! FiltOprMse(); diff --git a/MP-TAB3/Resources/ChangeLog.html b/MP-TAB3/Resources/ChangeLog.html index 9fdd693f..9fec08db 100644 --- a/MP-TAB3/Resources/ChangeLog.html +++ b/MP-TAB3/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo MAPOSPEC -

Versione: 6.16.2405.2909

+

Versione: 6.16.2405.2910


Note di rilascio:
  • diff --git a/MP-TAB3/Resources/VersNum.txt b/MP-TAB3/Resources/VersNum.txt index bc2e8ed0..826649b8 100644 --- a/MP-TAB3/Resources/VersNum.txt +++ b/MP-TAB3/Resources/VersNum.txt @@ -1 +1 @@ -6.16.2405.2909 +6.16.2405.2910 diff --git a/MP-TAB3/Resources/manifest.xml b/MP-TAB3/Resources/manifest.xml index fcec4544..a404b0d7 100644 --- a/MP-TAB3/Resources/manifest.xml +++ b/MP-TAB3/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.16.2405.2909 + 6.16.2405.2910 https://nexus.steamware.net/repository/SWS/MP-TAB3/stable/LAST/MP-TAB3.zip https://nexus.steamware.net/repository/SWS/MP-TAB3/stable/LAST/ChangeLog.html false