+ DICH. FERMATA + <%--statistiche produzione--%>

diff --git a/MP-Tablet/DettaglioMacchina.aspx.cs b/MP-Tablet/DettaglioMacchina.aspx.cs index 7605db11..046cbd53 100644 --- a/MP-Tablet/DettaglioMacchina.aspx.cs +++ b/MP-Tablet/DettaglioMacchina.aspx.cs @@ -26,6 +26,7 @@ namespace MoonProTablet if (!Page.IsPostBack) { Session["TipoLink"] = "DetMacc"; + lbtFermate.Visible = showInsFermata; } mod_confProd1.eh_inserting += mod_confProd1_eh_inserting; mod_confProd1.eh_newVal += mod_confProd1_eh_newVal; @@ -52,5 +53,19 @@ namespace MoonProTablet { mod_dettMacchina1.doUpdate(); } + ///

+ /// Determina se dato lo stato dell'impianto si debba mostrare btn fermata perché + /// - impianto fermo + /// - fermo > xx min (da web.config, es 20') + /// + public bool showInsFermata + { + get + { + bool answ = true; + + return answ; + } + } } } \ No newline at end of file diff --git a/MP-Tablet/DettaglioMacchina.aspx.designer.cs b/MP-Tablet/DettaglioMacchina.aspx.designer.cs index d4591224..b5faed02 100644 --- a/MP-Tablet/DettaglioMacchina.aspx.designer.cs +++ b/MP-Tablet/DettaglioMacchina.aspx.designer.cs @@ -12,6 +12,15 @@ namespace MoonProTablet { public partial class DettaglioMacchina { + /// + /// Controllo lbtFermate. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.WebControls.LinkButton lbtFermate; + /// /// Controllo mod_dettMacchina1. /// diff --git a/MP-Tablet/MP-Tablet.csproj b/MP-Tablet/MP-Tablet.csproj index f656da2c..bc265e50 100644 --- a/MP-Tablet/MP-Tablet.csproj +++ b/MP-Tablet/MP-Tablet.csproj @@ -168,6 +168,12 @@ dichMan.css + + flashing.less + + + flashing.css + @@ -377,6 +383,7 @@ Always + Designer diff --git a/MP-Tablet/Scripts/BrowserWindowSize.js b/MP-Tablet/Scripts/BrowserWindowSize.js index 70c4a024..18ace273 100644 --- a/MP-Tablet/Scripts/BrowserWindowSize.js +++ b/MP-Tablet/Scripts/BrowserWindowSize.js @@ -5,17 +5,6 @@ window.onresize = function (event) { function SetWidthHeight() { var height = $(window).outerHeight(); var width = $(window).outerWidth(); - //var height = $(window).height(); - //var width = $(window).width(); - //$(window).innerHeight() * $(window).devicePixelRatio(); - - //w = window.screen.width; - //h = window.screen.height; - //if (window.devicePixelRatio < 1) { - // w = window.screen.width / window.devicePixelRatio; - // h = window.screen.height / window.devicePixelRatio; - //} - $.ajax({ url: "./windowSize.ashx", @@ -33,7 +22,7 @@ function SetWidthHeight() { window.location.reload(); }; }).fail(function (xhr) { - alert("Problem to retrieve browser size."); + //alert("Problem to retrieve browser size."); }); } diff --git a/MP-Tablet/WebUserControls/mod_dettMacchina.ascx b/MP-Tablet/WebUserControls/mod_dettMacchina.ascx index 6b02c741..c5b52812 100644 --- a/MP-Tablet/WebUserControls/mod_dettMacchina.ascx +++ b/MP-Tablet/WebUserControls/mod_dettMacchina.ascx @@ -48,7 +48,7 @@
DIS.
-
+
diff --git a/MP-Tablet/compilerconfig.json b/MP-Tablet/compilerconfig.json index 570c1834..0cc92ca9 100644 --- a/MP-Tablet/compilerconfig.json +++ b/MP-Tablet/compilerconfig.json @@ -26,5 +26,9 @@ { "outputFile": "Content/bootstrap/bootstrap.css", "inputFile": "Content/bootstrap/bootstrap.scss" + }, + { + "outputFile": "Content/flashing.css", + "inputFile": "Content/flashing.less" } ] \ No newline at end of file