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

Merge branch 'feature/ReviewLayoutHeader' into develop

Browse Source
This commit is contained in:
Samuele Locatelli
2021-05-22 12:03:28 +02:00
parent 31182eb0fe f8d2cc88b4
commit 9a6fe6773b
8 changed files with 69 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP.Stats/Components/SelectionFilter.razor
+6 -6
View File
@@ -4,19 +4,19 @@
<EditForm Model="@SelFilter">
<div class="row">
<div class="col">
<div class="form-group">
<div class="form-group mb-0">
<label for="dtInizio" class="small">inizio:</label>
<InputDateTime id="dtInizio" class="form-control form-control-sm" @bind-Value="@DateStart"></InputDateTime>
</div>
</div>
<div class="col">
<div class="form-group">
<div class="form-group mb-0">
<label for="dtFine" class="small">fine:</label>
<InputDateTime id="dtFine" class="form-control form-control-sm" @bind-Value="@DateEnd"></InputDateTime>
</div>
</div>
<div class="col">
<div class="form-group">
<div class="form-group mb-0">
<label for="idxMacc" class="small">macchina:</label>
<InputSelect @bind-Value="@IdxMacchina" id="maccSel" class="form-control form-control-sm" title="idxMacc">
@foreach (var item in ddlMacchine)
@@ -27,7 +27,7 @@
</div>
</div>
<div class="col">
<div class="form-group">
<div class="form-group mb-0">
<div class="input-group input-group-sm">
<div class="input-group-prepend">
<label class="input-group-text">commessa:</label>
@@ -43,7 +43,7 @@
</div>
</div>
<div class="col">
<div class="form-group">
<div class="form-group mb-0">
<div class="input-group input-group-sm">
<div class="input-group-prepend">
<label class="input-group-text">articolo:</label>
@@ -59,7 +59,7 @@
</div>
</div>
<div class="col-1 text-right">
<div class="form-group">
<div class="form-group mb-0">
<label for="btnReset" class="small">reset</label><br />
<Button id="btnReset" class="btn btn-info btn-sm btn-block" Clicked="resetFilter"><span class="oi oi-loop-circular"></span></Button>
</div>
MP.Stats/Pages/Controlli.razor
+3 -12
View File
@@ -4,19 +4,10 @@
@using MP.Stats.Components
<div class="card">
<div class="card-header table-primary">
<div class="row">
<div class="col-6 h2">Registro Controlli</div>
<div class="col-6">
</div>
</div>
<div class="card-header table-primary py-1">
<SelectionFilter SelFilter="currFilter" filterChanged="DoFilter" filterReset="ResetFilter"></SelectionFilter>
</div>
<div class="card-body py-0">
<div class="row">
<div class="col-12 table-secondary">
<SelectionFilter SelFilter="currFilter" filterChanged="DoFilter" filterReset="ResetFilter"></SelectionFilter>
</div>
</div>
<div class="card-body py-0 px-1">
@if (ListRecords == null)
{
<LoadingData></LoadingData>
MP.Stats/Pages/Diario.razor
+3 -12
View File
@@ -3,19 +3,10 @@
@using MP.Stats.Components
<div class="card">
<div class="card-header table-primary">
<div class="row">
<div class="col-6 h2">Diario Produzione</div>
<div class="col-6">
</div>
</div>
<div class="card-header table-primary py-1">
<SelectionFilter SelFilter="currFilter" filterChanged="DoFilter" filterReset="ResetFilter"></SelectionFilter>
</div>
<div class="card-body py-0">
<div class="row">
<div class="col-12 table-secondary">
<SelectionFilter SelFilter="currFilter" filterChanged="DoFilter" filterReset="ResetFilter"></SelectionFilter>
</div>
</div>
<div class="card-body py-0 px-1">
@if (ListRecords == null)
{
<LoadingData></LoadingData>
MP.Stats/Pages/Index.razor
+6 -11
View File
@@ -23,17 +23,12 @@
<div class="shortcuts mt-2">
<div class="row">
<div class="col-12">
<div class="card">
<div class="card-header table-primary h1">Main Topics</div>
<div class="card-body py-0">
<HomeButton NavLink="oee" Icon="oi oi-monitor" Descript="TRS/OEE %" />
<HomeButton NavLink="reportodl" Icon="oi oi-book" Descript="Report ODL" />
<HomeButton NavLink="diario" 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" />
</div>
</div>
<HomeButton NavLink="oee" Icon="oi oi-monitor" Descript="TRS/OEE %" />
<HomeButton NavLink="reportodl" Icon="oi oi-book" Descript="Report ODL" />
<HomeButton NavLink="diario" 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" />
</div>
</div>
</div>
MP.Stats/Pages/Oee.razor
+42 -51
View File
@@ -3,73 +3,64 @@
@using MP.Stats.Components
<div class="card">
<div class="card-header table-primary">
<div class="row">
<div class="col-6 h2">TRS / OEE %</div>
<div class="col-6">
</div>
</div>
<div class="card-header table-primary py-1">
<SelectionFilter SelFilter="currFilter" filterChanged="DoFilter" filterReset="ResetFilter"></SelectionFilter>
</div>
<div class="card-body py-0">
<div class="row">
<div class="col-12 table-secondary">
<SelectionFilter SelFilter="currFilter" filterChanged="DoFilter" filterReset="ResetFilter"></SelectionFilter>
</div>
</div>
<div class="card-body py-0 px-1">
@if (currRecord != null)
{
<DetailOee currRecord="@currRecord"></DetailOee>
<DetailOee currRecord="@currRecord"></DetailOee>
}
@if (ListRecords == null)
{
<LoadingData></LoadingData>
<LoadingData></LoadingData>
}
else if (totalCount == 0)
{
<div class="alert alert-warning text-center display-4">Nessun record trovato</div>
<div class="alert alert-warning text-center display-4">Nessun record trovato</div>
}
else
{
<div class="row">
<div class="col-12">
<table class="table table-sm table-striped">
<thead>
<tr>
@*<th><button class="btn btn-sm btn-primary" @onclick="() => ResetData()"><span class="oi oi-loop-circular"></span></button></th>*@
<th>Data</th>
<th>Turno</th>
<th>Macchina</th>
<th>Articolo</th>
<th class="text-right">Durata</th>
<th class="text-right">Pezzi</th>
<th class="text-right">OEE %</th>
</tr>
</thead>
<tbody>
@foreach (var record in ListRecords)
<div class="row">
<div class="col-12">
<table class="table table-sm table-striped">
<thead>
<tr>
@*<th><button class="btn btn-sm btn-primary" @onclick="() => ResetData()"><span class="oi oi-loop-circular"></span></button></th>*@
<th>Data</th>
<th>Turno</th>
<th>Macchina</th>
<th>Articolo</th>
<th class="text-right">Durata</th>
<th class="text-right">Pezzi</th>
<th class="text-right">OEE %</th>
</tr>
</thead>
<tbody>
@foreach (var record in ListRecords)
{
<tr class="@checkSelect(record.DataRif, record.Turno, @record.IdxMacchina)">
<tr class="@checkSelect(record.DataRif, record.Turno, @record.IdxMacchina)">
@*<td><button class="btn btn-sm btn-primary" @onclick="() => Select(record)"><span class="oi oi-magnifying-glass"></span></button></td>*@
<td>
<div>@record.DataRif.ToString("yyyy.MM.dd")</div>
<div class="small">@record.DataRif.ToString("dddd")</div>
</td>
<td>@record.Turno</td>
<td>
<div>@record.CodMacchina</div>
<div class="small">@record.IdxMacchina</div>
</td>
<td>@record.CodArticolo</td>
<td class="text-right">@record.TotPeriodo.ToString("N2")</td>
<td class="text-right">@record.TotPz</td>
<td class="text-right">@record.OEE.ToString("P2")</td>
</tr>
@*<td><button class="btn btn-sm btn-primary" @onclick="() => Select(record)"><span class="oi oi-magnifying-glass"></span></button></td>*@
<td>
<div>@record.DataRif.ToString("yyyy.MM.dd")</div>
<div class="small">@record.DataRif.ToString("dddd")</div>
</td>
<td>@record.Turno</td>
<td>
<div>@record.CodMacchina</div>
<div class="small">@record.IdxMacchina</div>
</td>
<td>@record.CodArticolo</td>
<td class="text-right">@record.TotPeriodo.ToString("N2")</td>
<td class="text-right">@record.TotPz</td>
<td class="text-right">@record.OEE.ToString("P2")</td>
</tr>
}
</tbody>
</table>
</div>
</tbody>
</table>
</div>
</div>
}
</div>
<div class="card-footer py-1">
MP.Stats/Pages/ReportODL.razor
+3 -12
View File
@@ -3,19 +3,10 @@
@using MP.Stats.Components
<div class="card">
<div class="card-header table-primary">
<div class="row">
<div class="col-6 h2">Report ODL/Comm.</div>
<div class="col-6">
</div>
</div>
<div class="card-header table-primary py-1">
<SelectionFilter SelFilter="currFilter" filterChanged="DoFilter" filterReset="ResetFilter"></SelectionFilter>
</div>
<div class="card-body py-0">
<div class="row">
<div class="col-12 table-secondary">
<SelectionFilter SelFilter="currFilter" filterChanged="DoFilter" filterReset="ResetFilter"></SelectionFilter>
</div>
</div>
<div class="card-body py-0 px-1">
@if (ListRecords == null)
{
<LoadingData></LoadingData>
MP.Stats/Pages/Scarti.razor
+3 -12
View File
@@ -3,19 +3,10 @@
@using MP.Stats.Components
<div class="card">
<div class="card-header table-primary">
<div class="row">
<div class="col-6 h2">Registro Scarti</div>
<div class="col-6">
</div>
</div>
<div class="card-header table-primary py-1">
<SelectionFilter SelFilter="currFilter" filterChanged="DoFilter" filterReset="ResetFilter"></SelectionFilter>
</div>
<div class="card-body py-0">
<div class="row">
<div class="col-12 table-secondary">
<SelectionFilter SelFilter="currFilter" filterChanged="DoFilter" filterReset="ResetFilter"></SelectionFilter>
</div>
</div>
<div class="card-body py-0 px-1">
@if (ListRecords == null)
{
<LoadingData></LoadingData>
MP.Stats/Pages/UserLog.razor
+3 -12
View File
@@ -3,19 +3,10 @@
@using MP.Stats.Components
<div class="card">
<div class="card-header table-primary">
<div class="row">
<div class="col-6 h2">User ActionLog</div>
<div class="col-6">
</div>
</div>
<div class="card-header table-primary py-1">
<SelectionFilter SelFilter="currFilter" filterChanged="DoFilter" filterReset="ResetFilter"></SelectionFilter>
</div>
<div class="card-body py-0">
<div class="row">
<div class="col-12 table-secondary">
<SelectionFilter SelFilter="currFilter" filterChanged="DoFilter" filterReset="ResetFilter"></SelectionFilter>
</div>
</div>
<div class="card-body py-0 px-1">
@if (ListRecords == null)
{
<LoadingData></LoadingData>