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

Update pagina scarti con filtro

Browse Source
This commit is contained in:
Samuele Locatelli
2021-05-18 18:06:04 +02:00
parent b344b1fd0d
commit bac6441fed
8 changed files with 58 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP.Data/Controllers/MpStatsController.cs
+21 -6
View File
@@ -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
/// <summary>
/// Elenco tabella scarti da filtro
/// </summary>
/// <param name="numRecord"></param>
/// <param name="searchVal"></param>
/// <param name="DataStart"></param>
/// <param name="DataEnd"></param>
/// <param name="IdxMacchina"></param>
/// <param name="DataEnd"></param>
/// <returns></returns>
public List<DatabaseModels.ResScarti> StatScartiGetAll(int numRecord, string searchVal = "")
public List<DatabaseModels.ResScarti> StatScartiGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo)
{
List<DatabaseModels.ResScarti> dbResult = new List<DatabaseModels.ResScarti>();
//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;
MP.Stats/Data/MpStatsService.cs
+3 -2
View File
@@ -84,9 +84,10 @@ namespace MP.Stats.Data
return Task.FromResult(dbController.StatOdlGetAll(numRecord, searchVal).ToArray());
}
public Task<MP.Data.DatabaseModels.ResScarti[]> StatScartiGetAll(int numRecord, string searchVal = "")
public Task<MP.Data.DatabaseModels.ResScarti[]> 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<MP.Data.DatabaseModels.UserActionLog[]> StatUserLogGetAll(int numRecord, string searchVal = "")
MP.Stats/MP.Stats.csproj
-4
View File
@@ -25,10 +25,6 @@
<ProjectReference Include="..\MP.Data\MP.Data.csproj" />
</ItemGroup>
<ItemGroup>
<Folder Include="Components\" />
</ItemGroup>
<ItemGroup>
<None Include="compilerconfig.json" />
</ItemGroup>
MP.Stats/Pages/Index.razor
+3 -3
View File
@@ -26,9 +26,9 @@
<div class="card">
<div class="card-header table-primary h1">Main Topics</div>
<div class="card-body">
<HomeButton NavLink="reportodl" Icon="oi oi-book" Descript="ODL" />
<HomeButton NavLink="produzione" Icon="oi oi-book" Descript="Produzione" />
<HomeButton NavLink="userlog" Icon="oi oi-document" Descript="User Log" />
<HomeButton NavLink="reportodl" Icon="oi oi-book" Descript="Report ODL" />
<HomeButton NavLink="produzione" Icon="oi oi-clipboard" Descript="Diario Produzione" />
<HomeButton NavLink="userlog" Icon="oi oi-document" Descript="User ActionLog" />
<HomeButton NavLink="controlli" Icon="oi oi-beaker" Descript="Controlli" />
<HomeButton NavLink="scarti" Icon="oi oi-warning" Descript="Scarti" />
@*<HomeButton NavLink="resources" Icon="oi oi-puzzle-piece" Descript="Risorse" />*@
MP.Stats/Pages/ReportODL.razor.cs
+1 -1
View File
@@ -77,7 +77,7 @@ namespace MP.Stats.Pages
{
try
{
answ = (currRecord.IdxODL == IdxODL) ? "table-info" : "";
answ = (currRecord.IdxOdl == IdxODL) ? "table-info" : "";
}
catch
{ }
MP.Stats/Pages/Scarti.razor
+8 -1
View File
@@ -4,7 +4,14 @@
@using MP.Stats.Data
<div class="card">
<div class="card-header table-primary h1">Scarti</div>
<div class="card-header table-primary">
<div class="row">
<div class="col-6 col-lg-2 h1">Scarti</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/Scarti.razor.cs
+20 -3
View File
@@ -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
MP.Stats/Shared/NavMenu.razor
+2 -2
View File
@@ -14,12 +14,12 @@
</li>
<li class="nav-item px-3">
<NavLink class="nav-link" href="ReportODL">
<span class="oi oi-book" aria-hidden="true" title="Dati di Produzione ODL"></span> Diario ODL
<span class="oi oi-book" aria-hidden="true" title="Dati di Produzione ODL"></span> Report ODL
</NavLink>
</li>
<li class="nav-item px-3">
<NavLink class="nav-link" href="diario">
<span class="oi oi-book" aria-hidden="true" title="Dettaglio dati di Produzione"></span> Dettaglio Produzione
<span class="oi oi-clipboard" aria-hidden="true" title="Dettaglio dati di Produzione"></span> Diario Produzione
</NavLink>
</li>
<li class="nav-item px-3">