Egalware/mapo-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix nomi elencomagazzini

Browse Source
This commit is contained in:
zaccaria.majid
2022-11-28 12:21:37 +01:00
parent b56814dd64
commit 0f0e97435f
15 changed files with 38 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP.INVE/Components/CmpTop.razor.cs
+13 -10
View File
@@ -44,20 +44,23 @@ namespace MP.INVE.Components
{
OperatoreDTO answ = new OperatoreDTO();
answ = await localStorage.GetItemAsync<OperatoreDTO>("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);
}
}
}
}
MP.INVE/Components/InveSessionList.razor
+2 -2
View File
@@ -21,9 +21,9 @@
<span class="input-group-text" id="inputGroup-sizing-sm">Magazzino</span>
<select class="form-select" @bind="@magazzino">
<option value="-1" selected>--Selezionare magazzino--</option>
@if (elencoMagazzini != null)
@if (ElencoMagazzini != null)
{
@foreach (var item in elencoMagazzini)
@foreach (var item in ElencoMagazzini)
{
@if (!item.DescMag.Contains("NON USARE"))
{
MP.INVE/Components/InveSessionList.razor.cs
+4 -4
View File
@@ -26,7 +26,7 @@ namespace MP.INVE.Components
public void Dispose()
{
elencoSessioni = null;
elencoMagazzini = null;
ElencoMagazzini = null;
elencoOperatori = null;
SearchRecords = null;
GC.Collect();
@@ -83,7 +83,7 @@ namespace MP.INVE.Components
{
reqNew = false;
elencoOperatori = new List<AnagOperatoriModel>();
elencoMagazzini = new List<AnagMagModel>();
ElencoMagazzini = new List<AnagMagModel>();
}
private DateTime dtStart { get; set; } = DateTime.Now.AddMonths(-1);
@@ -107,7 +107,7 @@ namespace MP.INVE.Components
if (reqNew)
{
elencoOperatori = MIDataservice.ElencoOperatori();
elencoMagazzini = MIDataservice.ElencoMagazzini();
ElencoMagazzini = MIDataservice.ElencoMagazzini();
}
}
@@ -203,6 +203,6 @@ namespace MP.INVE.Components
private List<InventorySessionModel>? elencoSessioni;
private List<InventorySessionModel>? SearchRecords;
private List<AnagOperatoriModel>? elencoOperatori;
private List<AnagMagModel>? elencoMagazzini;
private List<AnagMagModel>? ElencoMagazzini;
}
}
MP.INVE/Components/MagList.razor
+2 -2
View File
@@ -84,9 +84,9 @@
</tr>
</thead>
<tbody>
@if (elencoMagazzini != null)
@if (ElencoMagazzini != null)
{
@foreach (var item in elencoMagazzini)
@foreach (var item in ElencoMagazzini)
{
<tr>
<td>
MP.INVE/Components/MagList.razor.cs
+3 -3
View File
@@ -57,7 +57,7 @@ namespace MP.INVE.Components
mod = false;
desc = "";
}
private List<AnagMagModel>? elencoMagazzini;
private List<AnagMagModel>? ElencoMagazzini;
private List<AnagMagModel>? SearchRecords;
private AnagMagModel currMag { get; set; } = null!;
private bool mod { get; set; } = false;
@@ -88,11 +88,11 @@ namespace MP.INVE.Components
private async Task reloadData()
{
isLoading = true;
elencoMagazzini = null;
ElencoMagazzini = null;
SearchRecords = null;
SearchRecords = MIDataservice.ElencoMagazzini();
totalCount = SearchRecords.Count;
elencoMagazzini = SearchRecords.Skip(numRecord * (currPage - 1)).Take(numRecord).ToList();
ElencoMagazzini = SearchRecords.Skip(numRecord * (currPage - 1)).Take(numRecord).ToList();
await Task.Delay(1);
await InvokeAsync(() => StateHasChanged());
await Task.Delay(1);
MP.INVE/MP.INVE.csproj
+1 -1
View File
@@ -5,7 +5,7 @@
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<RootNamespace>MP.INVE</RootNamespace>
<Version>6.16.2211.2811</Version>
<Version>6.16.2211.2812</Version>
</PropertyGroup>
<ItemGroup>
MP.INVE/Pages/InveSession.razor
+2 -2
View File
@@ -53,9 +53,9 @@
<span class="input-group-text" id="inputGroup-sizing-sm">Magazzino</span>
<select class="form-select" @bind="@magazzino">
<option value="-1" selected>--Selezionare magazzino--</option>
@if (elencoMagazzini != null)
@if (ElencoMagazzini != null)
{
@foreach (var item in elencoMagazzini)
@foreach (var item in ElencoMagazzini)
{
<option value="@item.MagID">@item.CodMag @item.CodCS | @item.DescMag</option>
}
MP.INVE/Pages/InveSession.razor.cs
+1 -1
View File
@@ -31,7 +31,7 @@ namespace MP.INVE.Pages
private List<InventorySessionModel>? elencoSessioni;
private List<InventorySessionModel>? SearchRecords;
private List<AnagOperatoriModel>? elencoOperatori;
private List<AnagMagModel>? elencoMagazzini;
private List<AnagMagModel>? ElencoMagazzini;
private DataPager pagerSession = null!;
MP.INVE/Pages/Starter.razor
+1 -1
View File
@@ -1,4 +1,4 @@
@page "/Elencomagazzini"
@page "/ElencoMagazzini"
@inject IJSRuntime JSRuntime
MP.INVE/Pages/Starter.razor.cs
+4 -4
View File
@@ -85,7 +85,7 @@ namespace MP.INVE.Pages
}
private List<AnagMagModel>? elencoMagazzini;
private List<AnagMagModel>? 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();
}
}
MP.INVE/Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>Modulo MAPOINVE </i>
<h4>Versione: 6.16.2211.2811</h4>
<h4>Versione: 6.16.2211.2812</h4>
<br /> Note di rilascio:
<ul>
<li>
MP.INVE/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
6.16.2211.2811
6.16.2211.2812
MP.INVE/Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>6.16.2211.2811</version>
<version>6.16.2211.2812</version>
<url>https://nexus.steamware.net/repository/SWS/MP-INVE/stable/LAST/MP.INVE.zip</url>
<changelog>https://nexus.steamware.net/repository/SWS/MP-INVE/stable/LAST/ChangeLog.html</changelog>
<mandatory>false</mandatory>
MP.INVE/Shared/MainLayout.razor.cs
+1 -1
View File
@@ -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
MP.INVE/Shared/NavMenu.razor
+1 -1
View File
@@ -33,7 +33,7 @@
</NavLink>
</div>
<div class="nav-item px-2 col-12">
<NavLink class="nav-link px-2" href="Elencomagazzini">
<NavLink class="nav-link px-2" href="ElencoMagazzini">
<div class="col-2">
<span class="px-2" aria-hidden="true"><i class="fa-solid fa-warehouse"></i></span>
</div>