diff --git a/MP.Data/Utils.cs b/MP.Data/Utils.cs index 87026808..f7f548cd 100644 --- a/MP.Data/Utils.cs +++ b/MP.Data/Utils.cs @@ -109,20 +109,6 @@ namespace MP.Data return answ; } - [Inject] - protected ILocalStorageService localStorage { get; set; } = null!; - [Inject] - protected NavigationManager NavManager { get; set; } = null!; - protected async Task getId() - { - OperatoreDTO local = new OperatoreDTO(); - local = await localStorage.GetItemAsync("MatrOpr"); - if ((local == null)) - { - NavManager.NavigateTo("OperatoreLogin"); - } - } - #endregion Public Methods } } \ No newline at end of file diff --git a/MP.INVE/Components/CmpTop.razor.cs b/MP.INVE/Components/CmpTop.razor.cs index 65f635b7..a482edc9 100644 --- a/MP.INVE/Components/CmpTop.razor.cs +++ b/MP.INVE/Components/CmpTop.razor.cs @@ -24,7 +24,7 @@ namespace MP.INVE.Components { await localStorage.ClearAsync(); // rimando a pagina login - NavManager.NavigateTo("OperatoreLogin", true); + NavManager.NavigateTo("/MP/Inve/OperatoreLogin", true); } #endregion Public Methods @@ -49,7 +49,7 @@ namespace MP.INVE.Components userName = $"{answ.Cognome} {answ.Nome} ({answ.MatrOpr})"; if (NavManager.Uri.Contains("OperatoreLogin")) { - NavManager.NavigateTo("Starter", true); + NavManager.NavigateTo("/MP/Inve/Starter", true); } } else @@ -57,7 +57,7 @@ namespace MP.INVE.Components userName = "0"; if (!NavManager.Uri.Contains("OperatoreLogin")) { - NavManager.NavigateTo("OperatoreLogin", true); + NavManager.NavigateTo("/MP/Inve/OperatoreLogin", true); } } } diff --git a/MP.INVE/Components/InveSessionList.razor.cs b/MP.INVE/Components/InveSessionList.razor.cs index 511d8056..47794e1d 100644 --- a/MP.INVE/Components/InveSessionList.razor.cs +++ b/MP.INVE/Components/InveSessionList.razor.cs @@ -135,7 +135,7 @@ namespace MP.INVE.Components }; await MIDataservice.InsertNewSessione(newSess); - NavManager.NavigateTo("Session", true); + NavManager.NavigateTo(NavManager.Uri, true); await reloadData(); } else @@ -155,7 +155,7 @@ namespace MP.INVE.Components if (alert) { await MIDataservice.deleteSessione(session); - NavManager.NavigateTo("Session", true); + NavManager.NavigateTo(NavManager.Uri, true); await reloadData(); } } diff --git a/MP.INVE/Components/MagList.razor.cs b/MP.INVE/Components/MagList.razor.cs index 4b2b22f0..c16f7b45 100644 --- a/MP.INVE/Components/MagList.razor.cs +++ b/MP.INVE/Components/MagList.razor.cs @@ -75,7 +75,7 @@ namespace MP.INVE.Components Nascosto = false }; await MIDataservice.InsertNewMag(newMag); - NavManager.NavigateTo("Elencomagazzini", true); + NavManager.NavigateTo(NavManager.Uri, true); //await MIDataservice.FlushRedisCache(); await reloadData(); } diff --git a/MP.INVE/MP.INVE.csproj b/MP.INVE/MP.INVE.csproj index 319adc25..2ef6a6c0 100644 --- a/MP.INVE/MP.INVE.csproj +++ b/MP.INVE/MP.INVE.csproj @@ -5,7 +5,7 @@ enable enable MP.INVE - 6.16.2211.2115 + 6.16.2211.2116 diff --git a/MP.INVE/Pages/Index.razor.cs b/MP.INVE/Pages/Index.razor.cs index 24845251..5f7b5a65 100644 --- a/MP.INVE/Pages/Index.razor.cs +++ b/MP.INVE/Pages/Index.razor.cs @@ -34,21 +34,6 @@ namespace MP.INVE.Pages //await getId(); await Task.Delay(1); } -#if false - [Inject] - protected ILocalStorageService localStorage { get; set; } = null!; - [Inject] - protected NavigationManager NavManager { get; set; } = null!; - protected async Task getId() - { - OperatoreDTO local = new OperatoreDTO(); - local = await localStorage.GetItemAsync("MatrOpr"); - if ((local == null)) - { - NavManager.NavigateTo("OperatoreLogin"); - } - } -#endif #endregion Protected Methods #region Private Fields diff --git a/MP.INVE/Pages/OperatoreLogin.razor.cs b/MP.INVE/Pages/OperatoreLogin.razor.cs index 15755f2f..9a88ca47 100644 --- a/MP.INVE/Pages/OperatoreLogin.razor.cs +++ b/MP.INVE/Pages/OperatoreLogin.razor.cs @@ -66,7 +66,7 @@ namespace MP.INVE.Pages if (elencoOperatori.Count == 1) { - NavManager.NavigateTo("/MP/InveSession", true); + NavManager.NavigateTo("/MP/Inve/InveSession", true); localStorage.SetItemAsync("MatrOpr", sessionOpr); } else diff --git a/MP.INVE/Pages/Starter.razor.cs b/MP.INVE/Pages/Starter.razor.cs index 76cd6bf4..0a85d409 100644 --- a/MP.INVE/Pages/Starter.razor.cs +++ b/MP.INVE/Pages/Starter.razor.cs @@ -126,7 +126,7 @@ namespace MP.INVE.Pages Nascosto = false }; await MIDataservice.InsertNewMag(newMag); - NavManager.NavigateTo("Elencomagazzini", true); + NavManager.NavigateTo(NavManager.Uri, true); //await MIDataservice.FlushRedisCache(); await reloadData(); } @@ -135,6 +135,7 @@ namespace MP.INVE.Pages closeNew(); } } +#if false private async Task deleteMag(AnagMagModel mag) { @@ -145,7 +146,8 @@ namespace MP.INVE.Pages NavManager.NavigateTo("Elencomagazzini", true); await reloadData(); } - } + } +#endif protected void ForceReload(int newNum) { numRecord = newNum; diff --git a/MP.INVE/Resources/ChangeLog.html b/MP.INVE/Resources/ChangeLog.html index 3af84f29..ac15bafc 100644 --- a/MP.INVE/Resources/ChangeLog.html +++ b/MP.INVE/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo MAPOINVE -

