From ab10c528d2c05cc0ab2e3459b2269ece6fd5638c Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Mon, 15 Oct 2018 17:25:29 +0200 Subject: [PATCH] Fix MON x gestione all/singola macchina --- Jenkinsfile | 2 +- MP-MON/Controllers/MSEController.cs | 14 ++++++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 13e474f4..d9e45a72 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -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' diff --git a/MP-MON/Controllers/MSEController.cs b/MP-MON/Controllers/MSEController.cs index 3ad15015..bf8de094 100644 --- a/MP-MON/Controllers/MSEController.cs +++ b/MP-MON/Controllers/MSEController.cs @@ -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); }