Update pagina controlli

This commit is contained in:
Samuele Locatelli
2021-05-19 19:02:33 +02:00
parent e016aeaf02
commit abdd9d9e39
4 changed files with 53 additions and 49 deletions
-1
View File
@@ -17,7 +17,6 @@
</PaginationLink>
</PaginationItem>
}
<PaginationItem>
<PaginationLink Clicked="@HandlePaginationItemClick" Page="@LastPage.ToString()">
<span aria-hidden="true">»</span>
+2 -7
View File
@@ -74,14 +74,9 @@ namespace MP.Stats.Data
return Task.FromResult(dbController.StatArticoliGetSearch(numRecord, searchVal).ToArray());
}
public Task<MP.Data.DatabaseModels.ResControlli[]> StatControlliGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo, int numRecord, string searchVal = "")
public Task<MP.Data.DatabaseModels.ResControlli[]> StatControlliGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo, string searchVal = "")
{
return Task.FromResult(
dbController
.StatControlliGetAll(DataStart, DataEnd, IdxMacchina, IdxODL, KeyRichiesta, CodArticolo)
//.Where(x => (x.Note.Contains(searchVal) || string.IsNullOrEmpty(searchVal) || string.IsNullOrEmpty(x.Note)))
.Take(numRecord)
.ToArray());
return Task.FromResult(dbController.StatControlliGetAll(DataStart, DataEnd, IdxMacchina, IdxODL, KeyRichiesta, CodArticolo).ToArray());
}
public Task<MP.Data.DatabaseModels.DdbTurni[]> StatDdbGetAll(int numRecord, string searchVal = "")
+40 -40
View File
@@ -6,13 +6,12 @@
<div class="card">
<div class="card-header table-primary">
<div class="row">
<div class="col-6 col-lg-2 h2">Registro Controlli</div>
<div class="col-6 col-lg-10">
<SelectionFilter SelFilter="currFilter" filterChanged="DoFilter"></SelectionFilter>
<div class="col-6 col-lg-3 h2">Registro Controlli</div>
<div class="col-6 col-lg-9">
</div>
</div>
</div>
<div class="card-body">
<div class="card-body py-0">
@if (currRecord != null)
{
@*<BasketEditor Basket="@currBasket" DataReset="ResetData" DataUpdated="UpdateData"></BasketEditor>*@
@@ -23,44 +22,45 @@
}
else
{
<table class="table table-sm table-striped">
<thead>
<tr>
@*<th></th>*@
<th>Macchina</th>
<th>Data</th>
<th>ODL/Commessa</th>
<th>Articolo</th>
<th>Esito</th>
<th>Note</th>
<th>Operatore</th>
</tr>
</thead>
<tbody>
@foreach (var record in ListRecords)
{
<tr class="@checkSelect(@record.IdxControllo)">
@*<td><button class="btn btn-sm btn-info" @onclick="() => Edit(record)"><span class="oi oi-pencil"></span></button>&nbsp;<button class="btn btn-sm btn-success" @onclick="() => ShowDocs(record)" title="Vai ai documenti"><span class="oi oi-document"></span></button></td>*@
<td>@record.IdxMacchina</td>
<td>@record.DataOra</td>
<td>@record.IdxOdl</td>
<td>@record.CodArticolo</td>
<td>@record.EsitoOk</td>
<td>@record.Note</td>
<td>@record.MatrOpr</td>
</tr>
}
</tbody>
</table>
<div class="row">
<div class="col-12 table-secondary">
<SelectionFilter SelFilter="currFilter" filterChanged="DoFilter"></SelectionFilter>
</div>
<div class="col-12">
<table class="table table-sm table-striped">
<thead>
<tr>
@*<th></th>*@
<th>Macchina</th>
<th>Data</th>
<th>ODL/Commessa</th>
<th>Articolo</th>
<th>Esito</th>
<th>Note</th>
<th>Operatore</th>
</tr>
</thead>
<tbody>
@foreach (var record in ListRecords)
{
<tr class="@checkSelect(@record.IdxControllo)">
@*<td><button class="btn btn-sm btn-info" @onclick="() => Edit(record)"><span class="oi oi-pencil"></span></button>&nbsp;<button class="btn btn-sm btn-success" @onclick="() => ShowDocs(record)" title="Vai ai documenti"><span class="oi oi-document"></span></button></td>*@
<td>@record.IdxMacchina</td>
<td>@record.DataOra</td>
<td>@record.IdxOdl</td>
<td>@record.CodArticolo</td>
<td>@record.EsitoOk</td>
<td>@record.Note</td>
<td>@record.MatrOpr</td>
</tr>
}
</tbody>
</table>
</div>
</div>
}
</div>
<div class="card-footer py-1">
<div class="row">
<div class="col-8 col-lg-10">
</div>
<div class="col-4 col-lg-2">
<DataPager numRecord="@numRecord" numRecordChanged="ForceReload" />
</div>
</div>
<DataPager PageSize="@numRecord" currPage="@currPage" numRecordChanged="ForceReload" numPageChanged="ForceReloadPage" totalCount="@SearchRecords.Count()" />
</div>
</div>
+11 -1
View File
@@ -2,6 +2,7 @@
using Microsoft.JSInterop;
using MP.Stats.Data;
using System;
using System.Linq;
using System.Threading.Tasks;
namespace MP.Stats.Pages
@@ -13,12 +14,14 @@ namespace MP.Stats.Pages
private MP.Data.DatabaseModels.ResControlli currRecord = null;
private MP.Data.DatabaseModels.ResControlli[] ListRecords;
private MP.Data.DatabaseModels.ResControlli[] SearchRecords;
#endregion Private Fields
#region Private Properties
private SelectData currFilter { get; set; } = new SelectData();
private int currPage { get; set; } = 1;
private int numRecord { get; set; } = 10;
#endregion Private Properties
@@ -43,7 +46,8 @@ namespace MP.Stats.Pages
private async Task reloadData()
{
ListRecords = await StatService.StatControlliGetAll(currFilter.DateStart, currFilter.DateEnd, currFilter.IdxMacchina, currFilter.IdxOdl, currFilter.KeyRichiesta, currFilter.CodArticolo, numRecord, MessageService.SearchVal);
SearchRecords = await StatService.StatControlliGetAll(currFilter.DateStart, currFilter.DateEnd, currFilter.IdxMacchina, currFilter.IdxOdl, currFilter.KeyRichiesta, currFilter.CodArticolo, MessageService.SearchVal);
ListRecords = SearchRecords.Skip(numRecord * (currPage - 1)).Take(numRecord).ToArray();
}
#endregion Private Methods
@@ -62,6 +66,12 @@ namespace MP.Stats.Pages
await reloadData();
}
protected async Task ForceReloadPage(int newNum)
{
currPage = newNum;
await reloadData();
}
protected override async Task OnInitializedAsync()
{
MessageService.ShowSearch = true;