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

Completato review iniziale Scarti

Browse Source
This commit is contained in:
Samuele Locatelli
2021-05-17 15:42:25 +02:00
parent 2444dd49c8
commit 8f905c496c
5 changed files with 27 additions and 1439 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP.Data/Controllers/MpStatsController.cs
+1 -1
View File
@@ -73,7 +73,7 @@ namespace MP.Data.Controllers
dbResult = dbCtx
.DbSetScarti
.Where(x => x.KeyRichiesta.Contains(searchVal) || x.Descrizione.Contains(searchVal) || x.CodArticolo.Contains(searchVal) || string.IsNullOrEmpty(searchVal))
.OrderByDescending(x => x.DataOra)
.OrderByDescending(x => x.DataOraRif)
.Take(numRecord)
.ToList();
MP.Data/DatabaseModels/ResScarti.cs
+4 -2
View File
@@ -11,13 +11,15 @@ namespace MP.Data.DatabaseModels
public string Causale { get; set; }
public string CodArticolo { get; set; }
public DateTime DataOra { get; set; }
public DateTime? DataOraProdRec { get; set; }
public string CodMacchina { get; set; }
public string Cognome { get; set; }
public DateTime DataOraRif { get; set; }
public string Descrizione { get; set; }
public string IdxMacchina { get; set; }
public int IdxOdl { get; set; }
public string KeyRichiesta { get; set; }
public int MatrOpr { get; set; }
public string Nome { get; set; }
public string Note { get; set; }
public int Qta { get; set; }
MP.Data/MoonPro_STATSContext.cs
+2 -1425
View File
File diff suppressed because it is too large Load Diff
MP.Stats/Pages/Scarti.razor
+18 -9
View File
@@ -24,23 +24,32 @@
<th>Data</th>
<th>ODL/Commessa</th>
<th>Articolo</th>
<th>Descrizione</th>
<th>Qta</th>
<th>Operatore</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.DataOra, @record.IdxMacchina, @record.Causale)">
<tr class="@checkSelect(@record.DataOraRif, @record.IdxMacchina, @record.Causale)">
@*<td><button class="btn btn-sm btn-info" @onclick="() => Edit(record)"><span class="oi oi-pencil"></span></button>&nbsp;<button class="btn btn-sm btn-success" @onclick="() => ShowDocs(record)" title="Vai ai documenti"><span class="oi oi-document"></span></button></td>*@
<td>@record.IdxMacchina</td>
<td>@record.DataOra</td>
<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>@record.Descrizione</td>
<td>@record.CodArticolo</td>
<td>@record.MatrOpr</td>
<td class="text-right">
<div>[@record.Causale] @record.Descrizione</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>
MP.Stats/Pages/Scarti.razor.cs
+2 -2
View File
@@ -70,14 +70,14 @@ namespace MP.Stats.Pages
#region Public Methods
public string checkSelect(DateTime DataOra, string IdxMacchina, string Causale)
public string checkSelect(DateTime DataOraRif, string IdxMacchina, string Causale)
{
string answ = "";
if (currRecord != null)
{
try
{
answ = (currRecord.DataOra == DataOra && currRecord.IdxMacchina == IdxMacchina && currRecord.Causale == Causale) ? "table-info" : "";
answ = (currRecord.DataOraRif == DataOraRif && currRecord.IdxMacchina == IdxMacchina && currRecord.Causale == Causale) ? "table-info" : "";
}
catch
{ }