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

Fix MON x gestione all/singola macchina

Browse Source
This commit is contained in:
Samuele E. Locatelli
2018-10-15 17:25:29 +02:00
parent 847c284cc0
commit ab10c528d2
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jenkinsfile
Vendored
+1 -1
View File
@@ -17,7 +17,7 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=861']) {
withEnv(['NEXT_BUILD_NUMBER=862']) {
// env.versionNumber = VersionNumber(versionNumberString : '6.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '6.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'MAPO'
MP-MON/Controllers/MSEController.cs
+10 -4
View File
@@ -15,7 +15,8 @@ namespace MP_MON.Controllers
// GET: StatusMap
public ActionResult StatusMap(string baseCss)
{
return SingleStatus(baseCss, "");
memLayer.ML.setSessionVal("IdxMacchina", "***ALL***");
return SingleStatus(baseCss, "***ALL***");
}
// GET: StatusMap
@@ -62,11 +63,16 @@ namespace MP_MON.Controllers
// metto in redis
memLayer.ML.setRSV(hMSE, dataSer, memLayer.ML.CRI("MSE_cacheDuration"));
}
// filtro dati SOLO PER la macchina che mi interessa...
dati = dati.Where(e => e.IdxMacchina == IdxMacchina).ToList();
// filtro dati SOLO PER la macchina che mi interessa... SE C'E'...
string reqView = "_StatusMap";
if (IdxMacchina != "***ALL***")
{
dati = dati.Where(e => e.IdxMacchina == IdxMacchina).ToList();
reqView = "_StatusMapSingle";
}
ViewBag.baseCss = baseCss;
ViewBag.IdxMacchina = IdxMacchina;
return PartialView("_StatusMapSingle", dati);
return PartialView(reqView, dati);
}