From 6e08fda57f75b2fe77ca9afad760bd88a529c5c0 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Tue, 13 Feb 2024 10:27:36 +0100
Subject: [PATCH] Fix display info x NegotDocMover

---
 SHERPA.AD/SHERPA.AD.csproj                    |  2 +-
 SHERPA.BBM.CORE/DbModels/vDocsDataModel.cs    |  6 +++++
 SHERPA.BBM.CORE/DbModels/vItemsDataModel.cs   |  3 +++
 .../SqlScripts/VIEW/v_ItemsData.sql           |  3 +++
 SHERPA.BBM.UI/Components/DocMovList.razor     | 18 +++++++-------
 SHERPA.BBM.UI/Components/NegotMovList.razor   | 24 ++++++++++++-------
 SHERPA.BBM.UI/Pages/Items.razor               |  4 ++--
 SHERPA.BBM.UI/SHERPA.BBM.UI.csproj            |  2 +-
 8 files changed, 41 insertions(+), 21 deletions(-)

diff --git a/SHERPA.AD/SHERPA.AD.csproj b/SHERPA.AD/SHERPA.AD.csproj
index f1d12f2..c8f5c9e 100644
--- a/SHERPA.AD/SHERPA.AD.csproj
+++ b/SHERPA.AD/SHERPA.AD.csproj
@@ -4,7 +4,7 @@
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
-    <Version>2.0.2402.1308</Version>
+    <Version>2.0.2402.1310</Version>
     <Copyright>Egalware 2021+</Copyright>
   </PropertyGroup>
 
diff --git a/SHERPA.BBM.CORE/DbModels/vDocsDataModel.cs b/SHERPA.BBM.CORE/DbModels/vDocsDataModel.cs
index 4a5a028..39f1378 100644
--- a/SHERPA.BBM.CORE/DbModels/vDocsDataModel.cs
+++ b/SHERPA.BBM.CORE/DbModels/vDocsDataModel.cs
@@ -57,6 +57,12 @@ namespace SHERPA.BBM.CORE.DbModels
         [Column("BasketId")]
         public int BasketId { get; set; } = 0;
 
+        [Column("CodBasket")]
+        public string CodBasket { get; set; } = "";
+
+        [Column("DescBasket")]
+        public string DescBasket { get; set; } = "";
+
         [Column("RagSoc")]
         public string RagSoc { get; set; } = "";
 
diff --git a/SHERPA.BBM.CORE/DbModels/vItemsDataModel.cs b/SHERPA.BBM.CORE/DbModels/vItemsDataModel.cs
index 4bc03cc..d1f7aa2 100644
--- a/SHERPA.BBM.CORE/DbModels/vItemsDataModel.cs
+++ b/SHERPA.BBM.CORE/DbModels/vItemsDataModel.cs
@@ -27,6 +27,9 @@ namespace SHERPA.BBM.CORE.DbModels
         [Column("ResTypeId")]
         public int ResTypeId { get; set; } = 0;
 
+        [Column("ResName")]
+        public string ResName { get; set; } = "";
+
         [Column("UM"), MaxLength(50)]
         public string UM { get; set; } = "nr";
 
diff --git a/SHERPA.BBM.CORE/SqlScripts/VIEW/v_ItemsData.sql b/SHERPA.BBM.CORE/SqlScripts/VIEW/v_ItemsData.sql
index f336097..d8ef235 100644
--- a/SHERPA.BBM.CORE/SqlScripts/VIEW/v_ItemsData.sql
+++ b/SHERPA.BBM.CORE/SqlScripts/VIEW/v_ItemsData.sql
@@ -5,6 +5,7 @@
 CREATE OR ALTER VIEW [dbo].[v_ItemsData]
 AS
 
+
 WITH cteOrdRes AS
 (
 	SELECT	o.ItemId
@@ -28,6 +29,7 @@ WITH cteOrdRes AS
 )
 
 SELECT	 i.*
+		,ISNULL(r.Name, i.ResTypeId) AS ResName
 		,ISNULL(d.DocNum,0) AS DocNumRef
 		,ISNULL(o.OrdNum,0) AS OrdNumRef
 		,ISNULL(t.TagNum,0) AS TagsNumRef
@@ -35,6 +37,7 @@ FROM dbo.Items AS i
 	LEFT OUTER JOIN cteOrdRes	AS o ON i.ItemId = o.ItemId
 	LEFT OUTER JOIN cteDoc		AS d ON i.ItemId = d.ItemId
 	LEFT OUTER JOIN cteTag		AS t ON i.ItemId = t.ItemId
+	LEFT OUTER JOIN ResType		AS r ON i.ResTypeId = r.ResTypeId
 
 GO
 
diff --git a/SHERPA.BBM.UI/Components/DocMovList.razor b/SHERPA.BBM.UI/Components/DocMovList.razor
index d5aebb3..c341ad3 100644
--- a/SHERPA.BBM.UI/Components/DocMovList.razor
+++ b/SHERPA.BBM.UI/Components/DocMovList.razor
@@ -10,7 +10,6 @@
             <th>Cod</th>
             <th>Descrizione</th>
             <th class="text-right">Importo</th>
-            <th class="text-right">Fatturazione</th>
         </tr>
     </thead>
     <tbody>
@@ -20,20 +19,21 @@
                 <td class="text-nowrap">
                     <button class="btn btn-sm btn-info" @onclick="() => Move(record)"><span class="fas fa-arrows-alt-h"></span></button>
                 </td>