Versione: 6.16.2211.2115

+

Versione: 6.16.2211.2116


Note di rilascio:
  • diff --git a/MP.INVE/Resources/VersNum.txt b/MP.INVE/Resources/VersNum.txt index 6387ee39..46dcee24 100644 --- a/MP.INVE/Resources/VersNum.txt +++ b/MP.INVE/Resources/VersNum.txt @@ -1 +1 @@ -6.16.2211.2115 +6.16.2211.2116 diff --git a/MP.INVE/Resources/manifest.xml b/MP.INVE/Resources/manifest.xml index ce0cb59a..f606b314 100644 --- a/MP.INVE/Resources/manifest.xml +++ b/MP.INVE/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.16.2211.2115 + 6.16.2211.2116 https://nexus.steamware.net/repository/SWS/MP-INVE/stable/LAST/MP.INVE.zip https://nexus.steamware.net/repository/SWS/MP-INVE/stable/LAST/ChangeLog.html false diff --git a/MP.INVE/Shared/MainLayout.razor.cs b/MP.INVE/Shared/MainLayout.razor.cs index f72febb2..6dc282a2 100644 --- a/MP.INVE/Shared/MainLayout.razor.cs +++ b/MP.INVE/Shared/MainLayout.razor.cs @@ -32,7 +32,7 @@ namespace MP.INVE.Shared userName = $"{answ.Cognome} {answ.Nome} ({answ.MatrOpr})"; if (NavManager.Uri.Contains("OperatoreLogin")) { - NavManager.NavigateTo("Starter", true); + NavManager.NavigateTo("MP/Inve/Starter", true); } } else @@ -40,7 +40,7 @@ namespace MP.INVE.Shared userName = "0"; if (!NavManager.Uri.Contains("OperatoreLogin")) { - NavManager.NavigateTo("OperatoreLogin", true); + NavManager.NavigateTo("MP/Inve/OperatoreLogin", true); } } }