Egalware/gwms
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Filtro trasportatore libero (pre auth)

Browse Source
This commit is contained in:
Samuele Locatelli
2021-08-24 09:29:43 +02:00
parent bc0ff628fe
commit 36c79829b5
7 changed files with 91 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GWMS.UI/Extensions/NavigationManagerExtension.cs
+9
View File
@@ -7,6 +7,15 @@ namespace GWMS.UI.Extensions
{
#region Public Methods
/// <summary>
/// Estensione metodo NavigationManager
///
/// https://code-maze.com/query-strings-blazor-webassembly/
/// </summary>
/// <typeparam name="T"></typeparam>
/// <param name="navManager"></param>
/// <param name="key"></param>
/// <returns></returns>
public static T ExtractQueryStringByKey<T>(this NavigationManager navManager, string key)
{
var uri = navManager.ToAbsoluteUri(navManager.Uri);
GWMS.UI/GWMS.UI.csproj
+1 -1
View File
@@ -2,7 +2,7 @@
<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<Version>1.0.2108.2408</Version>
<Version>1.0.2108.2409</Version>
<UserSecretsId>95c9f021-52d1-4390-a670-5810b7b777b0</UserSecretsId>
</PropertyGroup>
GWMS.UI/Pages/Transporters.razor
+33 -7
View File
@@ -1,5 +1,4 @@
@page "/Transporters"
@page "/Transporters/{TransporterIdReq}"
@using Blazorise.Components
@using GWMS.UI.Components
@@ -12,11 +11,18 @@
<div class="col-6 pr-0 col-lg-8 h3">
Consegne
</div>
<div class="col-3 col-lg-2">
<button class="btn btn-sm btn-block btn-secondary" @onclick="() => ToggleFiltPeriod()"><i class="far fa-calendar-alt"></i> <i class="@icnFiltTime"></i></button>
</div>
<div class="col-3 col-lg-2">
<button class="btn btn-sm btn-block btn-secondary" @onclick="() => ToggleFiltDest()"><i class="fas fa-gas-pump"></i> <i class="@icnFiltDest"></i></button>
<div class="col-6 col-lg-4">
<div class="row">
<div class="col-6 px-1">
<button class="btn btn-sm btn-block btn-secondary" @onclick="() => ToggleFiltPeriod()"><i class="far fa-calendar-alt"></i> <i class="@icnFiltTime"></i></button>
</div>
@*<div class="col-4 px-1">
<button class="btn btn-sm btn-block btn-secondary" @onclick="() => ToggleFiltTransp()"><i class="fas fa-truck-moving"></i> <i class="@icnFiltTran"></i></button>
</div>*@
<div class="col-6 px-1">
<button class="btn btn-sm btn-block btn-secondary" @onclick="() => ToggleFiltDest()"><i class="fas fa-gas-pump"></i> <i class="@icnFiltDest"></i></button>
</div>
</div>
</div>
</div>
</div>
@@ -36,7 +42,6 @@
</div>
</div>
}
@if (showFiltDest)
{
<div class="row">
@@ -61,6 +66,27 @@
</div>
</div>
}
<div class="row">
<div class="col">
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text">
<span class="fas fa-truck-moving" aria-hidden="true"></span>
</span>
</div>
<select @bind="SelTranspId" class="form-control form-control-sm" title="Trasportatore">
<option value="0">--- Tutti ---</option>
@if (TransportersList != null)
{
foreach (var item in TransportersList)
{
<option value="@item.TransporterId">@item.TransporterCode | @item.TransporterDesc</option>
}
}
</select>
</div>
</div>
</div>
</div>
</div>
</div>
GWMS.UI/Pages/Transporters.razor.cs
+45 -21
View File
@@ -20,6 +20,8 @@ namespace GWMS.UI.Pages
private List<PlantDTO> PlantsList;
private List<OrderModel> SearchRecords;
private List<TransporterModel> TransportersList;
#endregion Private Fields
#region Private Properties
@@ -58,6 +60,14 @@ namespace GWMS.UI.Pages
}
}
private string icnFiltTran
{
get
{
return showFiltTrasp ? "fas fa-chevron-up" : "fas fa-chevron-down";
}
}
private bool isLoading { get; set; } = false;
private int numRecord
@@ -97,6 +107,29 @@ namespace GWMS.UI.Pages
}
}
private int SelTranspId
{
get
{
int answ = 0;
if (MessageService.Order_Filter != null)
{
answ = MessageService.Order_Filter.TransporterId;
}
return answ;
}
set
{
if (!MessageService.Order_Filter.TransporterId.Equals(value))
{
currRecord = null;
MessageService.Order_Filter.TransporterId = value;
var pUpd = Task.Run(async () => await ReloadData());
pUpd.Wait();
}
}
}
#endregion Private Properties
#region Protected Properties
@@ -160,39 +193,23 @@ namespace GWMS.UI.Pages
protected bool showFiltDest { get; set; } = false;
protected bool showFiltTime { get; set; } = false;
protected bool showFiltTrasp { get; set; } = false;
protected int totalCount
{
get
{
int answ = 0;
if (SearchRecords != null)
if (ListRecords != null)
{
answ = SearchRecords.Count;
answ = ListRecords.Count;
}
return answ;
}
}
protected int TransporterIdFilt
{
get
{
int answ = 0;
int.TryParse(TransporterIdReq, out answ);
return answ;
}
}
#endregion Protected Properties
#region Public Properties
[Parameter]
public string TransporterIdReq { get; set; } = "";
#endregion Public Properties
#region Private Methods
private void OnDateEndChanged(DateTime? date)
@@ -211,7 +228,8 @@ namespace GWMS.UI.Pages
{
isLoading = true;
SearchRecords = await DataService.OrdersGetFilt(MessageService.Order_Filter);
ListRecords = SearchRecords.Where(x => x.TransporterId == TransporterIdFilt).Skip(numRecord * (currPage - 1)).Take(numRecord).ToList();
ListRecords = SearchRecords.Skip(numRecord * (currPage - 1)).Take(numRecord).ToList();
//ListRecords = SearchRecords.Where(x => x.TransporterId == TransporterIdFilt).Skip(numRecord * (currPage - 1)).Take(numRecord).ToList();
isLoading = false;
}
@@ -237,6 +255,7 @@ namespace GWMS.UI.Pages
protected override async Task OnInitializedAsync()
{
SelPlantId = 0;
SelTranspId = 0;
MessageService.ShowSearch = false;
MessageService.PageName = "Fornitore";
MessageService.PageIcon = "fas fa-industry pr-2";
@@ -247,6 +266,7 @@ namespace GWMS.UI.Pages
protected async Task ReloadAllData()
{
PlantsList = await DataService.PlantsGetAll();
TransportersList = await DataService.TransportersGetAll();
await ReloadData();
}
@@ -274,7 +294,6 @@ namespace GWMS.UI.Pages
protected void ToggleFiltDest()
{
showFiltDest = !showFiltDest;
// se nascosto --> reset
if (!showFiltDest)
{
SelPlantId = 0;
@@ -286,6 +305,11 @@ namespace GWMS.UI.Pages
showFiltTime = !showFiltTime;
}
protected void ToggleFiltTransp()
{
showFiltTrasp = !showFiltTrasp;
}
protected async Task UpdateData()
{
currRecord = null;
Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>GWMS - Gas Warehouse Management System</i>
<h4>Versione: 1.0.2108.2408</h4>
<h4>Versione: 1.0.2108.2409</h4>
<br /> Note di rilascio:
<ul>
<li>
Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
1.0.2108.2408
1.0.2108.2409
Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>1.0.2108.2408</version>
<version>1.0.2108.2409</version>
<url>http://nexus.steamware.net/repository/SWS/GWMS/stable/0/GWMS.UI.zip</url>
<changelog>http://nexus.steamware.net/repository/SWS/GWMS/stable/0/ChangeLog.html</changelog>
<mandatory>false</mandatory>