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

Fix lampeggio opzionale con Home/Fix (oltre a Home e Home/Blink)

Browse Source
This commit is contained in:
Samuele E. Locatelli
2018-05-28 10:30:03 +02:00
parent 70f9803738
commit 62bc2265ae
12 changed files with 68 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP-MON/Content/baseStyle.css
+13 -3
View File
@@ -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);
MP-MON/Content/baseStyle.less
+13 -3
View File
@@ -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);
MP-MON/Content/baseStyle.min.css
Vendored
+1 -1
View File
@@ -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));}
@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));}
MP-MON/Controllers/HomeController.cs
+19 -1
View File
@@ -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()
{
MP-MON/MP-MON.csproj
+1
View File
@@ -268,6 +268,7 @@
<Generator>EntityModelCodeGenerator</Generator>
<LastGenOutput>MapoModel.Designer.cs</LastGenOutput>
</EntityDeploy>
<Content Include="images\LogoMapo.png" />
<Content Include="Models\MapoModel.edmx.diagram">
<DependentUpon>MapoModel.edmx</DependentUpon>
</Content>
MP-MON/Views/Home/Index.cshtml
+1 -1
View File
@@ -6,7 +6,7 @@
<br />
<div id="mainDiv">
@Html.Action("StatusMap", "MSE")
@Html.Action("StatusMap", "MSE", new { baseCss = ViewBag.cssSemBase })
</div>
<script type="text/javascript">
MP-MON/Views/MSE/_StatusMap.cshtml
+13 -3
View File
@@ -20,7 +20,7 @@
string TCLavorato = TCLav.ToString(@"mm\:ss");
// verifico SE è disabilitata modalità animazione -> blink a stati (e refresh 1s)
if (System.Web.Configuration.WebConfigurationManager.AppSettings["doAnimate"] == "0")
if (System.Web.Configuration.WebConfigurationManager.AppSettings["doAnimate"] == "1")
{
// blink se secondo pari...
DateTime adesso = DateTime.Now;
@@ -46,6 +46,12 @@
{
sArticolo = string.Format("[{0}]", item.CodArticolo);
}
// se NON trova update da oltre 1 minuto rosso lo status comunicazione
string cssComStatus = cssStatus;
if (DateTime.Now.Subtract((DateTime)item.lastUpdate).TotalMinutes>1)
{
cssComStatus = ViewBag.baseCss + "Ro";
}
<div class="col-4 col-sm-4 col-md-3 col-lg-2" style="padding:2px;">
<div class="@cssStatus p-1">
@*noCpu*@
@@ -66,10 +72,14 @@
<div class="col-4 pl-0 text-right">std: @TCAssegnato</div>
<div class="col-4 pl-0 text-right">act: @TCLavorato</div>
<div class="col-6 pr-0">Pezzi<sub>(prod/ord)</sub></div>
<div class="col-6 pl-0 text-right">@Html.DisplayFor(modelItem => item.PezziProd) / @Html.DisplayFor(modelItem => item.NumPezzi)</div>
<div class="col-6 pl-0 text-right">@Html.DisplayFor(modelItem => item.PezziProd) / @Html.DisplayFor(modelItem => item.NumPezzi)</div>
</div>
</div>
<div class="@cssComStatus p-1">
<div class="row fontSmaller mt-1">
<div class="col-12"><div class="text-right ui-footer">last update: @Html.DisplayFor(modelItem => item.lastUpdate)</div></div>
<div class="col-12">
<div class="text-right ui-footer px-2">last update: @Html.DisplayFor(modelItem => item.lastUpdate)</div>
</div>
</div>
</div>
</div>
MP-MON/Views/Shared/_Layout.cshtml
+3 -1
View File
@@ -11,7 +11,9 @@
</head>
<body>
<nav class="navbar fixed-top navbar-expand-sm px-2 py-0 m-0">
<a href="@Url.Action("", "Home")" class="navbar-brand m-0" style="vertical-align: bottom; text-align: left; font-size: 1em;"><img class="logoImg" src="~/images/logoSteamware.png" style="margin-top: -10px;" /></i></a>
<a href="@Url.Action("", "Home")" class="navbar-brand m-0 pr-4" style="vertical-align: bottom; text-align: left; font-size: 1em;">
<img class="logoImg" src="~/images/logoMapo.png" style="margin-top: -10px;" />
</a>
<button class="navbar-toggler navbar-dark" type="button" data-toggle="collapse" data-target="#navbarTogglerDemo01" aria-controls="navbarTogglerDemo01" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
MP-MON/Views/Shared/_footer.cshtml
+2 -2
View File
@@ -1,9 +1,9 @@
<div class="d-flex justify-content-start pl-3 text-left">
MoonPro MONitor
<span style="color: #DEDEDE;">MP MON</span>itor
</div>
<div class="d-flex justify-content-center text-center">
<strong>@ViewBag.envir</strong>
</div>
<div class="d-flex justify-content-end pr-3 text-right">
Steamware s.r.l. - &copy; 2007-@DateTime.Now.Year
2007-@DateTime.Now.Year &copy; <img class="logoImg" src="~/images/logoSteamware.png" style="height: 30px;" />
</div>
MP-MON/Web.config
+2 -2
View File
@@ -25,7 +25,7 @@
<add key="Environment" value="Dev" />
<add key="dataRefreshMs" value="1500" />
<add key="pageRefreshSec" value="600" />
<add key="doAnimate" value="0" />
<add key="doAnimate" value="1" />
<!--gestione email ed avvisi-->
<add key="_fromEmail" value="MAPO@steamware.net" />
<add key="_checkIobEmail" value="samuele@steamware.net" />
@@ -111,7 +111,7 @@
</providers>
</entityFramework>
<connectionStrings>
<add name="MoonProEntities" connectionString="metadata=res://*/Models.MapoModel.csdl|res://*/Models.MapoModel.ssdl|res://*/Models.MapoModel.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=SQL2016PROD;initial catalog=Jetco_MoonPro_prod;persist security info=True;user id=sa;password=keyhammer16;multipleactiveresultsets=True;application name=EntityFramework&quot;" providerName="System.Data.EntityClient" />
<add name="MoonProEntities" connectionString="metadata=res://*/Models.MapoModel.csdl|res://*/Models.MapoModel.ssdl|res://*/Models.MapoModel.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=SQL2016DEV;initial catalog=MoonPro;persist security info=True;user id=sa;password=keyhammer16;multipleactiveresultsets=True;application name=EntityFramework&quot;" providerName="System.Data.EntityClient" />
<!--<add name="MoonProEntities" connectionString="metadata=res://*/Models.MapoModel.csdl|res://*/Models.MapoModel.ssdl|res://*/Models.MapoModel.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=SQL2016DEV;initial catalog=MoonPro;persist security info=True;user id=sa;password=keyhammer16;multipleactiveresultsets=True;application name=EntityFramework&quot;" providerName="System.Data.EntityClient" />-->
</connectionStrings>
</configuration>
MP-MON/favicon.ico
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 273 KiB

After

Width:  |  Height:  |  Size: 0 B

MP-MON/images/LogoMapo.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 19 KiB