From 627a9297f7c6f97157a5b00ce5b1da30a8554d4e Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Thu, 4 Jul 2024 15:17:46 +0200
Subject: [PATCH] =?UTF-8?q?Update=20calcolo=20quantit=C3=A0=20fix=20displa?=
 =?UTF-8?q?y=20cambio=20pagina?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 MagMan.Core/DTO/MaterialDTO.cs                |  9 ++++++--
 .../Controllers/TenantController.cs           | 23 +++++++++++++++----
 MagMan.UI/Components/AuthKeyMan.razor.cs      |  6 +++--
 MagMan.UI/Components/CustomerMan.razor.cs     |  6 +++--
 MagMan.UI/Components/ItemMan.razor.cs         |  4 ++--
 MagMan.UI/Components/MacStatusMan.razor.cs    |  4 ++--
 MagMan.UI/Components/MachineMan.razor.cs      |  6 +++--
 MagMan.UI/Components/MaterialMan.razor        |  2 +-
 MagMan.UI/Components/MaterialMan.razor.cs     |  4 ++--
 MagMan.UI/Components/MovMag.razor.cs          |  4 ++--
 MagMan.UI/Components/ProjectMan.razor.cs      |  6 ++---
 MagMan.UI/Components/ResourcesAct.razor.cs    |  4 ++--
 MagMan.UI/Components/ResourcesEstim.razor.cs  |  4 ++--
 MagMan.UI/Components/UserMan.razor.cs         |  8 +++----
 MagMan.UI/MagMan.UI.csproj                    |  2 +-
 Resources/ChangeLog.html                      |  2 +-
 Resources/VersNum.txt                         |  2 +-
 Resources/manifest.xml                        |  2 +-
 18 files changed, 62 insertions(+), 36 deletions(-)

diff --git a/MagMan.Core/DTO/MaterialDTO.cs b/MagMan.Core/DTO/MaterialDTO.cs
index 116fd53..f57dd8e 100644
--- a/MagMan.Core/DTO/MaterialDTO.cs
+++ b/MagMan.Core/DTO/MaterialDTO.cs
@@ -48,9 +48,14 @@ namespace MagMan.Core.DTO
         public int SizeNum { get; set; } = 0;
 
         /// <summary>
-        /// Quantità totale in giacenza
+        /// Quantità totale in giacenza, come lunghezza (m) se barre o area (m2) se pareti
         /// </summary>
-        public int QtyTot { get; set; } = 0;
+        public double QtyTot { get; set; } = 0;
+
+        public string UM
+        {
+            get => IsBeam ? "m" : "m2";
+        }
 
         /// <summary>
         /// Codice materiale x QR/Datamatrix
diff --git a/MagMan.Data.Tenant/Controllers/TenantController.cs b/MagMan.Data.Tenant/Controllers/TenantController.cs
index e160f7d..8466db0 100644
--- a/MagMan.Data.Tenant/Controllers/TenantController.cs
+++ b/MagMan.Data.Tenant/Controllers/TenantController.cs
@@ -725,7 +725,8 @@ namespace MagMan.Data.Tenant.Controllers
                                      LMm = x.LMm,
                                      WMm = x.WMm,
                                      SizeNum = x.RawItemList == null ? 0 : x.RawItemList.Where(x => x.IsActive).Count(),
-                                     QtyTot = x.RawItemList == null ? 0 : x.RawItemList.Where(x => x.IsActive).Sum(r => r.QtyAvail),
+                                     //QtyTot = x.RawItemList == null ? 0 : x.RawItemList.Where(x => x.IsActive).Sum(r => r.QtyAvail),
+                                     QtyTot = x.RawItemList == null ? 0 : calcQty(x.IsBeam, x.RawItemList.Where(x => x.IsActive).ToList()),
                                      MatDtmx = x.MatDtmx,
                                      IsBeam = x.IsBeam,
                                      IsWall = x.IsWall,
@@ -741,6 +742,20 @@ namespace MagMan.Data.Tenant.Controllers
             return dbResult;
         }
 
+        protected double calcQty(bool isBeam, List<RawItemModel> items)
+        {
+            double answ = 0;
+            if (isBeam)
+            {
+                answ = items.Sum(x => x.QtyAvail * (double)x.LMm / 1000);
+            }
+            else
+            {
+                answ = items.Sum(x => x.QtyAvail * (double)x.LMm / 1000 * (double)x.WMm / 1000);
+            }
+            return answ;
+        }
+
         /// <summary>
         /// Elenco Materiali gestiti a magazzino formato DTO
         /// </summary>
