diff --git a/IOB-WIN/IobConfiguration.cs b/IOB-WIN/IobConfiguration.cs
index 6aea558a..a037c660 100644
--- a/IOB-WIN/IobConfiguration.cs
+++ b/IOB-WIN/IobConfiguration.cs
@@ -170,7 +170,7 @@ namespace IOB_WIN
MPURL = MPURL_;
CMDBASE = CMDBASE_;
CMDFLOG = CMDFLOG_;
- CMDBASE_JSON = CMDBASE_.Replace("input", "inputJson");
+ CMDBASE_JSON = CMDBASE_.Replace("input", "evListJson");
CMDFLOG_JSON = CMDFLOG_.Replace("flog", "flogJson");
CMDALIVE = CMDALIVE_;
CMDENABLED = CMDENABLED_;
diff --git a/IOB-WIN/IobGeneric.cs b/IOB-WIN/IobGeneric.cs
index cdd8ff47..74451d1d 100644
--- a/IOB-WIN/IobGeneric.cs
+++ b/IOB-WIN/IobGeneric.cs
@@ -2493,7 +2493,7 @@ namespace IOB_WIN
///
/// Restituisce un payload in formato json della lista di valori ricevuta
///
- /// Tipo di URL (eventi / FLog
+ /// Tipo di URL (eventi / FLog)
/// elenco di valori da coda string salvata
///
public string jsonPayload(urlType tipoUrl, List elencoValori)
@@ -2502,7 +2502,7 @@ namespace IOB_WIN
if (tipoUrl == urlType.FLog)
{
flogData currData = new flogData();
- flogJson fullObj = new flogJson();
+ flogJsonPayload fullObj = new flogJsonPayload();
fullObj.fluxData = new List();
string[] valori;
int counter = 0;
@@ -2536,8 +2536,39 @@ namespace IOB_WIN
}
}
else
- {
- // !!!FIXME!!! fare x invio dati normali...
+ {
+ evData currData = new evData();
+ evJsonPayload fullObj = new evJsonPayload();
+ fullObj.eventList = new List();
+ string[] valori;
+ int counter = 0;
+ DateTime dtEve = DateTime.Now;
+ // inizio processando ogni valore
+ foreach (var item in elencoValori)
+ {
+ valori = qDecodeIN(item);
+ //DateTime.TryParse(valori[0], out dtEve);
+ CultureInfo provider = CultureInfo.InvariantCulture;
+ DateTime.TryParseExact(valori[0], "yyyyMMddHHmmssfff", provider, DateTimeStyles.AssumeLocal, out dtEve);
+ int.TryParse(valori[2], out counter);
+ currData = new evData()
+ {
+ valore = valori[1],
+ dtEve = dtEve,
+ dtCurr = DateTime.Now,
+ cnt = counter
+ };
+ fullObj.eventList.Add(currData);
+ }
+ // conversione finale
+ try
+ {
+ answ = JsonConvert.SerializeObject(fullObj);
+ }
+ catch (Exception exc)
+ {
+ lgError($"Errore in costruzione jsonPayload:{Environment.NewLine}{exc}");
+ }
}
return answ;
}