diff --git a/MP-TAB3/Components/CmpTop.razor.cs b/MP-TAB3/Components/CmpTop.razor.cs
index b1291083..4dc12c29 100644
--- a/MP-TAB3/Components/CmpTop.razor.cs
+++ b/MP-TAB3/Components/CmpTop.razor.cs
@@ -155,12 +155,23 @@ namespace MP_TAB3.Components
await RefreshScadLogIn(currOprTokLsDeco);
await EA_UserIsOk.InvokeAsync(true);
}
+
+#if false
+ // infine controllo sia valida macchina richiesta rispetto a memoria...
+ // cerco MSE macchina
+ var machMse = MsgServ.GetMachineMse(CurrMacc);
+ if (machMse != null)
+ {
+ MsgServ.LastIdxMacchina = "";
+ NavMan.NavigateTo("status-map");
+ }
+#endif
}
protected async Task RefreshScadLogIn(string decodValue)
{
bool done = false;
- // solo se non è logout!!!
+ // solo se non � logout!!!
if (!NavMan.Uri.Contains("logout"))
{
if (listT2H == null || listT2H.Count == 0)
@@ -177,14 +188,23 @@ namespace MP_TAB3.Components
}
if (done && !string.IsNullOrEmpty(LastOpenedPage))
{
- // se è nelle pagine "T2H" lascio proseguire...
+ // se � nelle pagine "T2H" lascio proseguire...
if (listT2H != null && listT2H.Find(x => x.NavigateUrl == LastOpenedPage) != null)
{
NavMan.NavigateTo(LastOpenedPage);
}
else if (!string.IsNullOrEmpty(CurrMacc))
{
- NavMan.NavigateTo(LastOpenedPage);
+ var machMse = await MsgServ.GetMachineMse(CurrMacc);
+ if (machMse == null)
+ {
+ await MsgServ.IdxMaccSet("");
+ NavMan.NavigateTo("status-map");
+ }
+ else
+ {
+ NavMan.NavigateTo(LastOpenedPage);
+ }
}
else
{
diff --git a/MP-TAB3/Components/SlideMenu.razor b/MP-TAB3/Components/SlideMenu.razor
index 2cadef9a..7a4f65b1 100644
--- a/MP-TAB3/Components/SlideMenu.razor
+++ b/MP-TAB3/Components/SlideMenu.razor
@@ -51,6 +51,9 @@
+
diff --git a/MP-TAB3/MP-TAB3.csproj b/MP-TAB3/MP-TAB3.csproj
index d379504c..cfa0a166 100644
--- a/MP-TAB3/MP-TAB3.csproj
+++ b/MP-TAB3/MP-TAB3.csproj
@@ -3,7 +3,7 @@
net6.0
enable
- 6.16.2502.2411
+ 6.16.2502.2815
enable
MP_TAB3
diff --git a/MP-TAB3/Pages/ForceReset.razor b/MP-TAB3/Pages/ForceReset.razor
new file mode 100644
index 00000000..b2688f6d
--- /dev/null
+++ b/MP-TAB3/Pages/ForceReset.razor
@@ -0,0 +1,41 @@
+@page "/force-reset"
+
+
+
+@*
+ - Reset and reload data
+ - Redis Cache reset
+ - Browser Local Data reset
+ - Browser Session Data reset
+
*@
+
+@code {
+
+ [Inject]
+ protected NavigationManager navManager { get; set; } = null!;
+ [Inject]
+ protected MessageService MsgServ { get; set; } = null!;
+
+ ///
+ /// Esecuzione task di reset...
+ ///
+ ///
+ protected override async Task OnInitializedAsync()
+ {
+ // svuoto cache
+ MsgServ.LastIdxMacchina = "";
+ await MsgServ.ClearLocalStor();
+ await MsgServ.ClearSessionStor();
+ // attendo
+ await Task.Delay(1000);
+ // rimando alla home...
+ navManager.NavigateTo("", true);
+ }
+}
diff --git a/MP-TAB3/Resources/ChangeLog.html b/MP-TAB3/Resources/ChangeLog.html
index 0a610a6b..4fc06f35 100644
--- a/MP-TAB3/Resources/ChangeLog.html
+++ b/MP-TAB3/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
Modulo MAPOSPEC
- Versione: 6.16.2502.2411
+ Versione: 6.16.2502.2815
Note di rilascio:
-
diff --git a/MP-TAB3/Resources/VersNum.txt b/MP-TAB3/Resources/VersNum.txt
index 503786c9..b26d2fc7 100644
--- a/MP-TAB3/Resources/VersNum.txt
+++ b/MP-TAB3/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2502.2411
+6.16.2502.2815
diff --git a/MP-TAB3/Resources/manifest.xml b/MP-TAB3/Resources/manifest.xml
index 990d7d7a..f13cf498 100644
--- a/MP-TAB3/Resources/manifest.xml
+++ b/MP-TAB3/Resources/manifest.xml
@@ -1,6 +1,6 @@
-
- 6.16.2502.2411
+ 6.16.2502.2815
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
diff --git a/MP-TAB3/Shared/MainLayout.razor b/MP-TAB3/Shared/MainLayout.razor
index 9d2889ad..9e22b266 100644
--- a/MP-TAB3/Shared/MainLayout.razor
+++ b/MP-TAB3/Shared/MainLayout.razor
@@ -6,23 +6,38 @@
HandleBodyClick()">
-
- @if (userIsOk || NavMan.Uri.Contains("reg-new-device"))
+ @if (NavMan.Uri.Contains("force-reset"))
{
@Body
- @if (!HideMenu)
- {
-
- }
}
+ else
+ {
+
+
+ @if (userIsOk || NavMan.Uri.Contains("reg-new-device"))
+ {
+
+
+ @Body
+
+ @if (!HideMenu)
+ {
+
+ }
+
+ }
+ }
-
+ @if (!NavMan.Uri.Contains("force-reset"))
+ {
+
+ }
diff --git a/MP-TAB3/Shared/NavMenu.razor b/MP-TAB3/Shared/NavMenu.razor
index a396220f..a0f7405c 100644
--- a/MP-TAB3/Shared/NavMenu.razor
+++ b/MP-TAB3/Shared/NavMenu.razor
@@ -55,7 +55,6 @@
protected async Task SetPage(string tgtUrl)
{
- await Task.Delay(1);
if (tgtUrl.Contains("status-map"))
{
await MsgServ.IdxMaccSet("");
diff --git a/MP.Stats/MP.Stats.csproj b/MP.Stats/MP.Stats.csproj
index b5bb274f..59408c9b 100644
--- a/MP.Stats/MP.Stats.csproj
+++ b/MP.Stats/MP.Stats.csproj
@@ -4,8 +4,8 @@
net6.0
MP.Stats
826e877c-ba70-4253-84cb-d0b1cafd4440
- 6.16.2502.2416
- 6.16.2502.2416
+ 6.16.2502.2508
+ 6.16.2502.2508
true
$(NoWarn);1591
en
diff --git a/MP.Stats/Resources/ChangeLog.html b/MP.Stats/Resources/ChangeLog.html
index 0dd73f73..7394e0cb 100644
--- a/MP.Stats/Resources/ChangeLog.html
+++ b/MP.Stats/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
Modulo statistiche MAPO
- Versione: 6.16.2502.2416
+ Versione: 6.16.2502.2508
Note di rilascio:
diff --git a/MP.Stats/Resources/VersNum.txt b/MP.Stats/Resources/VersNum.txt
index c58908f5..1ed9a64b 100644
--- a/MP.Stats/Resources/VersNum.txt
+++ b/MP.Stats/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2502.2416
+6.16.2502.2508
diff --git a/MP.Stats/Resources/manifest.xml b/MP.Stats/Resources/manifest.xml
index 46c2d7d9..67a73c97 100644
--- a/MP.Stats/Resources/manifest.xml
+++ b/MP.Stats/Resources/manifest.xml
@@ -1,6 +1,6 @@
-
- 6.16.2502.2416
+ 6.16.2502.2508
https://nexus.steamware.net/repository/SWS/MP-STATS/stable/LAST/MP.Stats.zip
https://nexus.steamware.net/repository/SWS/MP-STATS/stable/LAST/ChangeLog.html
false