-                <td>
-                    <div title="@record.NegotDescript">@record.CodNegotiation</div>
-                    <div>@record.CodDoc</div>
-                    @*<div class="small">@record.DataIns.ToString("ddd yyyy.MM.dd HH:mm")</div>*@
+                <td class="text-nowrap">
+                    <div>@record.RagSoc</div>
+                    <div class="small" title="@record.DescBasket">@record.CodBasket</div>
+                    <div class="small" title="@record.NegotDescript">@record.CodNegotiation</div>
+                    <div class="small">@record.CodDoc</div>
                 </td>
                 <td>
                     <div>@record.Descript</div>
                     <div class="small">@record.Note</div>
                 </td>
-                <td class="text-right text-nowrap" title="Importo"><b>@record.Importo.ToString("C2")</b></td>
-                <td class="text-right text-nowrap">
-                    @if (record.DocType == BbmDocType.ConfermaOrdine)
+                <td class="text-right text-nowrap" title="Importo">
+                    <b>@record.Importo.ToString("C2")</b>
+                    @if (record.Fatturato > 0)
                     {
-                        <div title="Fatturato"><b>@record.Fatturato.ToString("C2")</b> [F]</div>
+                        <div title="Fatturato" class="small">@record.Fatturato.ToString("C2") [F]</div>
                         <div title="Incassato" class="small">@record.Incassato.ToString("C2") [I]</div>
                     }
                 </td>
diff --git a/SHERPA.BBM.UI/Components/NegotMovList.razor b/SHERPA.BBM.UI/Components/NegotMovList.razor
index 5fd0c7a..b13db14 100644
--- a/SHERPA.BBM.UI/Components/NegotMovList.razor
+++ b/SHERPA.BBM.UI/Components/NegotMovList.razor
@@ -7,10 +7,9 @@
     <thead>
         <tr>
             <th></th>
-            <th>Cod</th>
+            <th>Cli/Bask/Trat</th>
             <th>Descrizione</th>
             <th class="text-right">Importo</th>
-            <th class="text-right">Fatturazione</th>
         </tr>
     </thead>
     <tbody>
@@ -20,17 +19,26 @@
                 <td class="text-nowrap">
                     <button class="btn btn-sm btn-info" @onclick="() => Move(record)"><span class="fas fa-arrows-alt-h"></span></button>
                 </td>
-                <td>
+                <td class="text-nowrap">
                     <div>@record.RagSoc</div>
-                    <div>@record.CodNegotiation</div>
-                    <div class="small">@record.DataIns.ToString("ddd yyyy.MM.dd HH:mm")</div>
+                    <div class="small" title="@record.BaskDescript">@record.CodBasket</div>
+                    <div class="small">@record.CodNegotiation</div>
                 </td>
                 <td>
                     <div>@record.Descript</div>
-                    <div class="small">@record.NumDocs</div>
+                    <div class="small d-flex justify-content-between">
+                        <div>
+                            @record.DataIns.ToString("ddd yyyy.MM.dd HH:mm")
+                        </div>
+                        <div>
+                            #doc: <b>@record.NumDocs</b>
+                        </div>
+                    </div>
+                </td>
+                <td class="text-right text-nowrap" title="Importo">
+                    <b>@record.Importo.ToString("C2")</b>
+                    <div title="Fatturato" class="small">@record.Fatturato.ToString("C2") [F]</div>
                 </td>
-                <td class="text-right text-nowrap" title="Importo"><b>@record.Importo.ToString("C2")</b></td>
-                <td class="text-right text-nowrap" title="Fatturato"><b>@record.Fatturato.ToString("C2")</b></td>
             </tr>
         }
     </tbody>
diff --git a/SHERPA.BBM.UI/Pages/Items.razor b/SHERPA.BBM.UI/Pages/Items.razor
index 93dbf40..9245318 100644
--- a/SHERPA.BBM.UI/Pages/Items.razor
+++ b/SHERPA.BBM.UI/Pages/Items.razor
@@ -75,7 +75,7 @@
                             <Sorter ParamName="Cod" IsAsc="@sortAsc" CurrParam="@sortField" sortReq="SortRequested"></Sorter>
                         </th>
                         <th>
-                            Tipo
+                            Categoria
                             <Sorter ParamName="Tipo" IsAsc="@sortAsc" CurrParam="@sortField" sortReq="SortRequested"></Sorter>
                         </th>
                         <th>
@@ -119,7 +119,7 @@
                                 }
                             </td>
                             <td>@record.CodItem</td>
-                            <td>@record.ResTypeId</td>
+                            <td>@record.ResName</td>
                             <td>@record.UM</td>
                             <td>@record.Descript</td>
                             <td class="text-right">
diff --git a/SHERPA.BBM.UI/SHERPA.BBM.UI.csproj b/SHERPA.BBM.UI/SHERPA.BBM.UI.csproj
index 7f65e5a..270c7a1 100644
--- a/SHERPA.BBM.UI/SHERPA.BBM.UI.csproj
+++ b/SHERPA.BBM.UI/SHERPA.BBM.UI.csproj
@@ -4,7 +4,7 @@
     <TargetFramework>net6.0</TargetFramework>
     <UserSecretsId>60fcdaab-6c1e-4bec-9d88-f7727ef1c12c</UserSecretsId>
     <ApplicationIcon>wwwroot\favicon.ico</ApplicationIcon>
-    <Version>2.0.2402.1308</Version>
+    <Version>2.0.2402.1310</Version>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <Copyright>Egalware 2021+</Copyright>