diff --git a/MP-TAB/MappaStato.aspx b/MP-TAB/MappaStato.aspx index 908a3cb9..732e8919 100644 --- a/MP-TAB/MappaStato.aspx +++ b/MP-TAB/MappaStato.aspx @@ -3,10 +3,9 @@ <%@ Register Src="~/WebUserControls/mod_mappaStato.ascx" TagName="mod_mappaStato" TagPrefix="uc1" %> <%@ Register Src="~/WebUserControls/mod_checkHttps.ascx" TagPrefix="uc1" TagName="mod_checkHttps" %> - -
- - -
- +
+ + +
+ \ No newline at end of file diff --git a/MP-TAB/WebMasterPages/Bootstrap.Master b/MP-TAB/WebMasterPages/Bootstrap.Master index b5e7fc94..d3efc922 100644 --- a/MP-TAB/WebMasterPages/Bootstrap.Master +++ b/MP-TAB/WebMasterPages/Bootstrap.Master @@ -6,74 +6,74 @@ - - - - - - - - - MPTAB: <%: SteamWare.devicesAuthProxy.getPage(Request.Url) %> + + + + + + + + + MPTAB: <%: SteamWare.devicesAuthProxy.getPage(Request.Url) %> - - <%: Scripts.Render("~/bundles/modernizr") %> - <%: Scripts.Render("~/bundles/jquery") %> - <%: Scripts.Render("~/bundles/jqueryui") %> - <%: Scripts.Render("~/bundles/typeahead") %> - <%: Scripts.Render("~/bundles/BrowserWindowSize") %> - - - - - - + + <%: Scripts.Render("~/bundles/modernizr") %> + <%: Scripts.Render("~/bundles/jquery") %> + <%: Scripts.Render("~/bundles/jqueryui") %> + <%: Scripts.Render("~/bundles/typeahead") %> + <%: Scripts.Render("~/bundles/BrowserWindowSize") %> + + + + + + -
-
- - - <%--Framework Scripts--%> - - - - - - - - - - - <%--Site Scripts--%> - - - - - -
-
- -
-

hello world!

- Area main content da customizzare -
- -
-
- - - - - - - - -
-
- <%----%> - - <%: Scripts.Render("~/bundles/bootstrap") %> - +
+
+ + + <%--Framework Scripts--%> + + + + + + + + + + + <%--Site Scripts--%> + + + + + +
+
+ +
+

hello world!

+ Area main content da customizzare +
+ +
+
+ + + + + + + + +
+
+ <%----%> + + <%: Scripts.Render("~/bundles/bootstrap") %> + - + \ No newline at end of file diff --git a/MP-TAB/WebUserControls/cmp_displNumPzProd.ascx b/MP-TAB/WebUserControls/cmp_displNumPzProd.ascx index 767fce48..ad305aa7 100644 --- a/MP-TAB/WebUserControls/cmp_displNumPzProd.ascx +++ b/MP-TAB/WebUserControls/cmp_displNumPzProd.ascx @@ -10,7 +10,7 @@
-
+
diff --git a/MP-TAB/WebUserControls/cmp_displNumPzProd.ascx.cs b/MP-TAB/WebUserControls/cmp_displNumPzProd.ascx.cs index ab3ce4fa..89b5534d 100644 --- a/MP-TAB/WebUserControls/cmp_displNumPzProd.ascx.cs +++ b/MP-TAB/WebUserControls/cmp_displNumPzProd.ascx.cs @@ -78,6 +78,7 @@ namespace MoonProTablet.WebUserControls private void updateDisplay(prodCounter countData) { decimal denom = countData.numPzProd > countData.numPzOrd ? (decimal)countData.numPzProd / 100 : (decimal)countData.numPzOrd / 100; + denom = denom == 0 ? 1 : denom; // calcolo se sono nel caso prod < ordinati o se sono andato OVER if (countData.numPzProd < countData.numPzOrd) { @@ -92,13 +93,12 @@ namespace MoonProTablet.WebUserControls if (countData.numPzConf < countData.numPzOrd) { nGreen = (int)Math.Floor((decimal)countData.numPzConf / denom); - nBlue = (int)Math.Floor((decimal)(countData.numPzProd - countData.numPzConf) / denom); } else { nGreen = (int)Math.Floor((decimal)countData.numPzOrd / denom); - nBlue = (int)Math.Floor((decimal)(countData.numPzProd - countData.numPzOrd) / denom); } + nBlue = 100 - nGreen; nYellow = 0; nGray = 0; } diff --git a/MP-TAB/WebUserControls/mod_mappaStato.ascx b/MP-TAB/WebUserControls/mod_mappaStato.ascx index 6281bf8b..9200488c 100644 --- a/MP-TAB/WebUserControls/mod_mappaStato.ascx +++ b/MP-TAB/WebUserControls/mod_mappaStato.ascx @@ -6,10 +6,10 @@
-
+
- <%# Eval("CodMacchina") %> + <%# Eval("CodMacchina") %>
@@ -20,7 +20,7 @@
-

+

@@ -34,8 +34,8 @@
-
-
+
+
Confermati
@@ -47,11 +47,11 @@
-
+
-
- +
+
diff --git a/MP-TAB/images/macchine/Steamware.png b/MP-TAB/images/macchine/Steamware.png index 1326fad9..d1a658b0 100644 Binary files a/MP-TAB/images/macchine/Steamware.png and b/MP-TAB/images/macchine/Steamware.png differ