Egalware/MoonPro.net
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v1035: fix resoconti x deserializzazione tabelle

Browse Source
This commit is contained in:
Samuele E. Locatelli
2018-12-07 13:20:32 +01:00
parent 92226b730e
commit 4bf9022976
2 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jenkinsfile
Vendored
+1 -1
View File
@@ -18,7 +18,7 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=1034']) {
withEnv(['NEXT_BUILD_NUMBER=1035']) {
// env.versionNumber = VersionNumber(versionNumberString : '6.2.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '6.2.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'MAPO'
MapoDb/resoconti.cs
+21 -15
View File
@@ -110,11 +110,14 @@ public class resoconti
if (!memLayer.ML.isInCacheObject("StatoMacchine"))
{
_StatoMacchine = taStatoMacchine.GetData();
SteamWare.memLayer.ML.setCacheVal("StatoMacchine", _StatoMacchine, true);
string serVal = JsonConvert.SerializeObject(_StatoMacchine);
memLayer.ML.setCacheVal("StatoMacchine", serVal, true);
}
else
{
_StatoMacchine = (MapoDb.DS_applicazione.StatoMacchineDataTable)SteamWare.memLayer.ML.objCacheObj("StatoMacchine");
string redKey = memLayer.ML.redHash("StatoMacchine");
string serVal = memLayer.ML.getRSV(redKey);
_StatoMacchine = JsonConvert.DeserializeObject<DS_applicazione.StatoMacchineDataTable>(serVal);
}
return _StatoMacchine;
}
@@ -161,16 +164,16 @@ public class resoconti
get
{
if (!memLayer.ML.isInCacheObject("AnagraficaEventi"))
//if (HttpContext.Current.Cache["AnagraficaEventi"] == null)
{
_AnagraficaEventi = taAnagraficaEventi.GetData();
SteamWare.memLayer.ML.setCacheVal("AnagraficaEventi", _AnagraficaEventi, true);
//HttpContext.Current.Cache["AnagraficaEventi"] = _AnagraficaEventi;
string serVal = JsonConvert.SerializeObject(_AnagraficaEventi);
memLayer.ML.setCacheVal("AnagraficaEventi", serVal, true);
}
else
{
_AnagraficaEventi = (MapoDb.DS_applicazione.AnagraficaEventiDataTable)SteamWare.memLayer.ML.objCacheObj("AnagraficaEventi");
//_AnagraficaEventi = (MapoDb.DS_applicazione.AnagraficaEventiDataTable)HttpContext.Current.Cache["AnagraficaEventi"];
string redKey = memLayer.ML.redHash("AnagraficaEventi");
string serVal = memLayer.ML.getRSV(redKey);
_AnagraficaEventi = JsonConvert.DeserializeObject<DS_applicazione.AnagraficaEventiDataTable>(serVal);
}
return _AnagraficaEventi;
}
@@ -184,11 +187,14 @@ public class resoconti
if (!memLayer.ML.isInCacheObject("AnagArt"))
{
_AnagArt = taAnagArt.GetData();
SteamWare.memLayer.ML.setCacheVal("AnagArt", _AnagArt, true);
string serVal = JsonConvert.SerializeObject(_AnagArt);
memLayer.ML.setCacheVal("AnagArt", serVal, true);
}
else
{
_AnagArt = (MapoDb.DS_applicazione.AnagArticoliDataTable)SteamWare.memLayer.ML.objCacheObj("AnagArt");
string redKey = memLayer.ML.redHash("AnagArt");
string serVal = memLayer.ML.getRSV(redKey);
_AnagArt = JsonConvert.DeserializeObject<DS_applicazione.AnagArticoliDataTable>(serVal);
}
return _AnagArt;
}
@@ -200,16 +206,16 @@ public class resoconti
get
{
if (!memLayer.ML.isInCacheObject("AnagOpr"))
//if (HttpContext.Current.Cache["AnagOpr"] == null)
{
_AnagOpr = taAnagOpr.GetData();
SteamWare.memLayer.ML.setCacheVal("AnagOpr", _AnagOpr, true);
//HttpContext.Current.Cache["AnagOpr"] = _AnagOpr;
string serVal = JsonConvert.SerializeObject(_AnagOpr);
memLayer.ML.setCacheVal("AnagOpr", serVal, true);
}
else
{
_AnagOpr = (MapoDb.DS_applicazione.AnagraficaOperatoriDataTable)SteamWare.memLayer.ML.objCacheObj("AnagOpr");
//_AnagOpr = (MapoDb.DS_applicazione.AnagraficaOperatoriDataTable)HttpContext.Current.Cache["AnagOpr"];
string redKey = memLayer.ML.redHash("AnagOpr");
string serVal = memLayer.ML.getRSV(redKey);
_AnagOpr = JsonConvert.DeserializeObject<DS_applicazione.AnagraficaOperatoriDataTable>(serVal);
}
return _AnagOpr;
}
@@ -249,7 +255,7 @@ public class resoconti
/// </summary>
private void setConnString()
{
string _connectionString = SteamWare.memLayer.ML.confReadString("MoonProConnectionString");
string _connectionString = memLayer.ML.confReadString("MoonProConnectionString");
taMacchine.Connection.ConnectionString = _connectionString;
taStatoMacchine.Connection.ConnectionString = _connectionString;
taStati.Connection.ConnectionString = _connectionString;