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 1e59e5f2..f24f2bfc 100644
--- a/MP-TAB/MP-TAB.Client/Pages/TCHistory.razor
+++ b/MP-TAB/MP-TAB.Client/Pages/TCHistory.razor
@@ -9,7 +9,6 @@
-
@@ -17,18 +16,43 @@
| TCiclo |
Note |
Periodo |
- Impianto |
+ Impianto |
@if (isLoading)
{
- ...loading...
+ @for (int i = 0; i < NumRecPage; i++)
+ {
+
+ |
+
+
+ |
+
+
+
+ |
+ |
+ |
+
+
+
+ |
+
+ }
}
else
{
- griglia risultati
- @if (ListODL != null && ListODL.Count > 0)
+ @if (ListODL == null || ListODL.Count == 0)
+ {
+
+ |
+ Nessun record trovato
+ |
+
+ }
+ else
{
foreach (var item in ListODL)
{
@@ -38,12 +62,12 @@
@item.DescArticolo
- @item.Tcassegnato
- @item.Tcassegnato
+ @item.Tcassegnato.ToString("N3")
+ @item.Tcassegnato.ToString("N3")
|
@item.Note |
@item.DataInizio --> @item.DataFine |
-
+ |
@item.IdxMacchina
@item.NumPezzi pz
|
@@ -54,8 +78,9 @@
}
-
-
+
+
@@ -72,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()
@@ -102,10 +132,20 @@
var rawData = await Http.GetFromJsonAsync>(ApiUrl);
if (rawData != null)
{
- ListODL = rawData;
+ 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)
+ catch (Exception exc)
{
Log.Error($"Error on dataload{Environment.NewLine}{exc}");
}
@@ -113,5 +153,17 @@
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;