From d3b81606349c5d539a36df409e21d43dfe3477b5 Mon Sep 17 00:00:00 2001
From: "zaccaria.majid" <zaccaria.majid@egalware.com>
Date: Tue, 20 Sep 2022 17:35:45 +0200
Subject: [PATCH] fix deserializzazione oggetto fluxlog

---
 MP.Data/DTO/DossierFluxLogDTO.cs         | 14 +++++
 MP.SPEC/Components/ListDossiers.razor    | 68 +++++++++++++-----------
 MP.SPEC/Components/ListDossiers.razor.cs |  4 +-
 MP.SPEC/Data/MpDataService.cs            |  9 ++--
 MP.SPEC/MP.SPEC.csproj                   |  2 +-
 MP.SPEC/Resources/ChangeLog.html         |  2 +-
 MP.SPEC/Resources/VersNum.txt            |  2 +-
 MP.SPEC/Resources/manifest.xml           |  2 +-
 8 files changed, 62 insertions(+), 41 deletions(-)
 create mode 100644 MP.Data/DTO/DossierFluxLogDTO.cs

diff --git a/MP.Data/DTO/DossierFluxLogDTO.cs b/MP.Data/DTO/DossierFluxLogDTO.cs
new file mode 100644
index 00000000..37cc8819
--- /dev/null
+++ b/MP.Data/DTO/DossierFluxLogDTO.cs
@@ -0,0 +1,14 @@
+using MP.Data.DatabaseModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MP.Data.DTO
+{
+    public class DossierFluxLogDTO
+    {
+        public List<FluxLog> ODL { get; set; } = new List<FluxLog>();
+    }
+}
diff --git a/MP.SPEC/Components/ListDossiers.razor b/MP.SPEC/Components/ListDossiers.razor
index d1be262a..0001cc13 100644
--- a/MP.SPEC/Components/ListDossiers.razor
+++ b/MP.SPEC/Components/ListDossiers.razor
@@ -52,40 +52,44 @@ else
 
             @if (!visualizzaFlux)
             {
-                <table class="table table-sm table-striped small">
-                    <thead>
-                        <tr>
-                            <th><i class="fa-solid fa-hard-drive"></i> Macchina</th>
-                            <th><i class="fa-regular fa-calendar-days"></i> Data</th>
-                            <th><i class="fa-solid fa-sliders"></i> ODL</th>
-                            <th><i class="fa-solid fa-sliders"></i> DATA TYPE</th>
-                            <th></th>
-                        </tr>
-                    </thead>
-                    <tbody>
-                        @foreach (var record in ListRecords)
-                        {
+                if(listaFlux == null)
+                {
+                    <div class="alert alert-warning text-center display-4">Nessun record trovato</div>
+                }
+                else
+                {
+                    <table class="table table-sm table-striped small">
+                        <thead>
                             <tr>
-                                <td>
-                                    @record.IdxMacchina
-                                </td>
-                                <td>
-                                    @record.DtRif
-                                </td>
-                                <td>
-                                    @record.IdxODL
-                                </td>
-                                <td>
-                                    @record.DataType
-                                </td>
+                                <th><i class="fa-solid fa-hard-drive"></i> Macchina</th>
+                                <th><i class="fa-regular fa-calendar-days"></i> Data</th>
+                                <th><i class="fa-solid fa-sliders"></i> ODL</th>
+                                <th><i class="fa-solid fa-sliders"></i> DATA TYPE</th>
+                                <th></th>
                             </tr>
-                        }
-                    </tbody>
-                </table>
-            }
-            else
-            {
-
+                        </thead>
+                        <tbody>
+                            @foreach (var record in listaFlux)
+                            {
+                                <tr>
+                                    <td>
+                                        @record.IdxMacchina
+                                    </td>
+                                    <td>
+                                        @record.dtEvento
+                                    </td>
+                                    <td>
+                                        @record.CodFlux
+                                    </td>
+                                    <td>
+                                        @record.Valore
+                                    </td>
+                                </tr>
+                            }
+                        </tbody>
+                    </table>
+                }
+               
             }
         </div>
     </div>
