From 2952046ae25ff311aa5f4e35ef0c950116cbad7c Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Fri, 21 May 2021 13:38:10 +0200
Subject: [PATCH] COmpletata review pagiazione

---
 MP.Stats/Components/DataPager.razor   | 37 ++++++++++++--
 MP.Stats/Components/LoadingData.razor |  4 +-
 MP.Stats/Pages/Index.razor            |  2 +-
 MP.Stats/Pages/Oee.razor              | 70 +++++++++++++--------------
 4 files changed, 71 insertions(+), 42 deletions(-)

diff --git a/MP.Stats/Components/DataPager.razor b/MP.Stats/Components/DataPager.razor
index 03cdd0d5..424d7640 100644
--- a/MP.Stats/Components/DataPager.razor
+++ b/MP.Stats/Components/DataPager.razor
@@ -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;
         }
diff --git a/MP.Stats/Components/LoadingData.razor b/MP.Stats/Components/LoadingData.razor
index 4eb9ffb3..2ffebab8 100644
--- a/MP.Stats/Components/LoadingData.razor
+++ b/MP.Stats/Components/LoadingData.razor
@@ -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>
diff --git a/MP.Stats/Pages/Index.razor b/MP.Stats/Pages/Index.razor
index f2d91a2f..8466112e 100644
--- a/MP.Stats/Pages/Index.razor
+++ b/MP.Stats/Pages/Index.razor
@@ -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" />
diff --git a/MP.Stats/Pages/Oee.razor b/MP.Stats/Pages/Oee.razor
index 97424547..3b2527fa 100644
--- a/MP.Stats/Pages/Oee.razor
+++ b/MP.Stats/Pages/Oee.razor
@@ -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">