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

Merge branch 'feature/AddFilterOnDDB' into develop

Browse Source
This commit is contained in:
Samuele Locatelli
2021-05-18 19:48:09 +02:00
parent 546a58750d bca047742e
commit 8a980ead25
8 changed files with 144 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP.Stats/Pages/Controlli.razor
+1 -1
View File
@@ -6,7 +6,7 @@
<div class="card">
<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-2 h2">Registro Controlli</div>
<div class="col-6 col-lg-10">
<SelectionFilter SelFilter="currFilter" filterChanged="DoFilter"></SelectionFilter>
</div>
MP.Stats/Pages/Diario.razor
+8 -1
View File
@@ -4,7 +4,14 @@
@using MP.Stats.Data
<div class="card">
<div class="card-header table-primary h1">Diario Produzione</div>
<div class="card-header table-primary">
<div class="row">
<div class="col-6 col-lg-2 h2">Diario Produzione</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/Diario.razor.cs
+20 -3
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,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
MP.Stats/Pages/ReportODL.razor
+8 -2
View File
@@ -1,10 +1,16 @@
@page "/reportodl"
@using MP.Stats.Components
@using MP.Stats.Data
<div class="card">
<div class="card-header table-primary h1">Report ODL</div>
<div class="card-header table-primary">
<div class="row">
<div class="col-6 col-lg-2 h2">Report ODL/Comm.</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/ReportODL.razor.cs
+20 -3
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,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
MP.Stats/Pages/Scarti.razor
+40 -41
View File
@@ -1,12 +1,11 @@
@page "/scarti"
@using MP.Stats.Components
@using MP.Stats.Components
<div class="card">
<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-2 h2">Registro Scarti</div>
<div class="col-6 col-lg-10">
<SelectionFilter SelFilter="currFilter" filterChanged="DoFilter"></SelectionFilter>
</div>
@@ -15,53 +14,53 @@
<div class="card-body">
@if (currRecord != null)
{
@*<BasketEditor Basket="@currBasket" DataReset="ResetData" DataUpdated="UpdateData"></BasketEditor>*@
@*<BasketEditor Basket="@currBasket" DataReset="ResetData" DataUpdated="UpdateData"></BasketEditor>*@
}
@if (ListRecords == null)
{
<div class="progress-bar progress-bar-striped progress-bar-animated" style="width:70%"></div>
<div class="progress-bar progress-bar-striped progress-bar-animated" style="width:70%"></div>
}
else
{
<table class="table table-sm table-striped">
<thead>
<tr>
<th>Macchina</th>
<th>Data</th>
<th>ODL/Commessa</th>
<th>Articolo</th>
<th class="text-right">Descrizione</th>
<th class="text-right">Qta</th>
<th class="text-right">Operatore</th>
</tr>
</thead>
<tbody>
@foreach (var record in ListRecords)
<table class="table table-sm table-striped">
<thead>
<tr>
<th>Macchina</th>
<th>Data</th>
<th>ODL/Commessa</th>
<th>Articolo</th>
<th class="text-right">Descrizione</th>
<th class="text-right">Qta</th>
<th class="text-right">Operatore</th>
</tr>
</thead>
<tbody>
@foreach (var record in ListRecords)
{
<tr class="@checkSelect(@record.DataOraRif, @record.IdxMacchina, @record.Causale)">
<td>
<div>@record.CodMacchina</div>
<div class="small">@record.IdxMacchina</div>
</td>
<td>
<div>@record.DataOraRif.ToString("yyyy.MM.dd")</div>
<div class="small">@record.DataOraRif.ToString("ddd HH:mm.ss")</div>
</td>
<td>@record.IdxOdl | @record.KeyRichiesta</td>
<td>@record.CodArticolo</td>
<td class="text-right">
<div class="row">
<div class="col">[@record.Causale]</div>
<div class="col text-right">@record.Descrizione</div>
</div>
<div class="small">@record.Note</div>
</td>
<td class="text-right">@record.Qta</td>
<td class="text-right">@record.Cognome @record.Nome (@record.MatrOpr)</td>
</tr>
<tr class="@checkSelect(@record.DataOraRif, @record.IdxMacchina, @record.Causale)">
<td>
<div>@record.CodMacchina</div>
<div class="small">@record.IdxMacchina</div>
</td>
<td>
<div>@record.DataOraRif.ToString("yyyy.MM.dd")</div>
<div class="small">@record.DataOraRif.ToString("ddd HH:mm.ss")</div>
</td>
<td>@record.IdxOdl | @record.KeyRichiesta</td>
<td>@record.CodArticolo</td>
<td class="text-right">
<div class="row">
<div class="col">[@record.Causale]</div>
<div class="col text-right">@record.Descrizione</div>
</div>
<div class="small">@record.Note</div>
</td>
<td class="text-right">@record.Qta</td>
<td class="text-right">@record.Cognome @record.Nome (@record.MatrOpr)</td>
</tr>
}
</tbody>
</table>
</tbody>
</table>
}
</div>
<div class="card-footer py-1">
MP.Stats/Pages/UserLog.razor
+44 -44
View File
@@ -6,7 +6,7 @@
<div class="card">
<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-2 h2">User ActionLog</div>
<div class="col-6 col-lg-10">
<SelectionFilter SelFilter="currFilter" filterChanged="DoFilter"></SelectionFilter>
</div>
@@ -15,57 +15,57 @@
<div class="card-body">
@if (currRecord != null)
{
@*<BasketEditor Basket="@currBasket" DataReset="ResetData" DataUpdated="UpdateData"></BasketEditor>*@
@*<BasketEditor Basket="@currBasket" DataReset="ResetData" DataUpdated="UpdateData"></BasketEditor>*@
}
@if (ListRecords == null)
{
<div class="progress-bar progress-bar-striped progress-bar-animated" style="width:70%"></div>
<div class="progress-bar progress-bar-striped progress-bar-animated" style="width:70%"></div>
}
else
{
<table class="table table-sm table-striped">
<thead>
<tr>
<th>Macchina</th>
<th>Data</th>
<th>ODL/Commessa</th>
<th>Articolo</th>
<th class="text-right">Descrizione</th>
<th class="text-right">Qta</th>
<th class="text-right">Operatore</th>
</tr>
</thead>
<tbody>
@foreach (var record in ListRecords)
<table class="table table-sm table-striped">
<thead>
<tr>
<th>Macchina</th>
<th>Data</th>
<th>ODL/Commessa</th>
<th>Articolo</th>
<th class="text-right">Descrizione</th>
<th class="text-right">Qta</th>
<th class="text-right">Operatore</th>
</tr>
</thead>
<tbody>
@foreach (var record in ListRecords)
{
<tr class="@checkSelect(@record.IdxLog)">
<td>
<div>@record.CodMacchina</div>
<div class="small">@record.IdxMacchina</div>
</td>
<td>
<div>@record.DataOraRif.ToString("yyyy.MM.dd")</div>
<div class="small">@record.DataOraRif.ToString("ddd HH:mm.ss")</div>
</td>
<td>@record.IdxOdl | @record.KeyRichiesta</td>
<td>@record.CodArticolo</td>
<td class="text-right">
<div>@record.Valore</div>
<div class="small row">
<div class="col">
<span class="@decodeAction(@record.Azione).Class" aria-hidden="true"></span> [@record.IdxLog]
</div>
<div class="col text-right">
@decodeAction(@record.Azione).Descrizione
</div>
</div>
</td>
<td class="text-right">@record.Qta.ToString("N0")</td>
<td class="text-right">@record.Cognome @record.Nome (@record.MatrOpr)</td>
</tr>
<tr class="@checkSelect(@record.IdxLog)">
<td>
<div>@record.CodMacchina</div>
<div class="small">@record.IdxMacchina</div>
</td>
<td>
<div>@record.DataOraRif.ToString("yyyy.MM.dd")</div>
<div class="small">@record.DataOraRif.ToString("ddd HH:mm.ss")</div>
</td>
<td>@record.IdxOdl | @record.KeyRichiesta</td>
<td>@record.CodArticolo</td>
<td class="text-right">
<div>@record.Valore</div>
<div class="small row">
<div class="col">
<span class="@decodeAction(@record.Azione).Class" aria-hidden="true"></span> [@record.IdxLog]
</div>
<div class="col text-right">
@decodeAction(@record.Azione).Descrizione
</div>
</div>
</td>
<td class="text-right">@record.Qta.ToString("N0")</td>
<td class="text-right">@record.Cognome @record.Nome (@record.MatrOpr)</td>
</tr>
}
</tbody>
</table>
</tbody>
</table>
}
</div>
<div class="card-footer py-1">
MP.Stats/Shared/NavMenu.razor
+3 -3
View File
@@ -14,7 +14,7 @@
</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> Report ODL
<span class="oi oi-book" aria-hidden="true" title="Dati di Produzione ODL"></span> Report ODL/Comm.
</NavLink>
</li>
<li class="nav-item px-3">
@@ -29,12 +29,12 @@
</li>
<li class="nav-item px-3">
<NavLink class="nav-link" href="controlli">
<span class="oi oi-beaker" aria-hidden="true" title="Registro Controlli"></span> Controlli
<span class="oi oi-beaker" aria-hidden="true" title="Registro Controlli"></span> Registro Controlli
</NavLink>
</li>
<li class="nav-item px-3">
<NavLink class="nav-link" href="scarti">
<span class="oi oi-warning" aria-hidden="true" title="Registro Scarti"></span> Scarti
<span class="oi oi-warning" aria-hidden="true" title="Registro Scarti"></span> Registro Scarti
</NavLink>
</li>
@*<li class="nav-item px-3">