diff --git a/MP.SPEC/Components/ListDossiers.razor.cs b/MP.SPEC/Components/ListDossiers.razor.cs
index 115e4281..0f64796e 100644
--- a/MP.SPEC/Components/ListDossiers.razor.cs
+++ b/MP.SPEC/Components/ListDossiers.razor.cs
@@ -145,7 +145,7 @@ namespace MP.SPEC.Components
         {
             currRecord = selRec;
             await RecordSel.InvokeAsync(selRec);
-            //listaFlux = MDService.convertToFluxLog(selRec.Valore);
+            listaFlux = MDService.convertToFluxLog(selRec.Valore);
             toggleTableFlux();
         }
 
@@ -174,7 +174,7 @@ namespace MP.SPEC.Components
         private Dossiers? currRecord = null;
         private List<Dossiers>? ListRecords;
         private List<Dossiers>? SearchRecords;
-        private FluxLog? listaFlux;
+        private List<FluxLog>? listaFlux { get; set; } = null;
 
         #endregion Private Fields
 
diff --git a/MP.SPEC/Data/MpDataService.cs b/MP.SPEC/Data/MpDataService.cs
index a14b4c6e..7c1ba04f 100644
--- a/MP.SPEC/Data/MpDataService.cs
+++ b/MP.SPEC/Data/MpDataService.cs
@@ -1,6 +1,7 @@
 using MP.Data;
 using MP.Data.Conf;
 using MP.Data.DatabaseModels;
+using MP.Data.DTO;
 using Newtonsoft.Json;
 using NLog;
 using StackExchange.Redis;
@@ -322,10 +323,12 @@ namespace MP.SPEC.Data
 
             return await Task.FromResult(dbController.DossiersGetLastFilt(IdxMacchina, DtRef, MaxRec));
         }
-        public FluxLog convertToFluxLog(string Valore)
+        public List<FluxLog> convertToFluxLog(string Valore)
         {
-            var result = JsonConvert.DeserializeObject<FluxLog>(Valore);
-            return result;
+            //string valStriped = Valore.Substring(7, Valore.Length - 8);
+            //var result = JsonConvert.DeserializeObject<List<FluxLog>>(valStriped);
+            var result = JsonConvert.DeserializeObject<DossierFluxLogDTO>(Valore);
+            return result.ODL;
         }
 
         /// <summary>
diff --git a/MP.SPEC/MP.SPEC.csproj b/MP.SPEC/MP.SPEC.csproj
index 63ca7221..33a0391f 100644
--- a/MP.SPEC/MP.SPEC.csproj
+++ b/MP.SPEC/MP.SPEC.csproj
@@ -5,7 +5,7 @@
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <RootNamespace>MP.SPEC</RootNamespace>
-    <Version>6.15.2209.2016</Version>
+    <Version>6.15.2209.2017</Version>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/MP.SPEC/Resources/ChangeLog.html b/MP.SPEC/Resources/ChangeLog.html
index 372b1bb7..2a289b2f 100644
--- a/MP.SPEC/Resources/ChangeLog.html
+++ b/MP.SPEC/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>Modulo MAPOSPEC </i>
-    <h4>Versione: 6.15.2209.2016</h4>
+    <h4>Versione: 6.15.2209.2017</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/MP.SPEC/Resources/VersNum.txt b/MP.SPEC/Resources/VersNum.txt
index f405cd8e..dd429b18 100644
--- a/MP.SPEC/Resources/VersNum.txt
+++ b/MP.SPEC/Resources/VersNum.txt
@@ -1 +1 @@
-6.15.2209.2016
+6.15.2209.2017
diff --git a/MP.SPEC/Resources/manifest.xml b/MP.SPEC/Resources/manifest.xml
index 41dafeb0..0f75efa3 100644
--- a/MP.SPEC/Resources/manifest.xml
+++ b/MP.SPEC/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.15.2209.2016</version>
+  <version>6.15.2209.2017</version>
   <url>https://nexus.steamware.net/repository/SWS/MP-SPEC/stable/LAST/MP.SPEC.zip</url>
   <changelog>https://nexus.steamware.net/repository/SWS/MP-SPEC/stable/LAST/ChangeLog.html</changelog>
   <mandatory>false</mandatory>