diff --git a/MP.Data/Controllers/MpStatsController.cs b/MP.Data/Controllers/MpStatsController.cs index 9f91a030..1b697546 100644 --- a/MP.Data/Controllers/MpStatsController.cs +++ b/MP.Data/Controllers/MpStatsController.cs @@ -83,15 +83,27 @@ namespace MP.Data.Controllers /// /// /// - public List StatControlliGetAll(int numRecord, string searchVal = "") + public List StatControlliGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo) { List dbResult = new List(); + //dbResult = dbCtx + // .DbSetControlli + // .Where(x => x.Note.Contains(searchVal) || x.IdxMacchina.Contains(searchVal) || x.CodArticolo.Contains(searchVal) || string.IsNullOrEmpty(searchVal)) + // .OrderByDescending(x => x.DataOra) + // .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 .DbSetControlli - .Where(x => x.Note.Contains(searchVal) || x.IdxMacchina.Contains(searchVal) || x.CodArticolo.Contains(searchVal) || string.IsNullOrEmpty(searchVal)) - .OrderByDescending(x => x.DataOra) - .Take(numRecord) + .FromSqlRaw("EXEC stp_UI_RC_GetByFilter @dataFrom,@dataTo,@idxMacchina,@IdxODL,@KeyRichiesta,@CodArticolo", dataFrom, dataTo, idxMacchina, idxODL, keyRichiesta, codArticolo) .ToList(); return dbResult; @@ -176,15 +188,27 @@ namespace MP.Data.Controllers /// /// /// - public List StatUserLogGetAll(int numRecord, string searchVal = "") + public List StatUserLogGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo) { List dbResult = new List(); + //dbResult = dbCtx + // .DbSetUserLog + // .Where(x => x.Valore.Contains(searchVal) || x.Cognome.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 .DbSetUserLog - .Where(x => x.Valore.Contains(searchVal) || x.Cognome.Contains(searchVal) || x.CodArticolo.Contains(searchVal) || string.IsNullOrEmpty(searchVal)) - .OrderByDescending(x => x.DataOraRif) - .Take(numRecord) + .FromSqlRaw("EXEC stp_UI_UL_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 619b6e5e..35e34fb4 100644 --- a/MP.Stats/Data/MpStatsService.cs +++ b/MP.Stats/Data/MpStatsService.cs @@ -69,9 +69,9 @@ namespace MP.Stats.Data dbController.RollBackEntity(item); } - public Task StatControlliGetAll(int numRecord, string searchVal = "") + public Task StatControlliGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo, int numRecord, string searchVal = "") { - return Task.FromResult(dbController.StatControlliGetAll(numRecord, searchVal).ToArray()); + return Task.FromResult(dbController.StatControlliGetAll(DataStart, DataEnd, IdxMacchina, IdxODL, KeyRichiesta, CodArticolo).Take(numRecord).ToArray()); } public Task StatDdbGetAll(int numRecord, string searchVal = "") @@ -90,9 +90,9 @@ namespace MP.Stats.Data return Task.FromResult(dbController.StatScartiGetAll(DataStart, DataEnd, IdxMacchina, IdxODL, KeyRichiesta, CodArticolo).Take(numRecord).ToArray()); } - public Task StatUserLogGetAll(int numRecord, string searchVal = "") + public Task StatUserLogGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo, int numRecord, string searchVal = "") { - return Task.FromResult(dbController.StatUserLogGetAll(numRecord, searchVal).ToArray()); + return Task.FromResult(dbController.StatUserLogGetAll(DataStart, DataEnd, IdxMacchina, IdxODL, KeyRichiesta, CodArticolo).Take(numRecord).ToArray()); } #endregion Public Methods diff --git a/MP.Stats/Pages/Controlli.razor b/MP.Stats/Pages/Controlli.razor index 0aea2bac..d2296715 100644 --- a/MP.Stats/Pages/Controlli.razor +++ b/MP.Stats/Pages/Controlli.razor @@ -4,7 +4,14 @@ @using MP.Stats.Data
-
Controlli
+
+
+
Controlli
+
+ +
+
+
@if (currRecord != null) { diff --git a/MP.Stats/Pages/Controlli.razor.cs b/MP.Stats/Pages/Controlli.razor.cs index 53842097..d2543dfc 100644 --- a/MP.Stats/Pages/Controlli.razor.cs +++ b/MP.Stats/Pages/Controlli.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,20 +39,34 @@ namespace MP.Stats.Pages #endregion Protected Properties + #region Private Methods + + private async Task reloadData() + { + ListRecords = await StatService.StatControlliGetAll(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.StatControlliGetAll(numRecord, MessageService.SearchVal); + await reloadData(); } protected override async Task OnInitializedAsync() { - numRecord = 10; MessageService.ShowSearch = true; MessageService.EA_SearchUpdated += OnSeachUpdated; - ListRecords = await StatService.StatControlliGetAll(numRecord, MessageService.SearchVal); + await reloadData(); } protected void ResetData() @@ -63,7 +78,7 @@ namespace MP.Stats.Pages protected async Task UpdateData() { currRecord = null; - ListRecords = await StatService.StatControlliGetAll(numRecord, MessageService.SearchVal); + await reloadData(); } #endregion Protected Methods diff --git a/MP.Stats/Pages/Scarti.razor b/MP.Stats/Pages/Scarti.razor index d493a385..e80607d2 100644 --- a/MP.Stats/Pages/Scarti.razor +++ b/MP.Stats/Pages/Scarti.razor @@ -1,7 +1,7 @@ @page "/scarti" @using MP.Stats.Components -@using MP.Stats.Data +@using MP.Stats.Components
diff --git a/MP.Stats/Pages/Scarti.razor.cs b/MP.Stats/Pages/Scarti.razor.cs index 769fc8cb..871d963c 100644 --- a/MP.Stats/Pages/Scarti.razor.cs +++ b/MP.Stats/Pages/Scarti.razor.cs @@ -18,7 +18,7 @@ namespace MP.Stats.Pages #region Private Properties - private SelectData currFilter { get; set; } + private SelectData currFilter { get; set; } = new SelectData(); private int numRecord { get; set; } = 10; #endregion Private Properties @@ -64,8 +64,6 @@ namespace MP.Stats.Pages protected override async Task OnInitializedAsync() { - numRecord = 10; - currFilter = new SelectData(); MessageService.ShowSearch = true; MessageService.EA_SearchUpdated += OnSeachUpdated; await reloadData(); diff --git a/MP.Stats/Pages/UserLog.razor b/MP.Stats/Pages/UserLog.razor index 9e369bda..c24463f1 100644 --- a/MP.Stats/Pages/UserLog.razor +++ b/MP.Stats/Pages/UserLog.razor @@ -4,7 +4,14 @@ @using MP.Stats.Data
-
User Log
+
+
+
User Log
+
+ +
+
+
@if (currRecord != null) { diff --git a/MP.Stats/Pages/UserLog.razor.cs b/MP.Stats/Pages/UserLog.razor.cs index 3c87c098..374c1cfd 100644 --- a/MP.Stats/Pages/UserLog.razor.cs +++ b/MP.Stats/Pages/UserLog.razor.cs @@ -20,6 +20,7 @@ namespace MP.Stats.Pages #region Private Properties + private SelectData currFilter { get; set; } = new SelectData(); private int numRecord { get; set; } = 10; #endregion Private Properties @@ -45,13 +46,19 @@ namespace MP.Stats.Pages private async Task reloadData() { ActionsList = await StatService.ActionsGetAll(); - ListRecords = await StatService.StatUserLogGetAll(numRecord, MessageService.SearchVal); + ListRecords = await StatService.StatUserLogGetAll(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; @@ -60,7 +67,6 @@ namespace MP.Stats.Pages protected override async Task OnInitializedAsync() { - numRecord = 10; MessageService.ShowSearch = true; MessageService.EA_SearchUpdated += OnSeachUpdated; await reloadData();