From 0f0e97435fcfbcd60f1da2dfd616e45c98b26a1c Mon Sep 17 00:00:00 2001 From: "zaccaria.majid" Date: Mon, 28 Nov 2022 12:21:37 +0100 Subject: [PATCH] fix nomi elencomagazzini --- MP.INVE/Components/CmpTop.razor.cs | 23 ++++++++++++--------- MP.INVE/Components/InveSessionList.razor | 4 ++-- MP.INVE/Components/InveSessionList.razor.cs | 8 +++---- MP.INVE/Components/MagList.razor | 4 ++-- MP.INVE/Components/MagList.razor.cs | 6 +++--- MP.INVE/MP.INVE.csproj | 2 +- MP.INVE/Pages/InveSession.razor | 4 ++-- MP.INVE/Pages/InveSession.razor.cs | 2 +- MP.INVE/Pages/Starter.razor | 2 +- MP.INVE/Pages/Starter.razor.cs | 8 +++---- MP.INVE/Resources/ChangeLog.html | 2 +- MP.INVE/Resources/VersNum.txt | 2 +- MP.INVE/Resources/manifest.xml | 2 +- MP.INVE/Shared/MainLayout.razor.cs | 2 +- MP.INVE/Shared/NavMenu.razor | 2 +- 15 files changed, 38 insertions(+), 35 deletions(-) diff --git a/MP.INVE/Components/CmpTop.razor.cs b/MP.INVE/Components/CmpTop.razor.cs index e5204db8..262b05f0 100644 --- a/MP.INVE/Components/CmpTop.razor.cs +++ b/MP.INVE/Components/CmpTop.razor.cs @@ -44,20 +44,23 @@ namespace MP.INVE.Components { OperatoreDTO answ = new OperatoreDTO(); answ = await localStorage.GetItemAsync("MatrOpr"); - if (answ != null) + if (!NavManager.Uri.Contains("Jumper?")) { - userName = $"{answ.Cognome} {answ.Nome} ({answ.MatrOpr})"; - if (NavManager.Uri.Contains("OperatoreLogin")) + if (answ != null) { - NavManager.NavigateTo("Starter", true); + userName = $"{answ.Cognome} {answ.Nome} ({answ.MatrOpr})"; + if (NavManager.Uri.Contains("OperatoreLogin")) + { + NavManager.NavigateTo("Starter", true); + } } - } - else - { - userName = "0"; - if (!NavManager.Uri.Contains("OperatoreLogin")) + else { - NavManager.NavigateTo("OperatoreLogin", true); + userName = "0"; + if (!NavManager.Uri.Contains("OperatoreLogin")) + { + NavManager.NavigateTo("OperatoreLogin", true); + } } } } diff --git a/MP.INVE/Components/InveSessionList.razor b/MP.INVE/Components/InveSessionList.razor index 9901e34b..b0c46970 100644 --- a/MP.INVE/Components/InveSessionList.razor +++ b/MP.INVE/Components/InveSessionList.razor @@ -21,9 +21,9 @@ Magazzino - @if (elencoMagazzini != null) + @if (ElencoMagazzini != null) { - @foreach (var item in elencoMagazzini) + @foreach (var item in ElencoMagazzini) { } diff --git a/MP.INVE/Pages/InveSession.razor.cs b/MP.INVE/Pages/InveSession.razor.cs index 933f5571..618ca295 100644 --- a/MP.INVE/Pages/InveSession.razor.cs +++ b/MP.INVE/Pages/InveSession.razor.cs @@ -31,7 +31,7 @@ namespace MP.INVE.Pages private List? elencoSessioni; private List? SearchRecords; private List? elencoOperatori; - private List? elencoMagazzini; + private List? ElencoMagazzini; private DataPager pagerSession = null!; diff --git a/MP.INVE/Pages/Starter.razor b/MP.INVE/Pages/Starter.razor index f4cf3b72..54d15d00 100644 --- a/MP.INVE/Pages/Starter.razor +++ b/MP.INVE/Pages/Starter.razor @@ -1,4 +1,4 @@ -@page "/Elencomagazzini" +@page "/ElencoMagazzini" @inject IJSRuntime JSRuntime diff --git a/MP.INVE/Pages/Starter.razor.cs b/MP.INVE/Pages/Starter.razor.cs index 0a85d409..e15de5c8 100644 --- a/MP.INVE/Pages/Starter.razor.cs +++ b/MP.INVE/Pages/Starter.razor.cs @@ -85,7 +85,7 @@ namespace MP.INVE.Pages } - private List? elencoMagazzini; + private List? ElencoMagazzini; protected override async Task OnInitializedAsync() { await Task.Delay(1); @@ -106,9 +106,9 @@ namespace MP.INVE.Pages private async Task reloadData() { await Task.Delay(1); - elencoMagazzini = null; + ElencoMagazzini = null; isLoading = true; - elencoMagazzini = MIDataservice.ElencoMagazzini(); + ElencoMagazzini = MIDataservice.ElencoMagazzini(); isLoading = false; } @@ -143,7 +143,7 @@ namespace MP.INVE.Pages if (alert) { await MIDataservice.DeleteMag(mag); - NavManager.NavigateTo("Elencomagazzini", true); + NavManager.NavigateTo("ElencoMagazzini", true); await reloadData(); } } diff --git a/MP.INVE/Resources/ChangeLog.html b/MP.INVE/Resources/ChangeLog.html index 4884924e..99ac9b8c 100644 --- a/MP.INVE/Resources/ChangeLog.html +++ b/MP.INVE/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo MAPOINVE -

Versione: 6.16.2211.2811

+

Versione: 6.16.2211.2812


Note di rilascio:
  • diff --git a/MP.INVE/Resources/VersNum.txt b/MP.INVE/Resources/VersNum.txt index 25a21212..ba1f5e08 100644 --- a/MP.INVE/Resources/VersNum.txt +++ b/MP.INVE/Resources/VersNum.txt @@ -1 +1 @@ -6.16.2211.2811 +6.16.2211.2812 diff --git a/MP.INVE/Resources/manifest.xml b/MP.INVE/Resources/manifest.xml index 2d10058c..9e9fe765 100644 --- a/MP.INVE/Resources/manifest.xml +++ b/MP.INVE/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.16.2211.2811 + 6.16.2211.2812 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 9f733c3b..6b58717b 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("Elencomagazzini", true); + NavManager.NavigateTo("ElencoMagazzini", true); } } else diff --git a/MP.INVE/Shared/NavMenu.razor b/MP.INVE/Shared/NavMenu.razor index 0b695068..3b3f2869 100644 --- a/MP.INVE/Shared/NavMenu.razor +++ b/MP.INVE/Shared/NavMenu.razor @@ -33,7 +33,7 @@