From 7487efb7240c306d2fabfbd25f34da20de4d8446 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Wed, 19 May 2021 17:49:19 +0200
Subject: [PATCH] Inizio review paginazione

---
 MP.Stats/Components/DataPager.razor |  34 +++++++---
 MP.Stats/Data/MpStatsService.cs     |   4 +-
 MP.Stats/Pages/Scarti.razor         | 100 ++++++++++++++--------------
 MP.Stats/Pages/Scarti.razor.cs      |   7 +-
 4 files changed, 83 insertions(+), 62 deletions(-)

diff --git a/MP.Stats/Components/DataPager.razor b/MP.Stats/Components/DataPager.razor
index 527b8e78..fe4f3439 100644
--- a/MP.Stats/Components/DataPager.razor
+++ b/MP.Stats/Components/DataPager.razor
@@ -1,15 +1,31 @@
-<div class="input-group input-group-sm">
-    row/pag:&nbsp;
-    <select @bind="@numRecord" class="form-control form-control-sm">
-        <option value="5">5</option>
-        <option value="10">10</option>
-        <option value="25">25</option>
-        <option value="50">50</option>
-        <option value="100">100</option>
-    </select>
+<div class="row">
+    <div class="col-6 col-lg-10 text-left">
+        <div class="row">
+            <div class="col-9">
+                paginazione
+            </div>
+            <div class="col-3">
+                @totalCount records
+            </div>
+        </div>
+    </div>
+    <div class="col-6 col-lg-2 text-right">
+        <div class="input-group input-group-sm">
+            row/pag:&nbsp;
+            <select @bind="@numRecord" class="form-control form-control-sm">
+                <option value="5">5</option>
+                <option value="10">10</option>
+                <option value="25">25</option>
+                <option value="50">50</option>
+                <option value="100">100</option>
+            </select>
+        </div>
+    </div>
 </div>
 
 @code {
+    [Parameter]
+    public int totalCount { get; set; } = 0;
 
     protected int _numRecord { get; set; } = 10;
 
diff --git a/MP.Stats/Data/MpStatsService.cs b/MP.Stats/Data/MpStatsService.cs
index 7f7eff2f..60e542c8 100644
--- a/MP.Stats/Data/MpStatsService.cs
+++ b/MP.Stats/Data/MpStatsService.cs
@@ -99,10 +99,10 @@ namespace MP.Stats.Data
             return Task.FromResult(dbController.StatOdlGetAll(numRecord, searchVal).ToArray());
         }
 
-        public Task<MP.Data.DatabaseModels.ResScarti[]> StatScartiGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo, int numRecord, string searchVal = "")
+        public Task<MP.Data.DatabaseModels.ResScarti[]> StatScartiGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo, string searchVal = "")
         {
             // filtra e restituisce SOLO i primi record...
-            return Task.FromResult(dbController.StatScartiGetAll(DataStart, DataEnd, IdxMacchina, IdxODL, KeyRichiesta, CodArticolo).Take(numRecord).ToArray());
+            return Task.FromResult(dbController.StatScartiGetAll(DataStart, DataEnd, IdxMacchina, IdxODL, KeyRichiesta, CodArticolo).ToArray());
         }
 
         public Task<MP.Data.DatabaseModels.UserActionLog[]> StatUserLogGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo, int numRecord, string searchVal = "")
diff --git a/MP.Stats/Pages/Scarti.razor b/MP.Stats/Pages/Scarti.razor
index 343d6c22..b2a7ee96 100644
--- a/MP.Stats/Pages/Scarti.razor
+++ b/MP.Stats/Pages/Scarti.razor
@@ -5,13 +5,12 @@
 <div class="card">
     <div class="card-header table-primary">
         <div class="row">
