diff --git a/MP-TAB-SERV/Components/CmpTop.razor.cs b/MP-TAB-SERV/Components/CmpTop.razor.cs
index 281e7f8a..775a885c 100644
--- a/MP-TAB-SERV/Components/CmpTop.razor.cs
+++ b/MP-TAB-SERV/Components/CmpTop.razor.cs
@@ -27,6 +27,7 @@ namespace MP_TAB_SERV.Components
#region Protected Properties
protected string CurrOprTknLS { get; set; } = null!;
+ protected string LastOpenedPage { get; set; } = null!;
protected string CurrOprTknRedis { get; set; } = null!;
@@ -134,6 +135,7 @@ namespace MP_TAB_SERV.Components
expDT = DateTime.Now.AddDays(expDays);
CurrOprTknLS = await MsgServ.GetCurrOperDtoAsync();
+ LastOpenedPage = await MsgServ.LastOpenedPageGet();
var decodedUrl = Uri.UnescapeDataString(CurrOprTknLS);
// verifico se non avessi dati operatore
@@ -143,6 +145,8 @@ namespace MP_TAB_SERV.Components
}
CurrOprTknRedis = await TDService.OperatoreGetRedis(MatrOpr);
+
+
if (CurrOprTknRedis == "")
{
if (!NavMan.Uri.Contains("reg-new-device"))
@@ -152,10 +156,13 @@ namespace MP_TAB_SERV.Components
}
else if (CurrOprTknRedis != "")
{
- if (!NavMan.Uri.Contains("status-map"))
- {
- NavMan.NavigateTo("status-map", true);
- }
+ //if (!NavMan.Uri.Contains("status-map"))
+ //{
+ //}
+ //if (LastOpenedPage != "")
+ //{
+ // NavMan.NavigateTo(LastOpenedPage, true);
+ //}
}
}
diff --git a/MP-TAB-SERV/MP-TAB-SERV.csproj b/MP-TAB-SERV/MP-TAB-SERV.csproj
index 60c1fdae..33a87f1d 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.2312.608
+ 6.16.2312.615
enable
MP_TAB_SERV
diff --git a/MP-TAB-SERV/Pages/StatusMap.razor.cs b/MP-TAB-SERV/Pages/StatusMap.razor.cs
index 73667e1c..e5bc36bd 100644
--- a/MP-TAB-SERV/Pages/StatusMap.razor.cs
+++ b/MP-TAB-SERV/Pages/StatusMap.razor.cs
@@ -102,12 +102,16 @@ namespace MP_TAB_SERV.Pages
setDefaults();
ListMSE = null;
SetupConf();
+ var LastOpenedPage = await MsgServ.LastOpenedPageGet();
var currMacc = await MsgServ.IdxMaccGet();
if (currMacc != "" && currMacc != null)
{
await MsgServ.IdxMaccSet(currMacc);
-
- NavMan.NavigateTo($"machine-detail");
+ if (LastOpenedPage != "")
+ {
+ NavMan.NavigateTo(LastOpenedPage);
+ }
+ //NavMan.NavigateTo($"machine-detail");
}
}
diff --git a/MP-TAB-SERV/Resources/ChangeLog.html b/MP-TAB-SERV/Resources/ChangeLog.html
index c6762d73..360284d9 100644
--- a/MP-TAB-SERV/Resources/ChangeLog.html
+++ b/MP-TAB-SERV/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
Modulo MAPOSPEC
- Versione: 6.16.2312.608
+ Versione: 6.16.2312.615
Note di rilascio:
-
diff --git a/MP-TAB-SERV/Resources/VersNum.txt b/MP-TAB-SERV/Resources/VersNum.txt
index 6f86a27a..db3b683c 100644
--- a/MP-TAB-SERV/Resources/VersNum.txt
+++ b/MP-TAB-SERV/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2312.608
+6.16.2312.615
diff --git a/MP-TAB-SERV/Resources/manifest.xml b/MP-TAB-SERV/Resources/manifest.xml
index beff3540..6783e0e0 100644
--- a/MP-TAB-SERV/Resources/manifest.xml
+++ b/MP-TAB-SERV/Resources/manifest.xml
@@ -1,6 +1,6 @@
-
- 6.16.2312.608
+ 6.16.2312.615
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-TAB-SERV/Shared/MainLayout.razor.cs b/MP-TAB-SERV/Shared/MainLayout.razor.cs
index 36188ea9..1e5a8db3 100644
--- a/MP-TAB-SERV/Shared/MainLayout.razor.cs
+++ b/MP-TAB-SERV/Shared/MainLayout.razor.cs
@@ -71,7 +71,6 @@ namespace MP_TAB_SERV.Shared
protected async Task handleBodyClick()
{
- //await JSRuntime.InvokeVoidAsync("alert", "bodyClicked");
await Task.Delay(1);
MsgServ.dtLastAction = DateTime.Now;
}
diff --git a/MP-TAB-SERV/Shared/NavMenu.razor b/MP-TAB-SERV/Shared/NavMenu.razor
index 6d0af2c9..a3cfec58 100644
--- a/MP-TAB-SERV/Shared/NavMenu.razor
+++ b/MP-TAB-SERV/Shared/NavMenu.razor
@@ -41,6 +41,7 @@
{
await MsgServ.IdxMaccSet("");
}
+ await MsgServ.LastOpenedPageSet(tgtUrl);
navManager.NavigateTo(tgtUrl);
}
}
diff --git a/MP.Data/Services/MessageService.cs b/MP.Data/Services/MessageService.cs
index c7e7838b..e5caf153 100644
--- a/MP.Data/Services/MessageService.cs
+++ b/MP.Data/Services/MessageService.cs
@@ -342,6 +342,21 @@ namespace MP.Data.Services
{
await localStorage.SetItemAsync("CurrMach", machSel);
}
+ ///
+ /// Scrive sul local storage pagina corrente
+ ///
+ public async Task LastOpenedPageGet()
+ {
+ return await localStorage.GetItemAsync("LastPage");
+ }
+
+ ///
+ /// Ottiene sul local storage pagina corrente
+ ///
+ public async Task LastOpenedPageSet(string lastPage)
+ {
+ await localStorage.SetItemAsync("LastPage", lastPage);
+ }
///
/// Effettua salvataggio in localstorage dei dati MSE correnti