diff --git a/MP-TAB/MP-TAB.Client/MP-TAB.Client.csproj b/MP-TAB/MP-TAB.Client/MP-TAB.Client.csproj index 4717ce9c..008e6d63 100644 --- a/MP-TAB/MP-TAB.Client/MP-TAB.Client.csproj +++ b/MP-TAB/MP-TAB.Client/MP-TAB.Client.csproj @@ -31,6 +31,8 @@ + + diff --git a/MP-TAB/MP-TAB.Client/Pages/TCHistory.razor b/MP-TAB/MP-TAB.Client/Pages/TCHistory.razor index 13051368..f24f2bfc 100644 --- a/MP-TAB/MP-TAB.Client/Pages/TCHistory.razor +++ b/MP-TAB/MP-TAB.Client/Pages/TCHistory.razor @@ -1,4 +1,5 @@ -@attribute [RenderModeAuto] +@using NLog; +@attribute [RenderModeAuto] @* @attribute [RenderModeServer] *@ @inject HttpClient Http @@ -8,21 +9,78 @@
- @if (isLoading) - { - ...loading... - } - else - { - griglia risultati - @if (ListODL != null && ListODL.Count > 0) - { - foreach (var item in ListODL) + + + + + + + + + + + + @if (isLoading) { -

@item.IdxOdl

+ @for (int i = 0; i < NumRecPage; i++) + { + + + + + + + + } } - } - } + else + { + @if (ListODL == null || ListODL.Count == 0) + { + + + + } + else + { + foreach (var item in ListODL) + { + + + + + + + +

@item.IdxOdl

+ } + } + } + +
ArticoloTCicloNotePeriodoImpianto
+
+ +
+
+ +
+
+ +
+
Nessun record trovato
+
+
@item.CodArticolo
+ @item.DescArticolo +
+
@item.Tcassegnato.ToString("N3")
+ @item.Tcassegnato.ToString("N3") +
@item.Note@item.DataInizio --> @item.DataFine +
@item.IdxMacchina
+ @item.NumPezzi pz +
+
+ @@ -39,6 +97,11 @@ protected string BaseAddr = ""; protected bool isLoading = false; + protected int NumRecPage = 10; + protected int TotalCount = 0; + protected int PageNum = 1; + + protected List ListComplete { get; set; } = new List(); protected List ListODL { get; set; } = new List(); protected override async Task OnInitializedAsync() @@ -64,13 +127,43 @@ if (!string.IsNullOrEmpty(CodArt)) { string ApiUrl = $"{BaseAddr}api/ODL/GetODL?CodArt={CodArt}&IdxMacchina={IdxMacc}"; - var rawData = await Http.GetFromJsonAsync>(ApiUrl); - if (rawData != null) + try { - ListODL = rawData; + var rawData = await Http.GetFromJsonAsync>(ApiUrl); + if (rawData != null) + { + ListComplete = rawData; + TotalCount = ListComplete.Count; + // esegue paginazione + if (TotalCount > NumRecPage) + { + ListODL = ListComplete.Skip((PageNum - 1) * NumRecPage).Take(NumRecPage).ToList(); + } + else + { + ListODL = ListComplete; + } + } + } + catch (Exception exc) + { + Log.Error($"Error on dataload{Environment.NewLine}{exc}"); } } isLoading = false; } + protected async Task SavePage(int newNum) + { + PageNum = newNum; + await ReloadData(); + } + + protected async Task SaveNumRec(int newNum) + { + NumRecPage = newNum; + await ReloadData(); + } + + private static NLog.Logger Log = LogManager.GetCurrentClassLogger(); } diff --git a/MP.Data/Services/OrderDataSrv.cs b/MP.Data/Services/OrderDataSrv.cs index 89329c48..c52d7043 100644 --- a/MP.Data/Services/OrderDataSrv.cs +++ b/MP.Data/Services/OrderDataSrv.cs @@ -61,7 +61,7 @@ namespace MP.Data.Services /// Cod articolo /// Macchina selezionata /// - public async Task> ListODLFilt(string CodArt, string IdxMacchina) + public async Task> ListODLFilt(string CodArt, string IdxMacchina="*") { // setup parametri costanti bool inCorso = false;