-            <div class="col-6 col-lg-2 h2">Registro Scarti</div>
-            <div class="col-6 col-lg-10">
-                <SelectionFilter SelFilter="currFilter" filterChanged="DoFilter"></SelectionFilter>
+            <div class="col-6 col-lg-3 h2">Registro Scarti</div>
+            <div class="col-6 col-lg-9">
             </div>
         </div>
     </div>
-    <div class="card-body">
+    <div class="card-body py-0">
         @if (currRecord != null)
         {
             @*<BasketEditor Basket="@currBasket" DataReset="ResetData" DataUpdated="UpdateData"></BasketEditor>*@
@@ -22,54 +21,55 @@
         }
         else
         {
-            <table class="table table-sm table-striped">
-                <thead>
-                    <tr>
-                        <th>Macchina</th>
-                        <th>Data</th>
-                        <th>ODL/Commessa</th>
-                        <th>Articolo</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.DataOraRif, @record.IdxMacchina, @record.Causale)">
-                            <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 class="text-right">
-                                <div class="row">
-                                    <div class="col">[@record.Causale]</div>
-                                    <div class="col text-right">@record.Descrizione</div>
-                                </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>
-            </table>
+            <div class="row">
+                <div class="col-12 table-secondary">
+                    <SelectionFilter SelFilter="currFilter" filterChanged="DoFilter"></SelectionFilter>
+                </div>
+                <div class="col-12">
+                    <table class="table table-sm table-striped">
+                        <thead>
+                            <tr>
+                                <th>Macchina</th>
+                                <th>Data</th>
+                                <th>ODL/Commessa</th>
+                                <th>Articolo</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.DataOraRif, @record.IdxMacchina, @record.Causale)">
+                                    <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 class="text-right">
+                                        <div class="row">
+                                            <div class="col">[@record.Causale]</div>
+                                            <div class="col text-right">@record.Descrizione</div>
+                                        </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>
+                    </table>
+                </div>
+            </div>
         }
     </div>
     <div class="card-footer py-1">
-        <div class="row">
-            <div class="col-8 col-lg-10">
-            </div>
-            <div class="col-4 col-lg-2">
-                <DataPager numRecord="@numRecord" numRecordChanged="ForceReload" />
-            </div>
-        </div>
+        <DataPager numRecord="@numRecord" numRecordChanged="ForceReload" totalCount="@SearchRecords.Count()" />
     </div>
 </div>
\ No newline at end of file
diff --git a/MP.Stats/Pages/Scarti.razor.cs b/MP.Stats/Pages/Scarti.razor.cs
index 871d963c..9baea5ad 100644
--- a/MP.Stats/Pages/Scarti.razor.cs
+++ b/MP.Stats/Pages/Scarti.razor.cs
@@ -2,6 +2,8 @@
 using Microsoft.JSInterop;
 using MP.Stats.Data;
 using System;
+using System.Collections.Generic;
+using System.Linq;
 using System.Threading.Tasks;
 
 namespace MP.Stats.Pages
@@ -14,6 +16,8 @@ namespace MP.Stats.Pages
 
         private MP.Data.DatabaseModels.ResScarti[] ListRecords;
 
+        private MP.Data.DatabaseModels.ResScarti[] SearchRecords;
+
         #endregion Private Fields
 
         #region Private Properties
@@ -43,7 +47,8 @@ namespace MP.Stats.Pages
 
         private async Task reloadData()
         {
-            ListRecords = await StatService.StatScartiGetAll(currFilter.DateStart, currFilter.DateEnd, currFilter.IdxMacchina, currFilter.IdxOdl, currFilter.KeyRichiesta, currFilter.CodArticolo, numRecord, MessageService.SearchVal);
+            SearchRecords = await StatService.StatScartiGetAll(currFilter.DateStart, currFilter.DateEnd, currFilter.IdxMacchina, currFilter.IdxOdl, currFilter.KeyRichiesta, currFilter.CodArticolo, MessageService.SearchVal);
+            ListRecords = SearchRecords.Take(numRecord).ToArray();
         }
 
         #endregion Private Methods