From d4529976adeed3665fc4f5cc9cabcc2b636942f9 Mon Sep 17 00:00:00 2001 From: "zaccaria.majid" Date: Wed, 6 Dec 2023 15:59:35 +0100 Subject: [PATCH] prova fix refresh --- MP-TAB-SERV/Components/CmpTop.razor.cs | 15 +++++++++++---- MP-TAB-SERV/MP-TAB-SERV.csproj | 2 +- MP-TAB-SERV/Pages/StatusMap.razor.cs | 8 ++++++-- MP-TAB-SERV/Resources/ChangeLog.html | 2 +- MP-TAB-SERV/Resources/VersNum.txt | 2 +- MP-TAB-SERV/Resources/manifest.xml | 2 +- MP-TAB-SERV/Shared/MainLayout.razor.cs | 1 - MP-TAB-SERV/Shared/NavMenu.razor | 1 + MP.Data/Services/MessageService.cs | 15 +++++++++++++++ 9 files changed, 37 insertions(+), 11 deletions(-) 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: