From c697b8fea3a44e78a09ff0675597734a0cdc1e89 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Wed, 26 May 2021 09:23:17 +0200
Subject: [PATCH] OK paginazione DOCS

---
 SHERPA.BBM.UI/Data/BBM_EFService.cs     |  4 +--
 SHERPA.BBM.UI/Pages/Docs.razor.cs       | 12 ++-----
 SHERPA.BBM/Controllers/BBMController.cs | 48 ++++++++++++-------------
 3 files changed, 26 insertions(+), 38 deletions(-)

diff --git a/SHERPA.BBM.UI/Data/BBM_EFService.cs b/SHERPA.BBM.UI/Data/BBM_EFService.cs
index faf0928..2a5dc92 100644
--- a/SHERPA.BBM.UI/Data/BBM_EFService.cs
+++ b/SHERPA.BBM.UI/Data/BBM_EFService.cs
@@ -228,9 +228,9 @@ namespace SHERPA.BBM.UI.Data
             return Task.FromResult(dbController.DocGetLastDesc(numRec).ToArray());
         }
 
-        public Task<List<DatabaseModels.DocsModel>> DocsGetAsync(int BasketId, int NegotiationId, int numRec)
+        public Task<List<DatabaseModels.DocsModel>> DocsGetAsync(int BasketId, int NegotiationId, bool ShowAll)
         {
-            return Task.FromResult(dbController.DocGetLastDesc(BasketId, NegotiationId, numRec).ToList());
+            return Task.FromResult(dbController.DocGetLastDesc(BasketId, NegotiationId, ShowAll));
         }
 
         public void DocsUpdate(DatabaseModels.DocsModel currItem)
diff --git a/SHERPA.BBM.UI/Pages/Docs.razor.cs b/SHERPA.BBM.UI/Pages/Docs.razor.cs
index 751fb13..55f39c6 100644
--- a/SHERPA.BBM.UI/Pages/Docs.razor.cs
+++ b/SHERPA.BBM.UI/Pages/Docs.razor.cs
@@ -256,16 +256,8 @@ namespace SHERPA.BBM.UI.Pages
 
         protected async Task updateTable()
         {
-            SearchRecords = await BBMService.DocsGetAsync(SelBasketId, SelCodNegotiation, numRecord);
-            // filtro solo attivi SE NON richiesto
-            if (ShowAllDoc)
-            {
-                ListRecords = SearchRecords.Skip(numRecord * (currPage - 1)).Take(numRecord).ToList();
-            }
-            else
-            {
-                ListRecords = SearchRecords.Where(x => x.IsActive == true).Skip(numRecord * (currPage - 1)).Take(numRecord).ToList();
-            }
+            SearchRecords = await BBMService.DocsGetAsync(SelBasketId, SelCodNegotiation, ShowAllDoc);
+            ListRecords = SearchRecords.Skip(numRecord * (currPage - 1)).Take(numRecord).ToList();
         }
 
         #endregion Protected Methods
diff --git a/SHERPA.BBM/Controllers/BBMController.cs b/SHERPA.BBM/Controllers/BBMController.cs
index 90f15f0..4106d34 100644
--- a/SHERPA.BBM/Controllers/BBMController.cs
+++ b/SHERPA.BBM/Controllers/BBMController.cs
@@ -512,26 +512,21 @@ namespace SHERPA.BBM.Controllers
         }
 
         /// <summary>
-        /// Elenco ultimi Docs
+        /// Elenco Docs
         /// </summary>
-        /// <param name="CodBasket"></param>
-        /// <param name="CodNegotiation"></param>
-        /// <param name="numRecord"></param>
+        /// <param name="BasketId"></param>
+        /// <param name="NegotiationId"></param>
+        /// <param name="ShowAll">Mostra tutti (=true) / solo attivi</param>
         /// <returns></returns>
-        public List<DatabaseModels.DocsModel> DocGetLastDesc(int BasketId = 0, int NegotiationId = 0, int numRecord = 0)
+        public List<DatabaseModels.DocsModel> DocGetLastDesc(int BasketId = 0, int NegotiationId = 0, bool ShowAll = false)
         {
             List<DatabaseModels.DocsModel> dbResult = new List<DatabaseModels.DocsModel>();
-            // se numRecord = 0 --> passo tutti
-            if (numRecord == 0)
-            {
-                numRecord = dbCtx.DbSetDocs.Count();
-            }
+
             dbResult = dbCtx
                 .DbSetDocs
-                .Where(x => (x.BasketId == BasketId || BasketId == 0) && (x.NegotiationId == NegotiationId || NegotiationId == 0))
+                .Where(x => (x.IsActive || ShowAll) && (x.BasketId == BasketId || BasketId == 0) && (x.NegotiationId == NegotiationId || NegotiationId == 0))
                 .OrderByDescending(x => x.CodDoc)
                 .OrderByDescending(x => x.DataIns)
-                .Take(numRecord)
                 .ToList();
 
             return dbResult;
@@ -1173,6 +1168,21 @@ namespace SHERPA.BBM.Controllers
             return answ;
         }
 
+        /// <summary>
+        /// Valore complessivo DRAFT (NON confermato) x ANNO
+        /// </summary>
+        /// <param name="anno"></param>
+        /// <returns></returns>
+        public double SumTotDraft(int anno = 0)
+        {
+            double answ = dbCtx
+                .DbSetResources
+                .Where(x => ((x.Document.DataIns.Year == anno || anno == 0) && x.Document.IsActive && x.Document.IsDraft))
+                .Select(x => x.FinalPrice)
+                .Sum();
+            return answ;
+        }
+
         /// <summary>
         /// Importo complessivo fatture EMESSE x ANNO
         /// </summary>
@@ -1232,20 +1242,6 @@ namespace SHERPA.BBM.Controllers
                 .Sum();
             return answ;
         }
-        /// <summary>
-        /// Valore complessivo DRAFT (NON confermato) x ANNO
-        /// </summary>
-        /// <param name="anno"></param>
-        /// <returns></returns>
-        public double SumTotDraft(int anno = 0)
-        {
-            double answ = dbCtx
-                .DbSetResources
-                .Where(x => ((x.Document.DataIns.Year == anno || anno == 0) && x.Document.IsActive && x.Document.IsDraft))
-                .Select(x => x.FinalPrice)
-                .Sum();
-            return answ;
-        }
 
         #endregion Public Methods
     }