From 3c674fffbb788775c381740e218977fd43622ef6 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 18 May 2021 19:47:38 +0200 Subject: [PATCH 1/3] Add filtro in report ODL (non connesso) --- MP.Stats/Pages/ReportODL.razor | 10 ++++++++-- MP.Stats/Pages/ReportODL.razor.cs | 23 ++++++++++++++++++++--- 2 files changed, 28 insertions(+), 5 deletions(-) diff --git a/MP.Stats/Pages/ReportODL.razor b/MP.Stats/Pages/ReportODL.razor index 12deece5..0291d66b 100644 --- a/MP.Stats/Pages/ReportODL.razor +++ b/MP.Stats/Pages/ReportODL.razor @@ -1,10 +1,16 @@ @page "/reportodl" @using MP.Stats.Components -@using MP.Stats.Data
-
Report ODL
+
+
+
Report ODL/Comm.
+
+ +
+
+
@if (currRecord != null) { diff --git a/MP.Stats/Pages/ReportODL.razor.cs b/MP.Stats/Pages/ReportODL.razor.cs index c7aade73..6c1ae7d9 100644 --- a/MP.Stats/Pages/ReportODL.razor.cs +++ b/MP.Stats/Pages/ReportODL.razor.cs @@ -18,6 +18,7 @@ namespace MP.Stats.Pages #region Private Properties + private SelectData currFilter { get; set; } = new SelectData(); private int numRecord { get; set; } = 10; #endregion Private Properties @@ -38,12 +39,28 @@ namespace MP.Stats.Pages #endregion Protected Properties + #region Private Methods + + private async Task reloadData() + { + //ListRecords = await StatService.StatScartiGetAll(currFilter.DateStart, currFilter.DateEnd, currFilter.IdxMacchina, currFilter.IdxOdl, currFilter.KeyRichiesta, currFilter.CodArticolo, numRecord, MessageService.SearchVal); + ListRecords = await StatService.StatOdlGetAll(numRecord, MessageService.SearchVal); + } + + #endregion Private Methods + #region Protected Methods + protected async Task DoFilter(SelectData newFilter) + { + currFilter = newFilter; + await reloadData(); + } + protected async Task ForceReload(int newNum) { numRecord = newNum; - ListRecords = await StatService.StatOdlGetAll(numRecord, MessageService.SearchVal); + await reloadData(); } protected override async Task OnInitializedAsync() @@ -51,7 +68,7 @@ namespace MP.Stats.Pages numRecord = 10; MessageService.ShowSearch = true; MessageService.EA_SearchUpdated += OnSeachUpdated; - ListRecords = await StatService.StatOdlGetAll(numRecord, MessageService.SearchVal); + await reloadData(); } protected void ResetData() @@ -63,7 +80,7 @@ namespace MP.Stats.Pages protected async Task UpdateData() { currRecord = null; - ListRecords = await StatService.StatOdlGetAll(numRecord, MessageService.SearchVal); + await reloadData(); } #endregion Protected Methods From 4e43f39ba78180a64bd9ba730ca17371449cefd8 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 18 May 2021 19:47:48 +0200 Subject: [PATCH 2/3] Add filtro in Diario (non connesso) --- MP.Stats/Pages/Diario.razor | 9 ++++++++- MP.Stats/Pages/Diario.razor.cs | 23 ++++++++++++++++++++--- 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/MP.Stats/Pages/Diario.razor b/MP.Stats/Pages/Diario.razor index ad4bf737..6a7e2e55 100644 --- a/MP.Stats/Pages/Diario.razor +++ b/MP.Stats/Pages/Diario.razor @@ -4,7 +4,14 @@ @using MP.Stats.Data
-
Diario Produzione
+
+
+
Diario Produzione
+
+ +
+
+
@if (currRecord != null) { diff --git a/MP.Stats/Pages/Diario.razor.cs b/MP.Stats/Pages/Diario.razor.cs index 4e407d62..5f73ddb3 100644 --- a/MP.Stats/Pages/Diario.razor.cs +++ b/MP.Stats/Pages/Diario.razor.cs @@ -18,6 +18,7 @@ namespace MP.Stats.Pages #region Private Properties + private SelectData currFilter { get; set; } = new SelectData(); private int numRecord { get; set; } = 10; #endregion Private Properties @@ -38,12 +39,28 @@ namespace MP.Stats.Pages #endregion Protected Properties + #region Private Methods + + private async Task reloadData() + { + //ListRecords = await StatService.StatScartiGetAll(currFilter.DateStart, currFilter.DateEnd, currFilter.IdxMacchina, currFilter.IdxOdl, currFilter.KeyRichiesta, currFilter.CodArticolo, numRecord, MessageService.SearchVal); + ListRecords = await StatService.StatDdbGetAll(numRecord, MessageService.SearchVal); + } + + #endregion Private Methods + #region Protected Methods + protected async Task DoFilter(SelectData newFilter) + { + currFilter = newFilter; + await reloadData(); + } + protected async Task ForceReload(int newNum) { numRecord = newNum; - ListRecords = await StatService.StatDdbGetAll(numRecord, MessageService.SearchVal); + await reloadData(); } protected override async Task OnInitializedAsync() @@ -51,7 +68,7 @@ namespace MP.Stats.Pages numRecord = 10; MessageService.ShowSearch = true; MessageService.EA_SearchUpdated += OnSeachUpdated; - ListRecords = await StatService.StatDdbGetAll(numRecord, MessageService.SearchVal); + await reloadData(); } protected void ResetData() @@ -63,7 +80,7 @@ namespace MP.Stats.Pages protected async Task UpdateData() { currRecord = null; - ListRecords = await StatService.StatDdbGetAll(numRecord, MessageService.SearchVal); + await reloadData(); } #endregion Protected Methods From bca047742e45cec701ee312e8c44aad099448ae3 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 18 May 2021 19:47:58 +0200 Subject: [PATCH 3/3] Fix nomi pagine --- MP.Stats/Pages/Controlli.razor | 2 +- MP.Stats/Pages/Scarti.razor | 81 ++++++++++++++++--------------- MP.Stats/Pages/UserLog.razor | 88 +++++++++++++++++----------------- MP.Stats/Shared/NavMenu.razor | 6 +-- 4 files changed, 88 insertions(+), 89 deletions(-) diff --git a/MP.Stats/Pages/Controlli.razor b/MP.Stats/Pages/Controlli.razor index d2296715..e53533e1 100644 --- a/MP.Stats/Pages/Controlli.razor +++ b/MP.Stats/Pages/Controlli.razor @@ -6,7 +6,7 @@
-
Controlli
+
Registro Controlli
diff --git a/MP.Stats/Pages/Scarti.razor b/MP.Stats/Pages/Scarti.razor index e80607d2..343d6c22 100644 --- a/MP.Stats/Pages/Scarti.razor +++ b/MP.Stats/Pages/Scarti.razor @@ -1,12 +1,11 @@ @page "/scarti" -@using MP.Stats.Components @using MP.Stats.Components
-
Scarti
+
Registro Scarti
@@ -15,53 +14,53 @@
@if (currRecord != null) { - @**@ + @**@ } @if (ListRecords == null) { -
+
} else { - - - - - - - - - - - - - - @foreach (var record in ListRecords) +
MacchinaDataODL/CommessaArticoloDescrizioneQtaOperatore
+ + + + + + + + + + + + + @foreach (var record in ListRecords) { - - - - - - - - - + + + + + + + + + } - -
MacchinaDataODL/CommessaArticoloDescrizioneQtaOperatore
-
@record.CodMacchina
-
@record.IdxMacchina
- 		-
@record.DataOraRif.ToString("yyyy.MM.dd")
-
@record.DataOraRif.ToString("ddd HH:mm.ss")
- 		@record.IdxOdl | @record.KeyRichiesta@record.CodArticolo -
-
[@record.Causale]
-
@record.Descrizione
-
-
@record.Note
- 		@record.Qta@record.Cognome @record.Nome (@record.MatrOpr)
+
@record.CodMacchina
+
@record.IdxMacchina
+ 		+
@record.DataOraRif.ToString("yyyy.MM.dd")
+
@record.DataOraRif.ToString("ddd HH:mm.ss")
+ 		@record.IdxOdl | @record.KeyRichiesta@record.CodArticolo +
+
[@record.Causale]
+
@record.Descrizione
+
+
@record.Note
+ 		@record.Qta@record.Cognome @record.Nome (@record.MatrOpr)
+ + }
diff --git a/MP.Stats/Pages/UserLog.razor b/MP.Stats/Pages/UserLog.razor index c24463f1..5d061d1d 100644 --- a/MP.Stats/Pages/UserLog.razor +++ b/MP.Stats/Pages/UserLog.razor @@ -6,7 +6,7 @@
-
User Log
+
User ActionLog
@@ -15,57 +15,57 @@
@if (currRecord != null) { - @**@ + @**@ } @if (ListRecords == null) { -
+
} else { - - - - - - - - - - - - - - @foreach (var record in ListRecords) +
MacchinaDataODL/CommessaArticoloDescrizioneQtaOperatore
+ + + + + + + + + + + + + @foreach (var record in ListRecords) { - - - - - - - - - + + + + + + + + + } - -
MacchinaDataODL/CommessaArticoloDescrizioneQtaOperatore
-
@record.CodMacchina
-
@record.IdxMacchina
- 		-
@record.DataOraRif.ToString("yyyy.MM.dd")
-
@record.DataOraRif.ToString("ddd HH:mm.ss")
- 		@record.IdxOdl | @record.KeyRichiesta@record.CodArticolo -
@record.Valore
-
-
- [@record.IdxLog] -
-
- @decodeAction(@record.Azione).Descrizione -
-
- 		@record.Qta.ToString("N0")@record.Cognome @record.Nome (@record.MatrOpr)
+
@record.CodMacchina
+
@record.IdxMacchina
+ 		+
@record.DataOraRif.ToString("yyyy.MM.dd")
+
@record.DataOraRif.ToString("ddd HH:mm.ss")
+ 		@record.IdxOdl | @record.KeyRichiesta@record.CodArticolo +
@record.Valore
+
+
+ [@record.IdxLog] +
+
+ @decodeAction(@record.Azione).Descrizione +
+
+ 		@record.Qta.ToString("N0")@record.Cognome @record.Nome (@record.MatrOpr)
+ + }
diff --git a/MP.Stats/Shared/NavMenu.razor b/MP.Stats/Shared/NavMenu.razor index 71e774ac..2ebff8ca 100644 --- a/MP.Stats/Shared/NavMenu.razor +++ b/MP.Stats/Shared/NavMenu.razor @@ -14,7 +14,7 @@
  • - Report ODL + Report ODL/Comm.
  • @@ -29,12 +29,12 @@
  • - Controlli + Registro Controlli
  • - Scarti + Registro Scarti
    • @*