@@ -1122,8 +1137,8 @@ namespace MagMan.Data.Tenant.Controllers
                         .DbSetProjects
                         .Where(x => (rec2upd.ProjDbId > 0 && x.ProjDbId == rec2upd.ProjDbId))
                         .FirstOrDefault();
-                        //.Where(x => (rec2upd.projDbId > 0 && x.projDbId == rec2upd.projDbId) ||
-                        //            ((x.ProjExtDbId == rec2upd.ProjExtDbId && x.KeyNum == rec2upd.KeyNum) && (x.ProjExtId == rec2upd.ProjExtId && x.KeyNum == rec2upd.KeyNum)))
+                    //.Where(x => (rec2upd.projDbId > 0 && x.projDbId == rec2upd.projDbId) ||
+                    //            ((x.ProjExtDbId == rec2upd.ProjExtDbId && x.KeyNum == rec2upd.KeyNum) && (x.ProjExtId == rec2upd.ProjExtId && x.KeyNum == rec2upd.KeyNum)))
                     if (currData != null)
                     {
                         currData.MachineID = rec2upd.MachineID;
@@ -1217,7 +1232,7 @@ namespace MagMan.Data.Tenant.Controllers
                                     .DbSetProjects
                                     .Where(x => x.ProjDbId == rec2upd.ProjDbId)
                                     .FirstOrDefault();
-                    if(recProj != null)
+                    if (recProj != null)
                     {
                         recProj.DtLastAction = adesso;
                         dbCtx.Entry(recProj).State = EntityState.Modified;
diff --git a/MagMan.UI/Components/AuthKeyMan.razor.cs b/MagMan.UI/Components/AuthKeyMan.razor.cs
index 7e3e092..d1d25e4 100644
--- a/MagMan.UI/Components/AuthKeyMan.razor.cs
+++ b/MagMan.UI/Components/AuthKeyMan.razor.cs
@@ -75,14 +75,16 @@ namespace MagMan.UI.Components
             await ReloadData();
         }
 
-        protected void SetNumRec(int newNum)
+        protected async Task SetNumRec(int newNum)
         {
             numRecord = newNum;
+            await Task.Delay(1);
             currPage = 1;
         }
 
-        protected void SetPage(int newNum)
+        protected async Task SetPage(int newNum)
         {
+            await Task.Delay(1);
             currPage = newNum;
         }
 
diff --git a/MagMan.UI/Components/CustomerMan.razor.cs b/MagMan.UI/Components/CustomerMan.razor.cs
index aa3ec56..12af775 100644
--- a/MagMan.UI/Components/CustomerMan.razor.cs
+++ b/MagMan.UI/Components/CustomerMan.razor.cs
@@ -135,14 +135,16 @@ namespace MagMan.UI.Components
             await Task.Delay(1);
         }
 
-        protected void SetNumRec(int newNum)
+        protected async Task SetNumRec(int newNum)
         {
             numRecord = newNum;
+            await Task.Delay(1);
             currPage = 1;
         }
 
-        protected void SetPage(int newNum)
+        protected async Task SetPage(int newNum)
         {
+            await Task.Delay(1);
             currPage = newNum;
         }
 
diff --git a/MagMan.UI/Components/ItemMan.razor.cs b/MagMan.UI/Components/ItemMan.razor.cs
index cfd4124..58bb2dd 100644
--- a/MagMan.UI/Components/ItemMan.razor.cs
+++ b/MagMan.UI/Components/ItemMan.razor.cs
@@ -213,10 +213,10 @@ namespace MagMan.UI.Components
             await InvokeAsync(ReloadData);
         }
 
-        protected void SetPage(int newNum)
+        protected async Task SetPage(int newNum)
         {
             currPage = newNum;
-            InvokeAsync(ReloadData);
+            await InvokeAsync(ReloadData);
         }
 
         protected async Task SortRequested(Sorter.SortCallBack e)
