diff --git a/C-TRACK/Web.config b/C-TRACK/Web.config
index 493b869..f6c158c 100644
--- a/C-TRACK/Web.config
+++ b/C-TRACK/Web.config
@@ -30,7 +30,7 @@
-
+
@@ -45,16 +45,19 @@
-
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
diff --git a/C-TRACK/WebUserControls/mod_taskList.ascx b/C-TRACK/WebUserControls/mod_taskList.ascx
index 403de2a..ae0e73b 100644
--- a/C-TRACK/WebUserControls/mod_taskList.ascx
+++ b/C-TRACK/WebUserControls/mod_taskList.ascx
@@ -59,7 +59,7 @@
diff --git a/C-TRACK/barcode.aspx.cs b/C-TRACK/barcode.aspx.cs
index 3c7beef..c3f65e8 100644
--- a/C-TRACK/barcode.aspx.cs
+++ b/C-TRACK/barcode.aspx.cs
@@ -1,4 +1,5 @@
using AppData;
+using Newtonsoft.Json;
using SteamWare;
using System;
using System.Collections.Generic;
@@ -278,13 +279,17 @@ namespace C_TRACK
bool valIncache = memLayer.ML.isInCacheObject("valoriAmmessiBCode");
if (valIncache && cacheValida)
{
- answ = (Dictionary)memLayer.ML.objCacheObj("valoriAmmessiBCode");
+ answ = JsonConvert.DeserializeObject>(memLayer.ML.objCacheObj("valoriAmmessiBCode").ToString());
+#if false
+ answ = (Dictionary)memLayer.ML.objCacheObj("valoriAmmessiBCode");
+#endif
}
return answ;
}
set
{
- memLayer.ML.setCacheVal("valoriAmmessiBCode", value);
+ string serVal = JsonConvert.SerializeObject(value);
+ memLayer.ML.setCacheVal("valoriAmmessiBCode", serVal);
lastDataRefresh = DateTime.Now;
}
}
@@ -300,7 +305,10 @@ namespace C_TRACK
{
try
{
- answ = (Dictionary)memLayer.ML.objCacheObj("comandiAmmessiBCode");
+ answ = JsonConvert.DeserializeObject>(memLayer.ML.objCacheObj("comandiAmmessiBCode").ToString());
+#if false
+ answ = (Dictionary)memLayer.ML.objCacheObj("comandiAmmessiBCode");
+#endif
}
catch
{
@@ -311,7 +319,8 @@ namespace C_TRACK
}
set
{
- memLayer.ML.setCacheVal("comandiAmmessiBCode", value);
+ string serVal = JsonConvert.SerializeObject(value);
+ memLayer.ML.setCacheVal("comandiAmmessiBCode", serVal);
lastDataRefresh = DateTime.Now;
}
}
@@ -415,15 +424,6 @@ namespace C_TRACK
comandi.Add(rigaFase.CodFase, rigaFase.DescrFase);
}
-
-#if false
- XPS_data.DS_applicazioneTableAdapters.TraEv2StatiTableAdapter taTrEv2St = new XPS_data.DS_applicazioneTableAdapters.TraEv2StatiTableAdapter();
- DS_applicazione.TraEv2StatiDataTable _tabTran = taTrEv2St.getByCodMappa("E_BC");
- foreach (DS_applicazione.TraEv2StatiRow riga in _tabTran)
- {
- comandi.Add(riga.CodEvento, user_std.UtSn.Traduci(riga.text2show));
- }
-#endif
// impongo i comandi al barcode...
mod_barcode1.comandiAmmessi = comandi;
comandiAmmessiBCode = comandi;