From 62bc2265aeb46901c1da9f43dd10c2ca5430210d Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Mon, 28 May 2018 10:30:03 +0200 Subject: [PATCH] Fix lampeggio opzionale con Home/Fix (oltre a Home e Home/Blink) --- MP-MON/Content/baseStyle.css | 16 +++++++++++++--- MP-MON/Content/baseStyle.less | 16 +++++++++++++--- MP-MON/Content/baseStyle.min.css | 2 +- MP-MON/Controllers/HomeController.cs | 20 +++++++++++++++++++- MP-MON/MP-MON.csproj | 1 + MP-MON/Views/Home/Index.cshtml | 2 +- MP-MON/Views/MSE/_StatusMap.cshtml | 16 +++++++++++++--- MP-MON/Views/Shared/_Layout.cshtml | 4 +++- MP-MON/Views/Shared/_footer.cshtml | 4 ++-- MP-MON/Web.config | 4 ++-- MP-MON/favicon.ico | Bin 279582 -> 0 bytes MP-MON/images/LogoMapo.png | Bin 0 -> 19861 bytes 12 files changed, 68 insertions(+), 17 deletions(-) create mode 100644 MP-MON/images/LogoMapo.png diff --git a/MP-MON/Content/baseStyle.css b/MP-MON/Content/baseStyle.css index bb75c080..0e6dd0b4 100644 --- a/MP-MON/Content/baseStyle.css +++ b/MP-MON/Content/baseStyle.css @@ -13,6 +13,8 @@ body .ui-overlay-c { /* END: gestione blocchi base */ /* area semafori*/ .semBlinkVe, +.semFixVe, +.semFixVe_b, .semVe, .semVe_b { background: #009036; @@ -20,6 +22,8 @@ body .ui-overlay-c { color: #FFFF66; } .semBlinkGr, +.semFixGr, +.semFixGr_b, .semGr, .semGr_b { background-color: #bcbcbc; @@ -32,7 +36,9 @@ body .ui-overlay-c { padding: 0px 4px 0px 4px; color: #000; } -.semGi_b { +.semGi_b, +.semFixGi, +.semFixGi_b { text-align: left; background: #f9ff18; background: rgba(255, 255, 0, 0.8); @@ -46,7 +52,9 @@ body .ui-overlay-c { padding: 0px 4px 0px 4px; color: #959500; } -.semBl_b { +.semBl_b, +.semFixBl, +.semFixBl_b { text-align: left; background: #243FFF; background: rgba(60, 80, 255, 0.8); @@ -60,7 +68,9 @@ body .ui-overlay-c { padding: 0px 4px 0px 4px; color: #959500; } -.semRo_b { +.semRo_b, +.semFixRo, +.semFixRo_b { text-align: left; background-color: #ff243f; background: rgba(255, 60, 80, 0.8); diff --git a/MP-MON/Content/baseStyle.less b/MP-MON/Content/baseStyle.less index d4a41b0f..d4b0cdb3 100644 --- a/MP-MON/Content/baseStyle.less +++ b/MP-MON/Content/baseStyle.less @@ -16,6 +16,8 @@ body { /* area semafori*/ .semBlinkVe, +.semFixVe, +.semFixVe_b, .semVe, .semVe_b { background: #009036; @@ -24,6 +26,8 @@ body { } .semBlinkGr, +.semFixGr, +.semFixGr_b, .semGr, .semGr_b { background-color: #bcbcbc; @@ -38,7 +42,9 @@ body { color: #000; } -.semGi_b { +.semGi_b, +.semFixGi, +.semFixGi_b { text-align: left; background: #f9ff18; background: rgba(255,255,0,.8); @@ -54,7 +60,9 @@ body { color: #959500; } -.semBl_b { +.semBl_b, +.semFixBl, +.semFixBl_b { text-align: left; background: #243FFF; background: rgba(60,80,255,.8); @@ -70,7 +78,9 @@ body { color: #959500; } -.semRo_b { +.semRo_b, +.semFixRo, +.semFixRo_b { text-align: left; background-color: #ff243f; background: rgba(255,60,80,.8); diff --git a/MP-MON/Content/baseStyle.min.css b/MP-MON/Content/baseStyle.min.css index c02fe3fc..a22ea90c 100644 --- a/MP-MON/Content/baseStyle.min.css +++ b/MP-MON/Content/baseStyle.min.css @@ -1 +1 @@ -@import url('fonts.min.css');body{font-family:'Open Sans Condensed',sans-serif;background-color:#5d5d5d;}body .ui-body-a,body .ui-body-c,body .ui-overlay-c{text-shadow:0 0 0;}.semBlinkVe,.semVe,.semVe_b{background:#009036;background:rgba(0,255,80,.6);color:#ff6;}.semBlinkGr,.semGr,.semGr_b{background-color:#bcbcbc;background:rgba(180,180,180,.6);}.semGi{text-align:left;background:#8a8d27;background:rgba(230,210,0,.6);padding:0 4px 0 4px;color:#000;}.semGi_b{text-align:left;background:#f9ff18;background:rgba(255,255,0,.8);padding:0 4px 0 4px;color:#333;}.semBl{text-align:left;background:#000e7a;background:rgba(0,5,200,.6);padding:0 4px 0 4px;color:#959500;}.semBl_b{text-align:left;background:#243fff;background:rgba(60,80,255,.8);padding:0 4px 0 4px;color:#ffff32;}.semRo{text-align:left;background-color:#7a000e;background:rgba(200,0,5,.6);padding:0 4px 0 4px;color:#959500;}.semRo_b{text-align:left;background-color:#ff243f;background:rgba(255,60,80,.8);padding:0 4px 0 4px;color:#ffff32;}.no-cpu{-moz-transform:translateZ(0);-o-transform:translateZ(0);-webkit-transform:translateZ(0);-ms-transform:translateZ(0);transform:translateZ(0);}@-webkit-keyframes blinkBack{0%{background-position:0% 50%;}50%{background-position:100% 50%;}100%{background-position:0% 50%;}}@-moz-keyframes blinkBack{0%{background-position:0% 50%;}50%{background-position:100% 50%;}100%{background-position:0% 50%;}}@-o-keyframes blinkBack{0%{background-position:0% 50%;}50%{background-position:100% 50%;}100%{background-position:0% 50%;}}@keyframes blinkBack{0%{background-position:0% 50%;}50%{background-position:100% 50%;}100%{background-position:0% 50%;}}.semBlinkGi{background:linear-gradient(270deg,#8a8d27,#f9ff18);background-size:400% 400%;-webkit-animation:blinkBack 2s ease infinite;-moz-animation:blinkBack 2s ease infinite;-o-animation:blinkBack 2s ease infinite;animation:blinkBack 2s ease infinite;}.semBlinkRo{background:linear-gradient(270deg,#7a000e,#ff243f);background-size:400% 400%;-webkit-animation:blinkBack 2s ease infinite;-moz-animation:blinkBack 2s ease infinite;-o-animation:blinkBack 2s ease infinite;animation:blinkBack 2s ease infinite;color:#ff0;}.statusMap{background:#222;}.statusMap .ui-title,.statusMap .ui-li-aside{font-family:'Open Sans Condensed',sans-serif;font-weight:800;text-transform:uppercase;font-size:2.5em;line-height:1.1em;color:#dedede;text-shadow:2px 2px 4px #000;text-align:center;background:linear-gradient(270deg,rgba(20,20,20,.7),rgba(100,100,100,.7),rgba(20,20,20,.7));}.statusMap .ui-footer{color:#cdcdcd;background:linear-gradient(270deg,rgba(10,10,10,.7),rgba(80,80,80,.7),rgba(10,10,10,.7));} \ No newline at end of file +@import url('fonts.min.css');body{font-family:'Open Sans Condensed',sans-serif;background-color:#5d5d5d;}body .ui-body-a,body .ui-body-c,body .ui-overlay-c{text-shadow:0 0 0;}.semBlinkVe,.semFixVe,.semFixVe_b,.semVe,.semVe_b{background:#009036;background:rgba(0,255,80,.6);color:#ff6;}.semBlinkGr,.semFixGr,.semFixGr_b,.semGr,.semGr_b{background-color:#bcbcbc;background:rgba(180,180,180,.6);}.semGi{text-align:left;background:#8a8d27;background:rgba(230,210,0,.6);padding:0 4px 0 4px;color:#000;}.semGi_b,.semFixGi,.semFixGi_b{text-align:left;background:#f9ff18;background:rgba(255,255,0,.8);padding:0 4px 0 4px;color:#333;}.semBl{text-align:left;background:#000e7a;background:rgba(0,5,200,.6);padding:0 4px 0 4px;color:#959500;}.semBl_b,.semFixBl,.semFixBl_b{text-align:left;background:#243fff;background:rgba(60,80,255,.8);padding:0 4px 0 4px;color:#ffff32;}.semRo{text-align:left;background-color:#7a000e;background:rgba(200,0,5,.6);padding:0 4px 0 4px;color:#959500;}.semRo_b,.semFixRo,.semFixRo_b{text-align:left;background-color:#ff243f;background:rgba(255,60,80,.8);padding:0 4px 0 4px;color:#ffff32;}.no-cpu{-moz-transform:translateZ(0);-o-transform:translateZ(0);-webkit-transform:translateZ(0);-ms-transform:translateZ(0);transform:translateZ(0);}@-webkit-keyframes blinkBack{0%{background-position:0% 50%;}50%{background-position:100% 50%;}100%{background-position:0% 50%;}}@-moz-keyframes blinkBack{0%{background-position:0% 50%;}50%{background-position:100% 50%;}100%{background-position:0% 50%;}}@-o-keyframes blinkBack{0%{background-position:0% 50%;}50%{background-position:100% 50%;}100%{background-position:0% 50%;}}@keyframes blinkBack{0%{background-position:0% 50%;}50%{background-position:100% 50%;}100%{background-position:0% 50%;}}.semBlinkGi{background:linear-gradient(270deg,#8a8d27,#f9ff18);background-size:400% 400%;-webkit-animation:blinkBack 2s ease infinite;-moz-animation:blinkBack 2s ease infinite;-o-animation:blinkBack 2s ease infinite;animation:blinkBack 2s ease infinite;}.semBlinkRo{background:linear-gradient(270deg,#7a000e,#ff243f);background-size:400% 400%;-webkit-animation:blinkBack 2s ease infinite;-moz-animation:blinkBack 2s ease infinite;-o-animation:blinkBack 2s ease infinite;animation:blinkBack 2s ease infinite;color:#ff0;}.statusMap{background:#222;}.statusMap .ui-title,.statusMap .ui-li-aside{font-family:'Open Sans Condensed',sans-serif;font-weight:800;text-transform:uppercase;font-size:2.5em;line-height:1.1em;color:#dedede;text-shadow:2px 2px 4px #000;text-align:center;background:linear-gradient(270deg,rgba(20,20,20,.7),rgba(100,100,100,.7),rgba(20,20,20,.7));}.statusMap .ui-footer{color:#cdcdcd;background:linear-gradient(270deg,rgba(10,10,10,.7),rgba(80,80,80,.7),rgba(10,10,10,.7));} \ No newline at end of file diff --git a/MP-MON/Controllers/HomeController.cs b/MP-MON/Controllers/HomeController.cs index b3c1d6b8..04639be2 100644 --- a/MP-MON/Controllers/HomeController.cs +++ b/MP-MON/Controllers/HomeController.cs @@ -35,7 +35,7 @@ namespace MP_MON.Controllers // ricarico ogni minuto COMUNQUE tutto... string pageRefreshSec = "60"; // se ho animazione refresh è ogni 2 sec... - int pageRefreshMs = 2000; + int pageRefreshMs = 1000; ViewBag.cssSemBase = "semBlink"; try { @@ -48,6 +48,24 @@ namespace MP_MON.Controllers Response.AddHeader("Refresh", pageRefreshSec); return View("Index"); } + public ActionResult Fix() + { + // ricarico ogni minuto COMUNQUE tutto... + string pageRefreshSec = "60"; + // refresh std ogni sec + int pageRefreshMs = 1000; + ViewBag.cssSemBase = "semFix"; + try + { + pageRefreshSec = WebConfigurationManager.AppSettings["pageRefreshSec"]; + } + catch + { } + if (pageRefreshSec == "") pageRefreshSec = "60"; + ViewBag.pageRefreshMs = pageRefreshMs; + Response.AddHeader("Refresh", pageRefreshSec); + return View("Index"); + } public ActionResult GetClock() { diff --git a/MP-MON/MP-MON.csproj b/MP-MON/MP-MON.csproj index 41c09067..d74f906a 100644 --- a/MP-MON/MP-MON.csproj +++ b/MP-MON/MP-MON.csproj @@ -268,6 +268,7 @@ EntityModelCodeGenerator MapoModel.Designer.cs + MapoModel.edmx diff --git a/MP-MON/Views/Home/Index.cshtml b/MP-MON/Views/Home/Index.cshtml index 60f5a303..e6222fd2 100644 --- a/MP-MON/Views/Home/Index.cshtml +++ b/MP-MON/Views/Home/Index.cshtml @@ -6,7 +6,7 @@
- @Html.Action("StatusMap", "MSE") + @Html.Action("StatusMap", "MSE", new { baseCss = ViewBag.cssSemBase })