diff --git a/MagMan.UI/Components/MacStatusMan.razor.cs b/MagMan.UI/Components/MacStatusMan.razor.cs
index b524922..785611b 100644
--- a/MagMan.UI/Components/MacStatusMan.razor.cs
+++ b/MagMan.UI/Components/MacStatusMan.razor.cs
@@ -117,11 +117,11 @@ namespace MagMan.UI.Components
             await InvokeAsync(ReloadData);
         }
 
-        protected void SetPage(int newNum)
+        protected async Task SetPage(int newNum)
         {
             currPage = newNum;
             DoSelect(null);
-            InvokeAsync(ReloadData);
+            await InvokeAsync(ReloadData);
         }
 
         protected async Task SortRequested(Sorter.SortCallBack e)
diff --git a/MagMan.UI/Components/MachineMan.razor.cs b/MagMan.UI/Components/MachineMan.razor.cs
index 1ea81aa..974c9c1 100644
--- a/MagMan.UI/Components/MachineMan.razor.cs
+++ b/MagMan.UI/Components/MachineMan.razor.cs
@@ -81,14 +81,16 @@ namespace MagMan.UI.Components
             await ReloadData();
         }
 
-        protected void SetNumRec(int newNum)
+        protected async Task SetNumRec(int newNum)
         {
             numRecord = newNum;
+            await Task.Delay(1);
             currPage = 1;
         }
 
-        protected void SetPage(int newNum)
+        protected async Task SetPage(int newNum)
         {
+            await Task.Delay(1);
             currPage = newNum;
         }
 
diff --git a/MagMan.UI/Components/MaterialMan.razor b/MagMan.UI/Components/MaterialMan.razor
index fbb7986..b379cea 100644
--- a/MagMan.UI/Components/MaterialMan.razor
+++ b/MagMan.UI/Components/MaterialMan.razor
@@ -142,7 +142,7 @@
                                     @item.SizeNum
                                 </td>
                                 <td class="text-end">
-                                    @item.QtyTot
+                                    @($"{item.QtyTot:N1} {item.UM}")
                                 </td>
                             }
                             <AuthorizeView Roles="SuperAdmin, Admin">
diff --git a/MagMan.UI/Components/MaterialMan.razor.cs b/MagMan.UI/Components/MaterialMan.razor.cs
index 0adaec8..4eb033c 100644
--- a/MagMan.UI/Components/MaterialMan.razor.cs
+++ b/MagMan.UI/Components/MaterialMan.razor.cs
@@ -148,11 +148,11 @@ namespace MagMan.UI.Components
             await InvokeAsync(ReloadData);
         }
 
-        protected void SetPage(int newNum)
+        protected async Task SetPage(int newNum)
         {
             currPage = newNum;
             DoSelect(null);
-            InvokeAsync(ReloadData);
+            await InvokeAsync(ReloadData);
         }
 
         protected async Task SortRequested(Sorter.SortCallBack e)
diff --git a/MagMan.UI/Components/MovMag.razor.cs b/MagMan.UI/Components/MovMag.razor.cs
index 5669783..0aec31c 100644
--- a/MagMan.UI/Components/MovMag.razor.cs
+++ b/MagMan.UI/Components/MovMag.razor.cs
@@ -141,10 +141,10 @@ namespace MagMan.UI.Components
             await InvokeAsync(ReloadData);
         }
 
-        protected void SetPage(int newNum)
+        protected async Task SetPage(int newNum)
         {
             currPage = newNum;
-            InvokeAsync(ReloadData);
+            await InvokeAsync(ReloadData);
         }
 
         protected async Task SortRequested(Sorter.SortCallBack e)
diff --git a/MagMan.UI/Components/ProjectMan.razor.cs b/MagMan.UI/Components/ProjectMan.razor.cs
index 4bcae5e..8a42aab 100644
--- a/MagMan.UI/Components/ProjectMan.razor.cs
+++ b/MagMan.UI/Components/ProjectMan.razor.cs
@@ -124,11 +124,11 @@ namespace MagMan.UI.Components
             await InvokeAsync(ReloadData);
         }
 
-        protected void SetPage(int newNum)
+        protected async Task SetPage(int newNum)
         {
             currPage = newNum;
             DoSelect(null);
-            InvokeAsync(ReloadData);
+            await InvokeAsync(ReloadData);
         }
 
         protected async Task SortRequested(Sorter.SortCallBack e)
@@ -245,7 +245,7 @@ namespace MagMan.UI.Components
                 SearchRecords = await TService.ProjectGetByMachine(KeyNum, MachineIdSel);
 
                 // verifico SE filtrare attivi
