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

Bozza pagine completata

Browse Source
This commit is contained in:
Samuele Locatelli
2021-05-17 15:05:40 +02:00
parent 21303b50a5
commit d3b5811cdc
9 changed files with 89 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP.Stats/Data/MpStatsService.cs
+13 -3
View File
@@ -59,12 +59,22 @@ namespace MP.Stats.Data
public void rollBackEdit(object item)
{
dbController.rollBackEntity(item);
dbController.RollBackEntity(item);
}
public Task<MP.Data.DatabaseModels.ResScarti[]> ScartiGetAll(int numRecord, string searchVal = "")
public Task<MP.Data.DatabaseModels.ResControlli[]> StatControlliGetAll(int numRecord, string searchVal = "")
{
return Task.FromResult(dbController.ScartiGetAll(numRecord, searchVal).ToArray());
return Task.FromResult(dbController.StatControlliGetAll(numRecord, searchVal).ToArray());
}
public Task<MP.Data.DatabaseModels.ResScarti[]> StatScartiGetAll(int numRecord, string searchVal = "")
{
return Task.FromResult(dbController.StatScartiGetAll(numRecord, searchVal).ToArray());
}
public Task<MP.Data.DatabaseModels.UserActionLog[]> StatUserLogGetAll(int numRecord, string searchVal = "")
{
return Task.FromResult(dbController.StatUserLogGetAll(numRecord, searchVal).ToArray());
}
#endregion Public Methods
MP.Stats/Pages/Controlli.razor
+7 -7
View File
@@ -4,7 +4,7 @@
@using MP.Stats.Data
<div class="card">
<div class="card-header table-primary h1">Scarti</div>
<div class="card-header table-primary h1">Controlli</div>
<div class="card-body">
@if (currRecord != null)
{
@@ -24,22 +24,22 @@
<th>Data</th>
<th>ODL/Commessa</th>
<th>Articolo</th>
<th>Descrizione</th>
<th>Qta</th>
<th>Esito</th>
<th>Note</th>
<th>Operatore</th>
</tr>
</thead>
<tbody>
@foreach (var record in ListRecords)
{
<tr class="@checkSelect(@record.DataOra, @record.IdxMacchina, @record.Causale)">
<tr class="@checkSelect(@record.IdxControllo)">
@*<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>@record.IdxOdl | @record.KeyRichiesta</td>
<td>@record.CodArticolo</td>
<td>@record.Descrizione</td>
<td>@record.IdxOdl</td>
<td>@record.CodArticolo</td>
<td>@record.EsitoOk</td>
<td>@record.Note</td>
<td>@record.MatrOpr</td>
</tr>
}
MP.Stats/Pages/Controlli.razor.cs
+7 -50
View File
@@ -10,9 +10,9 @@ namespace MP.Stats.Pages
{
#region Private Fields
private MP.Data.DatabaseModels.ResScarti currRecord = null;
private MP.Data.DatabaseModels.ResControlli currRecord = null;
private MP.Data.DatabaseModels.ResScarti[] ListRecords;
private MP.Data.DatabaseModels.ResControlli[] ListRecords;
#endregion Private Fields
@@ -43,7 +43,7 @@ namespace MP.Stats.Pages
protected async Task ForceReload(int newNum)
{
numRecord = newNum;
ListRecords = await StatService.ScartiGetAll(numRecord, MessageService.SearchVal);
ListRecords = await StatService.StatControlliGetAll(numRecord, MessageService.SearchVal);
}
protected override async Task OnInitializedAsync()
@@ -51,7 +51,7 @@ namespace MP.Stats.Pages
numRecord = 10;
MessageService.ShowSearch = true;
MessageService.EA_SearchUpdated += OnSeachUpdated;
ListRecords = await StatService.ScartiGetAll(numRecord, MessageService.SearchVal);
ListRecords = await StatService.StatControlliGetAll(numRecord, MessageService.SearchVal);
}
protected void ResetData()
@@ -63,21 +63,21 @@ namespace MP.Stats.Pages
protected async Task UpdateData()
{
currRecord = null;
ListRecords = await StatService.ScartiGetAll(numRecord, MessageService.SearchVal);
ListRecords = await StatService.StatControlliGetAll(numRecord, MessageService.SearchVal);
}
#endregion Protected Methods
#region Public Methods
public string checkSelect(DateTime DataOra, string IdxMacchina, string Causale)
public string checkSelect(int IdxControllo)
{
string answ = "";
if (currRecord != null)
{
try
{
answ = (currRecord.DataOra == DataOra && currRecord.IdxMacchina == IdxMacchina && currRecord.Causale == Causale) ? "table-info" : "";
answ = (currRecord.IdxControllo == IdxControllo) ? "table-info" : "";
}
catch
{ }
@@ -100,48 +100,5 @@ namespace MP.Stats.Pages
}
#endregion Public Methods
#if false
[Inject]
protected BBM_SelectData SelectData { get; set; }
protected void CreateNew()
{
// recupero counter
string newCode = BBMService.CounterGetNext("EGW.B", 6);
DatabaseModels.BasketsModel newRecord = new DatabaseModels.BasketsModel()
{
CodBasket = newCode,
DataIns = DateTime.Now,
CustomerId = 1,
Descript = "New Basket"
};
currBasket = newRecord;
}
protected async Task Delete(SHERPA.BBM.DatabaseModels.BasketsModel currRecord)
{
if (!await JSRuntime.InvokeAsync<bool>("confirm", $"Sicuro di voler eliminare il Basket '{currRecord.CodBasket}'?"))
return;
BBMService.BasketsDelete(currRecord);
await UpdateData();
}
protected void Edit(SHERPA.BBM.DatabaseModels.BasketsModel currRecord)
{
currBasket = currRecord;
}
protected void ShowDocs(SHERPA.BBM.DatabaseModels.BasketsModel currRecord)
{
// salvo
SelectData.BasketId = currRecord.BasketId;
SelectData.NegotiationId = 0;
// rimando...
NavManager.NavigateTo("docs");
}
#endif
}
}
MP.Stats/Pages/Index.razor
+1 -1
View File
@@ -27,7 +27,7 @@
<div class="card-header table-primary h1">Main Topics</div>
<div class="card-body">
<HomeButton NavLink="produzione" Icon="oi oi-book" Descript="Produzione" />
<HomeButton NavLink="diario" Icon="oi oi-document" Descript="User Log" />
<HomeButton NavLink="userlog" Icon="oi oi-document" Descript="User Log" />
<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/Scarti.razor.cs
+3 -46
View File
@@ -43,7 +43,7 @@ namespace MP.Stats.Pages
protected async Task ForceReload(int newNum)
{
numRecord = newNum;
ListRecords = await StatService.ScartiGetAll(numRecord, MessageService.SearchVal);
ListRecords = await StatService.StatScartiGetAll(numRecord, MessageService.SearchVal);
}
protected override async Task OnInitializedAsync()
@@ -51,7 +51,7 @@ namespace MP.Stats.Pages
numRecord = 10;
MessageService.ShowSearch = true;
MessageService.EA_SearchUpdated += OnSeachUpdated;
ListRecords = await StatService.ScartiGetAll(numRecord, MessageService.SearchVal);
ListRecords = await StatService.StatScartiGetAll(numRecord, MessageService.SearchVal);
}
protected void ResetData()
@@ -63,7 +63,7 @@ namespace MP.Stats.Pages
protected async Task UpdateData()
{
currRecord = null;
ListRecords = await StatService.ScartiGetAll(numRecord, MessageService.SearchVal);
ListRecords = await StatService.StatScartiGetAll(numRecord, MessageService.SearchVal);
}
#endregion Protected Methods
@@ -100,48 +100,5 @@ namespace MP.Stats.Pages
}
#endregion Public Methods
#if false
[Inject]
protected BBM_SelectData SelectData { get; set; }
protected void CreateNew()
{
// recupero counter
string newCode = BBMService.CounterGetNext("EGW.B", 6);
DatabaseModels.BasketsModel newRecord = new DatabaseModels.BasketsModel()
{
CodBasket = newCode,
DataIns = DateTime.Now,
CustomerId = 1,
Descript = "New Basket"
};
currBasket = newRecord;
}
protected async Task Delete(SHERPA.BBM.DatabaseModels.BasketsModel currRecord)
{
if (!await JSRuntime.InvokeAsync<bool>("confirm", $"Sicuro di voler eliminare il Basket '{currRecord.CodBasket}'?"))
return;
BBMService.BasketsDelete(currRecord);
await UpdateData();
}
protected void Edit(SHERPA.BBM.DatabaseModels.BasketsModel currRecord)
{
currBasket = currRecord;
}
protected void ShowDocs(SHERPA.BBM.DatabaseModels.BasketsModel currRecord)
{
// salvo
SelectData.BasketId = currRecord.BasketId;
SelectData.NegotiationId = 0;
// rimando...
NavManager.NavigateTo("docs");
}
#endif
}
}
MP.Stats/Pages/UserLog.razor
+8 -8
View File
@@ -4,7 +4,7 @@
@using MP.Stats.Data
<div class="card">
<div class="card-header table-primary h1">Scarti</div>
<div class="card-header table-primary h1">User Log</div>
<div class="card-body">
@if (currRecord != null)
{
@@ -24,23 +24,23 @@
<th>Data</th>
<th>ODL/Commessa</th>
<th>Articolo</th>
<th>Azione</th>
<th>Descrizione</th>
<th>Qta</th>
<th>Operatore</th>
</tr>
</thead>
<tbody>
@foreach (var record in ListRecords)
{
<tr class="@checkSelect(@record.DataOra, @record.IdxMacchina, @record.Causale)">
<tr class="@checkSelect(@record.IdxLog)">
@*<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>@record.IdxOdl | @record.KeyRichiesta</td>
<td>@record.DataOraRif</td>
<td>-</td>
<td>@record.CodArticolo</td>
<td>@record.Descrizione</td>
<td>@record.CodArticolo</td>
<td>@record.MatrOpr</td>
<td>@record.Azione</td>
<td>@record.Valore</td>
<td>@record.Cognome @record.Nome</td>
</tr>
}
</tbody>
MP.Stats/Pages/UserLog.razor.cs
+7 -50
View File
@@ -10,9 +10,9 @@ namespace MP.Stats.Pages
{
#region Private Fields
private MP.Data.DatabaseModels.ResScarti currRecord = null;
private MP.Data.DatabaseModels.UserActionLog currRecord = null;
private MP.Data.DatabaseModels.ResScarti[] ListRecords;
private MP.Data.DatabaseModels.UserActionLog[] ListRecords;
#endregion Private Fields
@@ -43,7 +43,7 @@ namespace MP.Stats.Pages
protected async Task ForceReload(int newNum)
{
numRecord = newNum;
ListRecords = await StatService.ScartiGetAll(numRecord, MessageService.SearchVal);
ListRecords = await StatService.StatUserLogGetAll(numRecord, MessageService.SearchVal);
}
protected override async Task OnInitializedAsync()
@@ -51,7 +51,7 @@ namespace MP.Stats.Pages
numRecord = 10;
MessageService.ShowSearch = true;
MessageService.EA_SearchUpdated += OnSeachUpdated;
ListRecords = await StatService.ScartiGetAll(numRecord, MessageService.SearchVal);
ListRecords = await StatService.StatUserLogGetAll(numRecord, MessageService.SearchVal);
}
protected void ResetData()
@@ -63,21 +63,21 @@ namespace MP.Stats.Pages
protected async Task UpdateData()
{
currRecord = null;
ListRecords = await StatService.ScartiGetAll(numRecord, MessageService.SearchVal);
ListRecords = await StatService.StatUserLogGetAll(numRecord, MessageService.SearchVal);
}
#endregion Protected Methods
#region Public Methods
public string checkSelect(DateTime DataOra, string IdxMacchina, string Causale)
public string checkSelect(int IdxLog)
{
string answ = "";
if (currRecord != null)
{
try
{
answ = (currRecord.DataOra == DataOra && currRecord.IdxMacchina == IdxMacchina && currRecord.Causale == Causale) ? "table-info" : "";
answ = (currRecord.IdxLog == IdxLog) ? "table-info" : "";
}
catch
{ }
@@ -100,48 +100,5 @@ namespace MP.Stats.Pages
}
#endregion Public Methods
#if false
[Inject]
protected BBM_SelectData SelectData { get; set; }
protected void CreateNew()
{
// recupero counter
string newCode = BBMService.CounterGetNext("EGW.B", 6);
DatabaseModels.BasketsModel newRecord = new DatabaseModels.BasketsModel()
{
CodBasket = newCode,
DataIns = DateTime.Now,
CustomerId = 1,
Descript = "New Basket"
};
currBasket = newRecord;
}
protected async Task Delete(SHERPA.BBM.DatabaseModels.BasketsModel currRecord)
{
if (!await JSRuntime.InvokeAsync<bool>("confirm", $"Sicuro di voler eliminare il Basket '{currRecord.CodBasket}'?"))
return;
BBMService.BasketsDelete(currRecord);
await UpdateData();
}
protected void Edit(SHERPA.BBM.DatabaseModels.BasketsModel currRecord)
{
currBasket = currRecord;
}
protected void ShowDocs(SHERPA.BBM.DatabaseModels.BasketsModel currRecord)
{
// salvo
SelectData.BasketId = currRecord.BasketId;
SelectData.NegotiationId = 0;
// rimando...
NavManager.NavigateTo("docs");
}
#endif
}
}
MP.Stats/Shared/NavMenu.razor
+1 -1
View File
@@ -18,7 +18,7 @@
</NavLink>
</li>
<li class="nav-item px-3">
<NavLink class="nav-link" href="diario">
<NavLink class="nav-link" href="userlog">
<span class="oi oi-document" aria-hidden="true" title="Statistiche Controlli"></span> User ActionLog
</NavLink>
</li>