From 013b21e055e025b6b8490c3f457d96a44688c22e Mon Sep 17 00:00:00 2001
From: "zaccaria.majid" <zaccaria.majid@egalware.com>
Date: Wed, 12 Oct 2022 11:48:51 +0200
Subject: [PATCH] Fix serializzazione valori edit

---
 MP.SPEC/Components/ListDossiers.razor | 22 ++++++++++++++--------
 MP.SPEC/Data/MpDataService.cs         | 11 ++++++++++-
 MP.SPEC/MP.SPEC.csproj                |  2 +-
 MP.SPEC/Pages/DOSS.razor              |  2 +-
 MP.SPEC/Resources/ChangeLog.html      |  2 +-
 MP.SPEC/Resources/VersNum.txt         |  2 +-
 MP.SPEC/Resources/manifest.xml        |  2 +-
 7 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/MP.SPEC/Components/ListDossiers.razor b/MP.SPEC/Components/ListDossiers.razor
index d7072da0..165d0493 100644
--- a/MP.SPEC/Components/ListDossiers.razor
+++ b/MP.SPEC/Components/ListDossiers.razor
@@ -79,7 +79,13 @@ else
                                     <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> Data Type</th>
-                                    <th class="d-flex justify-content-between"> Valore <button class="btn btn-primary btn-sm py-0" @onclick="() => unToggleTableFlux()"><i class="fa-solid fa-xmark"></i></button></th>
+                                    <th>
+                                        <div class="d-flex justify-content-between col-12">
+                                            <span class="col-6" style="text-align: right;"> Valore </span>
+                                            <button class="btn btn-primary btn-sm py-0" @onclick="() => unToggleTableFlux()"><i class="fa-solid fa-xmark"></i></button>
+
+                                        </div>
+                                    </th>
                                 </tr>
                             </thead>
                             <tbody>
@@ -88,7 +94,7 @@ else
                                     <tr>
                                         <td>
                                             <button @onclick="() => editRecord(record)" class="btn btn-primary btn-sm" title="Modifica Record"><i class="bi bi-pencil-square"></i></button>
-                                            </td>
+                                        </td>
                                         <td>
                                             @record.IdxMacchina
                                         </td>
@@ -98,13 +104,13 @@ else
                                         <td>
                                             @record.CodFlux
                                         </td>
-                                        <td style="text-align: right;">
-                                            <div><b>@record.Valore</b></div>
-                                            <div class="small text-secondary"><i>@record.Valore</i></div>
+                                        <td style="text-align: center;">
+                                            <div><span class="small text-dark">Modificato:  </span><b>@record.ValoreEdit</b></div>
+                                            <div class="small text-secondary"><span class="small text-dark">Originale:  </span><i>@record.Valore</i></div>
                                             @*@if (ListRecordsMod != null)
-                                            {
-                                                <div>@findRec(record)</div>
-                                            }*@
+                            {
+                            <div>@findRec(record)</div>
+                            }*@
                                         </td>
                                     </tr>
                                 }
diff --git a/MP.SPEC/Data/MpDataService.cs b/MP.SPEC/Data/MpDataService.cs
index dd7e207d..261bd042 100644
--- a/MP.SPEC/Data/MpDataService.cs
+++ b/MP.SPEC/Data/MpDataService.cs
@@ -319,7 +319,16 @@ namespace MP.SPEC.Data
 
 
                 // serializzo nuovamente valore
-                string rawVal = JsonConvert.SerializeObject(fluxLogList);
+                DossierFluxLogDTO? result = new DossierFluxLogDTO();
+                var ODLflux = result.ODL.ToList();
+                foreach (var item in fluxLogList)
+                {
+                    ODLflux.Add(item);
+                }
+
+                DossierFluxLogDTO updatedResult = new DossierFluxLogDTO(){ODL = ODLflux};
+
+                string rawVal = JsonConvert.SerializeObject(updatedResult);
                 currDoss.Valore = rawVal;
                 // aggiorno record sul DB
                 await dbController.DossiersUpdateValore(currDoss);
diff --git a/MP.SPEC/MP.SPEC.csproj b/MP.SPEC/MP.SPEC.csproj
index bdfe044b..01230682 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.16.2210.1206</Version>
+    <Version>6.16.2210.1210</Version>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/MP.SPEC/Pages/DOSS.razor b/MP.SPEC/Pages/DOSS.razor
index 8fba837a..5cbf93c3 100644
--- a/MP.SPEC/Pages/DOSS.razor
+++ b/MP.SPEC/Pages/DOSS.razor
@@ -50,7 +50,7 @@
                                 <div class="col-3 pe-0">
                                     <div class="input-group input-group-sm">
                                         <span class="input-group-text" id="inputGroup-sizing-sm">VALORE</span>
-                                        <input type="text" class="form-control" aria-label="Art search" aria-describedby="inputGroup-sizing-sm" @bind-value="@currDetFluxLogRecord.Valore">
+                                        <input type="text" class="form-control" aria-label="Art search" aria-describedby="inputGroup-sizing-sm" @bind-value="@currDetFluxLogRecord.ValoreEdit">
                                     </div>
                                 </div>
                             </div>
diff --git a/MP.SPEC/Resources/ChangeLog.html b/MP.SPEC/Resources/ChangeLog.html
index afc8d3f7..196b7af4 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.16.2210.1206</h4>
+    <h4>Versione: 6.16.2210.1210</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/MP.SPEC/Resources/VersNum.txt b/MP.SPEC/Resources/VersNum.txt
index eb9b1182..5c9a452b 100644
--- a/MP.SPEC/Resources/VersNum.txt
+++ b/MP.SPEC/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2210.1206
+6.16.2210.1210
diff --git a/MP.SPEC/Resources/manifest.xml b/MP.SPEC/Resources/manifest.xml
index 7a1c0a7e..ea4be891 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.16.2210.1206</version>
+  <version>6.16.2210.1210</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>