From abdd9d9e39aa37165bcc91d7b258fc066c70db15 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Wed, 19 May 2021 19:02:33 +0200 Subject: [PATCH] Update pagina controlli --- MP.Stats/Components/DataPager.razor | 1 - MP.Stats/Data/MpStatsService.cs | 9 +--- MP.Stats/Pages/Controlli.razor | 80 ++++++++++++++--------------- MP.Stats/Pages/Controlli.razor.cs | 12 ++++- 4 files changed, 53 insertions(+), 49 deletions(-) diff --git a/MP.Stats/Components/DataPager.razor b/MP.Stats/Components/DataPager.razor index 5616729f..39f03d41 100644 --- a/MP.Stats/Components/DataPager.razor +++ b/MP.Stats/Components/DataPager.razor @@ -17,7 +17,6 @@ } - diff --git a/MP.Stats/Data/MpStatsService.cs b/MP.Stats/Data/MpStatsService.cs index 60e542c8..a5b8934f 100644 --- a/MP.Stats/Data/MpStatsService.cs +++ b/MP.Stats/Data/MpStatsService.cs @@ -74,14 +74,9 @@ namespace MP.Stats.Data return Task.FromResult(dbController.StatArticoliGetSearch(numRecord, searchVal).ToArray()); } - public Task StatControlliGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo, int numRecord, string searchVal = "") + public Task 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 StatDdbGetAll(int numRecord, string searchVal = "") diff --git a/MP.Stats/Pages/Controlli.razor b/MP.Stats/Pages/Controlli.razor index e53533e1..abaf527d 100644 --- a/MP.Stats/Pages/Controlli.razor +++ b/MP.Stats/Pages/Controlli.razor @@ -6,13 +6,12 @@
-
Registro Controlli
-
- +
Registro Controlli
+
-
+
@if (currRecord != null) { @**@ @@ -23,44 +22,45 @@ } else { - - - - @**@ - - - - - - - - - - - @foreach (var record in ListRecords) - { - - @**@ - - - - - - - - - } - -
MacchinaDataODL/CommessaArticoloEsitoNoteOperatore
 @record.IdxMacchina@record.DataOra@record.IdxOdl@record.CodArticolo@record.EsitoOk@record.Note@record.MatrOpr
+
+
+ +
+
+ + + + @**@ + + + + + + + + + + + @foreach (var record in ListRecords) + { + + @**@ + + + + + + + + + } + +
MacchinaDataODL/CommessaArticoloEsitoNoteOperatore
 @record.IdxMacchina@record.DataOra@record.IdxOdl@record.CodArticolo@record.EsitoOk@record.Note@record.MatrOpr
+
+
}
-
-
-
-
- -
-
+
\ No newline at end of file diff --git a/MP.Stats/Pages/Controlli.razor.cs b/MP.Stats/Pages/Controlli.razor.cs index 6a52ec24..e9fe603e 100644 --- a/MP.Stats/Pages/Controlli.razor.cs +++ b/MP.Stats/Pages/Controlli.razor.cs @@ -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;