diff --git a/MP.Data/Controllers/MpStatsController.cs b/MP.Data/Controllers/MpStatsController.cs index 029298b6..9f91a030 100644 --- a/MP.Data/Controllers/MpStatsController.cs +++ b/MP.Data/Controllers/MpStatsController.cs @@ -6,6 +6,8 @@ using System.Threading.Tasks; using System.Configuration; using NLog; using Microsoft.Extensions.Configuration; +using Microsoft.EntityFrameworkCore; +using Microsoft.Data.SqlClient; namespace MP.Data.Controllers { @@ -138,18 +140,31 @@ namespace MP.Data.Controllers /// /// Elenco tabella scarti da filtro /// - /// - /// + /// + /// + /// + /// /// - public List StatScartiGetAll(int numRecord, string searchVal = "") + public List StatScartiGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo) { List dbResult = new List(); + //dbResult = dbCtx + // .DbSetScarti + // .Where(x => x.KeyRichiesta.Contains(searchVal) || x.Descrizione.Contains(searchVal) || x.CodArticolo.Contains(searchVal) || string.IsNullOrEmpty(searchVal)) + // .OrderByDescending(x => x.DataOraRif) + // .Take(numRecord) + // .ToList(); + + var dataFrom = new SqlParameter("@dataFrom", DataStart); + var dataTo = new SqlParameter("@dataTo", DataEnd); + var idxMacchina = new SqlParameter("@idxMacchina", IdxMacchina); + var idxODL = new SqlParameter("@IdxODL", IdxODL); + var keyRichiesta = new SqlParameter("@KeyRichiesta", KeyRichiesta); + var codArticolo = new SqlParameter("@CodArticolo", CodArticolo); dbResult = dbCtx .DbSetScarti - .Where(x => x.KeyRichiesta.Contains(searchVal) || x.Descrizione.Contains(searchVal) || x.CodArticolo.Contains(searchVal) || string.IsNullOrEmpty(searchVal)) - .OrderByDescending(x => x.DataOraRif) - .Take(numRecord) + .FromSqlRaw("EXEC stp_UI_RS_GetByFilter @dataFrom,@dataTo,@idxMacchina,@IdxODL,@KeyRichiesta,@CodArticolo", dataFrom, dataTo, idxMacchina, idxODL, keyRichiesta, codArticolo) .ToList(); return dbResult; diff --git a/MP.Stats/Data/MpStatsService.cs b/MP.Stats/Data/MpStatsService.cs index 8bc879e9..619b6e5e 100644 --- a/MP.Stats/Data/MpStatsService.cs +++ b/MP.Stats/Data/MpStatsService.cs @@ -84,9 +84,10 @@ namespace MP.Stats.Data return Task.FromResult(dbController.StatOdlGetAll(numRecord, searchVal).ToArray()); } - public Task StatScartiGetAll(int numRecord, string searchVal = "") + public Task StatScartiGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo, int numRecord, string searchVal = "") { - return Task.FromResult(dbController.StatScartiGetAll(numRecord, searchVal).ToArray()); + // filtra e restituisce SOLO i primi record... + return Task.FromResult(dbController.StatScartiGetAll(DataStart, DataEnd, IdxMacchina, IdxODL, KeyRichiesta, CodArticolo).Take(numRecord).ToArray()); } public Task StatUserLogGetAll(int numRecord, string searchVal = "") diff --git a/MP.Stats/MP.Stats.csproj b/MP.Stats/MP.Stats.csproj index 455c5433..794cdd30 100644 --- a/MP.Stats/MP.Stats.csproj +++ b/MP.Stats/MP.Stats.csproj @@ -25,10 +25,6 @@ - - - - diff --git a/MP.Stats/Pages/Index.razor b/MP.Stats/Pages/Index.razor index f87d3dda..3e38a5bf 100644 --- a/MP.Stats/Pages/Index.razor +++ b/MP.Stats/Pages/Index.razor @@ -26,9 +26,9 @@
Main Topics
- - - + + + @**@ diff --git a/MP.Stats/Pages/ReportODL.razor.cs b/MP.Stats/Pages/ReportODL.razor.cs index f77a086f..c7aade73 100644 --- a/MP.Stats/Pages/ReportODL.razor.cs +++ b/MP.Stats/Pages/ReportODL.razor.cs @@ -77,7 +77,7 @@ namespace MP.Stats.Pages { try { - answ = (currRecord.IdxODL == IdxODL) ? "table-info" : ""; + answ = (currRecord.IdxOdl == IdxODL) ? "table-info" : ""; } catch { } diff --git a/MP.Stats/Pages/Scarti.razor b/MP.Stats/Pages/Scarti.razor index eca78837..d493a385 100644 --- a/MP.Stats/Pages/Scarti.razor +++ b/MP.Stats/Pages/Scarti.razor @@ -4,7 +4,14 @@ @using MP.Stats.Data
-
Scarti
+
+
+
Scarti
+
+ +
+
+
@if (currRecord != null) { diff --git a/MP.Stats/Pages/Scarti.razor.cs b/MP.Stats/Pages/Scarti.razor.cs index a9f103a7..769fc8cb 100644 --- a/MP.Stats/Pages/Scarti.razor.cs +++ b/MP.Stats/Pages/Scarti.razor.cs @@ -18,6 +18,7 @@ namespace MP.Stats.Pages #region Private Properties + private SelectData currFilter { get; set; } private int numRecord { get; set; } = 10; #endregion Private Properties @@ -38,20 +39,36 @@ 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); + } + + #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.StatScartiGetAll(numRecord, MessageService.SearchVal); + await reloadData(); } protected override async Task OnInitializedAsync() { numRecord = 10; + currFilter = new SelectData(); MessageService.ShowSearch = true; MessageService.EA_SearchUpdated += OnSeachUpdated; - ListRecords = await StatService.StatScartiGetAll(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.StatScartiGetAll(numRecord, MessageService.SearchVal); + await reloadData(); } #endregion Protected Methods diff --git a/MP.Stats/Shared/NavMenu.razor b/MP.Stats/Shared/NavMenu.razor index 5b846d8b..71e774ac 100644 --- a/MP.Stats/Shared/NavMenu.razor +++ b/MP.Stats/Shared/NavMenu.razor @@ -14,12 +14,12 @@
  • - Diario ODL + Report ODL
  • - Dettaglio Produzione + Diario Produzione