Egalware/mapo-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix deserializzazione oggetto fluxlog

Browse Source
This commit is contained in:
zaccaria.majid
2022-09-20 17:35:45 +02:00
parent 601c817aa2
commit d3b8160634
8 changed files with 62 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP.Data/DTO/DossierFluxLogDTO.cs
+14
View File
@@ -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>();
}
}
MP.SPEC/Components/ListDossiers.razor
+36 -32
View File
@@ -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>
MP.SPEC/Components/ListDossiers.razor.cs
+2 -2
View File
@@ -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
MP.SPEC/Data/MpDataService.cs
+6 -3
View File
@@ -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>
MP.SPEC/MP.SPEC.csproj
+1 -1
View File
@@ -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>
MP.SPEC/Resources/ChangeLog.html
+1 -1
View File
@@ -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>
MP.SPEC/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
6.15.2209.2016
6.15.2209.2017
MP.SPEC/Resources/manifest.xml
+1 -1
View File
@@ -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>