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

COmpletata review pagiazione

Browse Source
This commit is contained in:
Samuele Locatelli
2021-05-21 13:38:10 +02:00
parent 61db2f33e5
commit 2952046ae2
4 changed files with 71 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP.Stats/Components/DataPager.razor
+33 -4
View File
@@ -9,7 +9,12 @@
<Pagination>
<PaginationItem>
<PaginationLink Clicked="@HandlePaginationItemClick" Page="1">
<span aria-hidden="true">«</span>
<i class="fas fa-angle-double-left"></i>
</PaginationLink>
</PaginationItem>
<PaginationItem>
<PaginationLink Clicked="@HandlePaginationItemClick" Page="@prevBlock.ToString()">
<span aria-hidden="true"><i class="fas fa-angle-left"></i></span>
</PaginationLink>
</PaginationItem>
@for (int i = @startPage; i <= endPage; ++i)
@@ -21,9 +26,14 @@
</PaginationLink>
</PaginationItem>
}
<PaginationItem>
<PaginationLink Clicked="@HandlePaginationItemClick" Page="@nextBlock.ToString()">
<i class="fas fa-angle-right"></i>
</PaginationLink>
</PaginationItem>
<PaginationItem>
<PaginationLink Clicked="@HandlePaginationItemClick" Page="@LastPage.ToString()">
<span aria-hidden="true">»</span>
<i class="fas fa-angle-double-right"></i>
</PaginationLink>
</PaginationItem>
</Pagination>
@@ -79,7 +89,7 @@
{
get
{
int answ = (int)(currPage / numPages) * numPages - 2;
int answ = (int)(currPage / numPages) * numPages;
answ = answ > 0 ? answ : 1;
return answ;
}
@@ -88,7 +98,26 @@
{
get
{
int answ = (int)(currPage / numPages) * numPages + numPages + 2;
int answ = (int)(currPage / numPages) * numPages + numPages;
answ = answ < LastPage ? answ : LastPage;
return answ;
}
}
private int prevBlock
{
get
{
int answ = currPage - numPages;
answ = answ > 0 ? answ : 1;
return answ;
}
}
private int nextBlock
{
get
{
int answ = currPage + numPages;
answ = answ < LastPage ? answ : LastPage;
return answ;
}
MP.Stats/Components/LoadingData.razor
+2 -2
View File
@@ -1,5 +1,5 @@
<div class="row">
<div class="col-12 text-center py-3">
<div class="row py-5 my-5">
<div class="col-12 text-center mt-5 py-5 alert alert-primary">
<h3>loading data</h3>
<i class="fas fa-spinner fa-spin fa-5x"></i>
</div>
MP.Stats/Pages/Index.razor
+1 -1
View File
@@ -28,7 +28,7 @@
<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="produzione" Icon="oi oi-clipboard" Descript="Diario Produzione" />
<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" />
MP.Stats/Pages/Oee.razor
+35 -35
View File
@@ -16,48 +16,48 @@
<SelectionFilter SelFilter="currFilter" filterChanged="DoFilter"></SelectionFilter>
</div>
</div>
@if (totalCount == 0 || ListRecords == null || ListRecords.Count() == 0)
@if (totalCount == 0 || ListRecords == null)
{
<LoadingData></LoadingData>
<LoadingData></LoadingData>
}
else
{
<div class="row">
<div class="col-12">
<table class="table table-sm table-striped">
<thead>
<tr>
<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>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)">
<td>
<div>@record.DataRif.ToString("yyyy.MM.dd")</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>
<tr class="@checkSelect(record.DataRif, record.Turno, @record.IdxMacchina)">
<td>
<div>@record.DataRif.ToString("yyyy.MM.dd")</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>
</tbody>
</table>
</div>
</div>
</div>
}
</div>
<div class="card-footer py-1">