Egalware/mapo-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/InsertSearch' into develop

Browse Source
This commit is contained in:
Samuele Locatelli
2021-05-18 19:02:27 +02:00
parent 1649cdd55e f84b42e101
commit 14a807e444
8 changed files with 81 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP.Data/Controllers/MpStatsController.cs
+32 -8
View File
@@ -83,15 +83,27 @@ namespace MP.Data.Controllers
/// <param name="numRecord"></param>
/// <param name="searchVal"></param>
/// <returns></returns>
public List<DatabaseModels.ResControlli> StatControlliGetAll(int numRecord, string searchVal = "")
public List<DatabaseModels.ResControlli> StatControlliGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo)
{
List<DatabaseModels.ResControlli> dbResult = new List<DatabaseModels.ResControlli>();
//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
/// <param name="numRecord"></param>
/// <param name="searchVal"></param>
/// <returns></returns>
public List<DatabaseModels.UserActionLog> StatUserLogGetAll(int numRecord, string searchVal = "")
public List<DatabaseModels.UserActionLog> StatUserLogGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo)
{
List<DatabaseModels.UserActionLog> dbResult = new List<DatabaseModels.UserActionLog>();
//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;
MP.Stats/Data/MpStatsService.cs
+4 -4
View File
@@ -69,9 +69,9 @@ namespace MP.Stats.Data
dbController.RollBackEntity(item);
}
public Task<MP.Data.DatabaseModels.ResControlli[]> StatControlliGetAll(int numRecord, string searchVal = "")
public Task<MP.Data.DatabaseModels.ResControlli[]> 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<MP.Data.DatabaseModels.DdbTurni[]> 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<MP.Data.DatabaseModels.UserActionLog[]> StatUserLogGetAll(int numRecord, string searchVal = "")
public Task<MP.Data.DatabaseModels.UserActionLog[]> 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
MP.Stats/Pages/Controlli.razor
+8 -1
View File
@@ -4,7 +4,14 @@
@using MP.Stats.Data
<div class="card">
<div class="card-header table-primary h1">Controlli</div>
<div class="card-header table-primary">
<div class="row">
<div class="col-6 col-lg-2 h1">Controlli</div>
<div class="col-6 col-lg-10">
<SelectionFilter SelFilter="currFilter" filterChanged="DoFilter"></SelectionFilter>
</div>
</div>
</div>
<div class="card-body">
@if (currRecord != null)
{
MP.Stats/Pages/Controlli.razor.cs
+19 -4
View File
@@ -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
MP.Stats/Pages/Scarti.razor
+1 -1
View File
@@ -1,7 +1,7 @@
@page "/scarti"
@using MP.Stats.Components
@using MP.Stats.Data
@using MP.Stats.Components
<div class="card">
<div class="card-header table-primary">
MP.Stats/Pages/Scarti.razor.cs
+1 -3
View File
@@ -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();
MP.Stats/Pages/UserLog.razor
+8 -1
View File
@@ -4,7 +4,14 @@
@using MP.Stats.Data
<div class="card">
<div class="card-header table-primary h1">User Log</div>
<div class="card-header table-primary">
<div class="row">
<div class="col-6 col-lg-2 h1">User Log</div>
<div class="col-6 col-lg-10">
<SelectionFilter SelFilter="currFilter" filterChanged="DoFilter"></SelectionFilter>
</div>
</div>
</div>
<div class="card-body">
@if (currRecord != null)
{
MP.Stats/Pages/UserLog.razor.cs
+8 -2
View File
@@ -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();