-                if(OnlyActive)
+                if (OnlyActive)
                 {
                     SearchRecords = SearchRecords.Where(x => x.IsActive).ToList();
                 }
diff --git a/MagMan.UI/Components/ResourcesAct.razor.cs b/MagMan.UI/Components/ResourcesAct.razor.cs
index 972c1a7..83987a7 100644
--- a/MagMan.UI/Components/ResourcesAct.razor.cs
+++ b/MagMan.UI/Components/ResourcesAct.razor.cs
@@ -106,11 +106,11 @@ namespace MagMan.UI.Components
             await InvokeAsync(ReloadData);
         }
 
-        protected void SetPage(int newNum)
+        protected async Task SetPage(int newNum)
         {
             currPage = newNum;
             DoSelect(null);
-            InvokeAsync(ReloadData);
+            await InvokeAsync(ReloadData);
         }
 
         protected async Task SortRequested(Sorter.SortCallBack e)
diff --git a/MagMan.UI/Components/ResourcesEstim.razor.cs b/MagMan.UI/Components/ResourcesEstim.razor.cs
index 5038530..c178eee 100644
--- a/MagMan.UI/Components/ResourcesEstim.razor.cs
+++ b/MagMan.UI/Components/ResourcesEstim.razor.cs
@@ -105,11 +105,11 @@ namespace MagMan.UI.Components
             await InvokeAsync(ReloadData);
         }
 
-        protected void SetPage(int newNum)
+        protected async Task SetPage(int newNum)
         {
             currPage = newNum;
             DoSelect(null);
-            InvokeAsync(ReloadData);
+            await InvokeAsync(ReloadData);
         }
 
         protected async Task SortRequested(Sorter.SortCallBack e)
diff --git a/MagMan.UI/Components/UserMan.razor.cs b/MagMan.UI/Components/UserMan.razor.cs
index 938df8d..7cd7945 100644
--- a/MagMan.UI/Components/UserMan.razor.cs
+++ b/MagMan.UI/Components/UserMan.razor.cs
@@ -193,18 +193,18 @@ namespace MagMan.UI.Components
             await GetUsers();
         }
 
-        protected void SetNumRec(int newNum)
+        protected async Task SetNumRec(int newNum)
         {
             numRecord = newNum;
             currPage = 1;
-            InvokeAsync(ReloadData);
+           await InvokeAsync(ReloadData);
         }
 
-        protected void SetPage(int newNum)
+        protected async Task SetPage(int newNum)
         {
             currPage = newNum;
             DoSelect(null);
-            InvokeAsync(ReloadData);
+            await InvokeAsync(ReloadData);
         }
 
         #endregion Protected Methods
diff --git a/MagMan.UI/MagMan.UI.csproj b/MagMan.UI/MagMan.UI.csproj
index 6431e4e..b021b05 100644
--- a/MagMan.UI/MagMan.UI.csproj
+++ b/MagMan.UI/MagMan.UI.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
-        <Version>1.0.2407.0314</Version>
+        <Version>1.0.2407.0415</Version>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
         <EnableNETAnalyzers>true</EnableNETAnalyzers>
diff --git a/Resources/ChangeLog.html b/Resources/ChangeLog.html
index 5f6795e..e34003f 100644
--- a/Resources/ChangeLog.html
+++ b/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>MagMan - Wood Warehouse Management System</i>
-    <h4>Versione: 1.0.2407.0314</h4>
+    <h4>Versione: 1.0.2407.0415</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/Resources/VersNum.txt b/Resources/VersNum.txt
index a1667eb..f66014a 100644
--- a/Resources/VersNum.txt
+++ b/Resources/VersNum.txt
@@ -1 +1 @@
-1.0.2407.0314
+1.0.2407.0415
diff --git a/Resources/manifest.xml b/Resources/manifest.xml
index d372811..3cc527b 100644
--- a/Resources/manifest.xml
+++ b/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>1.0.2407.0314</version>
+  <version>1.0.2407.0415</version>
   <url>http://nexus.steamware.net/repository/SWS/MagMan/stable/0/MagMan.UI.zip</url>
   <changelog>http://nexus.steamware.net/repository/SWS/MagMan/stable/0/ChangeLog.html</changelog>
   <mandatory>false</mandatory>