diff --git a/MP-TAB3/Components/CmpTop.razor.cs b/MP-TAB3/Components/CmpTop.razor.cs index 73b54a5f..f5f6ae6a 100644 --- a/MP-TAB3/Components/CmpTop.razor.cs +++ b/MP-TAB3/Components/CmpTop.razor.cs @@ -81,13 +81,13 @@ namespace MP_TAB3.Components { done = await MsgServ.DoLogIn(decodValue, true); } - if (done ) + if (done && !string.IsNullOrEmpty(LastOpenedPage)) { - if (!string.IsNullOrEmpty(LastOpenedPage) && !string.IsNullOrEmpty(CurrMacc)) + if (!string.IsNullOrEmpty(CurrMacc)) { NavMan.NavigateTo(LastOpenedPage); } - else if(!NavMan.Uri.Contains(LastOpenedPage)) + else { NavMan.NavigateTo("status-map"); } diff --git a/MP-TAB3/MP-TAB3.csproj b/MP-TAB3/MP-TAB3.csproj index 41831205..1e78bebc 100644 --- a/MP-TAB3/MP-TAB3.csproj +++ b/MP-TAB3/MP-TAB3.csproj @@ -3,7 +3,7 @@ net6.0 enable - 6.16.2402.1919 + 6.16.2402.2110 enable MP_TAB3 diff --git a/MP-TAB3/Pages/RegNewDevice.razor.cs b/MP-TAB3/Pages/RegNewDevice.razor.cs index 3b202b3c..3f3e6575 100644 --- a/MP-TAB3/Pages/RegNewDevice.razor.cs +++ b/MP-TAB3/Pages/RegNewDevice.razor.cs @@ -94,6 +94,7 @@ namespace MP_TAB3.Pages var deHash = TDService.DecryptData(authKey); rigaOpr = await TDService.OperatoreSearch(matrOpr, deHash); } + await Task.Delay(50); if (rigaOpr != null && rigaOpr.MatrOpr > 0) { userTknDTO newUserTkn = new userTknDTO() @@ -105,9 +106,11 @@ namespace MP_TAB3.Pages var jsonTkn = JsonConvert.SerializeObject(newUserTkn); string hash = TDService.EncryptData(jsonTkn); MsgServ.RigaOper = rigaOpr; + await Task.Delay(50); await MsgServ.SetCurrOperDtoLSAsync(hash); await MsgServ.SetLastMatrOprAsync(rigaOpr.MatrOpr); await TDService.OperatoreSetRedis(matrOpr, hash, devGuid); + await Task.Delay(50); NavMan.NavigateTo("status-map", true); } else diff --git a/MP-TAB3/Resources/ChangeLog.html b/MP-TAB3/Resources/ChangeLog.html index 970a5e81..5b032fe4 100644 --- a/MP-TAB3/Resources/ChangeLog.html +++ b/MP-TAB3/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo MAPOSPEC -

Versione: 6.16.2402.1919

+

Versione: 6.16.2402.2110


Note di rilascio: