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

Update grafica x MappaStato TAB

Browse Source
This commit is contained in:
Samuele E. Locatelli
2020-11-26 09:40:12 +01:00
parent 798df4a813
commit e1452bc15b
6 changed files with 83 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP-TAB/MappaStato.aspx
+5 -6
View File
@@ -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" %>
<asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">
<div class="container-fluid my-3 px-3 px-md-4" role="main">
<uc1:mod_checkHttps runat="server" ID="mod_checkHttps" />
<uc1:mod_mappaStato ID="mod_mappaStato1" runat="server" />
</div>
</asp:Content>
<div class="container-fluid mt-0 mb-3 px-3 px-md-4" role="main">
<uc1:mod_checkHttps runat="server" ID="mod_checkHttps" />
<uc1:mod_mappaStato ID="mod_mappaStato1" runat="server" />
</div>
</asp:Content>
MP-TAB/WebMasterPages/Bootstrap.Master
+67 -67
View File
@@ -6,74 +6,74 @@
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml" lang="it">
<head runat="server">
<meta charset="utf-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="mobile-web-app-capable" content="yes" />
<meta name="description" content="MP Tablet" />
<meta name="author" content="Steamware" />
<link rel="shortcut icon" href="~/favicon.ico" />
<link href="~/favicon.ico" rel="shortcut icon" type="image/x-icon" />
<title>MPTAB: <%: SteamWare.devicesAuthProxy.getPage(Request.Url) %></title>
<meta charset="utf-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="mobile-web-app-capable" content="yes" />
<meta name="description" content="MP Tablet" />
<meta name="author" content="Steamware" />
<link rel="shortcut icon" href="~/favicon.ico" />
<link href="~/favicon.ico" rel="shortcut icon" type="image/x-icon" />
<title>MPTAB: <%: SteamWare.devicesAuthProxy.getPage(Request.Url) %></title>
<asp:PlaceHolder ID="PlaceHolder1" runat="server">
<%: Scripts.Render("~/bundles/modernizr") %>
<%: Scripts.Render("~/bundles/jquery") %>
<%: Scripts.Render("~/bundles/jqueryui") %>
<%: Scripts.Render("~/bundles/typeahead") %>
<%: Scripts.Render("~/bundles/BrowserWindowSize") %>
<script type="text/javascript" src="Scripts/instascan.min.js"></script>
</asp:PlaceHolder>
<webopt:BundleReference ID="BundleReference1" runat="server" Path="~/Content/css" />
<webopt:BundleReference ID="BundleReference2" runat="server" Path="~/Content/themes/base/css" />
<asp:ContentPlaceHolder ID="HeadContent" runat="server">
</asp:ContentPlaceHolder>
<asp:PlaceHolder ID="PlaceHolder1" runat="server">
<%: Scripts.Render("~/bundles/modernizr") %>
<%: Scripts.Render("~/bundles/jquery") %>
<%: Scripts.Render("~/bundles/jqueryui") %>
<%: Scripts.Render("~/bundles/typeahead") %>
<%: Scripts.Render("~/bundles/BrowserWindowSize") %>
<script type="text/javascript" src="Scripts/instascan.min.js"></script>
</asp:PlaceHolder>
<webopt:BundleReference ID="BundleReference1" runat="server" Path="~/Content/css" />
<webopt:BundleReference ID="BundleReference2" runat="server" Path="~/Content/themes/base/css" />
<asp:ContentPlaceHolder ID="HeadContent" runat="server">
</asp:ContentPlaceHolder>
</head>
<body>
<form id="form1" runat="server">
<div class="container-fluid">
<asp:ScriptManager ID="ScriptManager1" runat="server">
<Scripts>
<%--Framework Scripts--%>
<asp:ScriptReference Name="MsAjaxBundle" />
<asp:ScriptReference Name="WebForms.js" Assembly="System.Web" Path="~/Scripts/WebForms/WebForms.js" />
<asp:ScriptReference Name="WebUIValidation.js" Assembly="System.Web" Path="~/Scripts/WebForms/WebUIValidation.js" />
<asp:ScriptReference Name="MenuStandards.js" Assembly="System.Web" Path="~/Scripts/WebForms/MenuStandards.js" />
<asp:ScriptReference Name="GridView.js" Assembly="System.Web" Path="~/Scripts/WebForms/GridView.js" />
<asp:ScriptReference Name="DetailsView.js" Assembly="System.Web" Path="~/Scripts/WebForms/DetailsView.js" />
<asp:ScriptReference Name="TreeView.js" Assembly="System.Web" Path="~/Scripts/WebForms/TreeView.js" />
<asp:ScriptReference Name="WebParts.js" Assembly="System.Web" Path="~/Scripts/WebForms/WebParts.js" />
<asp:ScriptReference Name="Focus.js" Assembly="System.Web" Path="~/Scripts/WebForms/Focus.js" />
<asp:ScriptReference Name="WebFormsBundle" />
<%--Site Scripts--%>
</Scripts>
</asp:ScriptManager>
<uc1:mod_title runat="server" ID="mod_title" />
<asp:UpdatePanel ID="uppContainer" runat="server">
<ContentTemplate>
<div class="row bodyDark">
<div class="col-12 px-0">
<asp:ContentPlaceHolder ID="MainContent" runat="server">
<div class="container" role="main">
<h1>hello world!</h1>
Area main content da customizzare
</div>
</asp:ContentPlaceHolder>
</div>
</div>
</ContentTemplate>
</asp:UpdatePanel>
<!-- /.container -->
<asp:UpdatePanel ID="uppFooter" runat="server">
<ContentTemplate>
<uc1:mod_footer runat="server" ID="mod_footer" />
</ContentTemplate>
</asp:UpdatePanel>
</div>
</form>
<%--<script src="Scripts/bootstrap.min.js"></script>--%>
<asp:PlaceHolder ID="PlaceHolder2" runat="server">
<%: Scripts.Render("~/bundles/bootstrap") %>
</asp:PlaceHolder>
<form id="form1" runat="server">
<div class="container-fluid">
<asp:ScriptManager ID="ScriptManager1" runat="server">
<Scripts>
<%--Framework Scripts--%>
<asp:ScriptReference Name="MsAjaxBundle" />
<asp:ScriptReference Name="WebForms.js" Assembly="System.Web" Path="~/Scripts/WebForms/WebForms.js" />
<asp:ScriptReference Name="WebUIValidation.js" Assembly="System.Web" Path="~/Scripts/WebForms/WebUIValidation.js" />
<asp:ScriptReference Name="MenuStandards.js" Assembly="System.Web" Path="~/Scripts/WebForms/MenuStandards.js" />
<asp:ScriptReference Name="GridView.js" Assembly="System.Web" Path="~/Scripts/WebForms/GridView.js" />
<asp:ScriptReference Name="DetailsView.js" Assembly="System.Web" Path="~/Scripts/WebForms/DetailsView.js" />
<asp:ScriptReference Name="TreeView.js" Assembly="System.Web" Path="~/Scripts/WebForms/TreeView.js" />
<asp:ScriptReference Name="WebParts.js" Assembly="System.Web" Path="~/Scripts/WebForms/WebParts.js" />
<asp:ScriptReference Name="Focus.js" Assembly="System.Web" Path="~/Scripts/WebForms/Focus.js" />
<asp:ScriptReference Name="WebFormsBundle" />
<%--Site Scripts--%>
</Scripts>
</asp:ScriptManager>
<uc1:mod_title runat="server" ID="mod_title" />
<asp:UpdatePanel ID="uppContainer" runat="server">
<ContentTemplate>
<div class="row bodyDark pt-0 mt-0">
<div class="col-12 px-0">
<asp:ContentPlaceHolder ID="MainContent" runat="server">
<div class="container" role="main">
<h1>hello world!</h1>
Area main content da customizzare
</div>
</asp:ContentPlaceHolder>
</div>
</div>
</ContentTemplate>
</asp:UpdatePanel>
<!-- /.container -->
<asp:UpdatePanel ID="uppFooter" runat="server">
<ContentTemplate>
<uc1:mod_footer runat="server" ID="mod_footer" />
</ContentTemplate>
</asp:UpdatePanel>
</div>
</form>
<%--<script src="Scripts/bootstrap.min.js"></script>--%>
<asp:PlaceHolder ID="PlaceHolder2" runat="server">
<%: Scripts.Render("~/bundles/bootstrap") %>
</asp:PlaceHolder>
</body>
</html>
</html>
MP-TAB/WebUserControls/cmp_displNumPzProd.ascx
+1 -1
View File
@@ -10,7 +10,7 @@
<div runat="server" id="divGray" class="progress-bar bg-secondary" style="width: 40%">
<asp:Label runat="server" ID="lblGray" />
</div>
<div runat="server" id="divBlue" class="progress-bar bg-info" style="width: 0%">
<div runat="server" id="divBlue" class="progress-bar bg-primary" style="width: 0%">
<asp:Label runat="server" ID="lblBlue" />
</div>
</div>
MP-TAB/WebUserControls/cmp_displNumPzProd.ascx.cs
+2 -2
View File
@@ -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;
}
MP-TAB/WebUserControls/mod_mappaStato.ascx
+8 -8
View File
@@ -6,10 +6,10 @@
<div class="row">
<asp:Repeater ID="repLI" runat="server" DataSourceID="ods">
<ItemTemplate>
<div class="col-6 col-sm-6 col-md-4 col-lg-3 col-xl-2 mb-3 px-1 bloccoMacc">
<div class="col-6 col-sm-6 col-md-4 col-lg-3 col-xl-2 mb-2 px-1 bloccoMacc">
<asp:LinkButton ID="hlMacchina" runat="server" OnClick="hlMacchina_Click" CommandArgument='<%# Eval("IdxMacchina") %>'>
<div class='card text-white mapBlock rCAll <%# Eval("Semaforo") %> p-0 m-0'>
<img class="card-img bg-dark rCTop" src='<%# ImgUrlMacc(Eval("url")) %>' alt='<%# Eval("CodMacchina") %>'>
<img class="card-img bg-light rCTop" src='<%# ImgUrlMacc(Eval("url")) %>' alt='<%# Eval("CodMacchina") %>'>
<div class="m-1 bg-black rCAll">
<div class="card-img-overlay p-0 d-flex flex-row-reverse align-items-start rCTop">
<div class="labelTopDx text-right px-2">
@@ -20,7 +20,7 @@
<div class="card bg-black p-0 rCBot">
<div class='row justify-content-center mx-0'>
<div class="col-12 px-1">
<h4 class="text-left">
<h4 class="text-left mb-0 font-weight-bold">
<asp:Label runat="server" ID="lblTitle" Text='<%# Eval("Nome") %>' /></h4>
</div>
<div class='col-12 p-1 <%# Eval("Semaforo") %>'>
@@ -34,8 +34,8 @@
</div>
</div>
</div>
<div class="col-12 px-0 pb-1 text-nowrap" style="font-size: 0.85em;">
<div class="row px-1">
<div class="col-12 px-0 pb-1 text-nowrap" style="font-size: 1.2em; line-height: 1.0em;">
<div class="row px-1">
<div class="col pr-0">
<small class="text-success">Confermati</small>
</div>
@@ -47,11 +47,11 @@
</div>
</div>
<div class="row px-1">
<div class="col pr-0">
<div class="col pr-0 text-success">
<asp:Label runat="server" ID="lblPezziConf" Text='<%# Eval("PezziConf","{0:N0}") %>' ToolTip="pz confermati" />
</div>
<div class="col text-center px-0">
<asp:Label runat="server" ID="lblPezziProd" Text='<%# Eval("PezziProd","{0:N0}") %>' ToolTip="pz prodotti" />
<div class="col text-center text-warning px-0">
<asp:Label runat="server" ID="lblPezziProd" Text='<%# Eval("PezziProd","{0:N0}") %>' ToolTip="pz prodotti" />
</div>
<div class="col text-right pl-0">
<asp:Label runat="server" ID="lblNumPezzi" Text='<%# Eval("NumPezzi","{0:N0}") %>' ToolTip="pz lanciati" />
MP-TAB/images/macchine/Steamware.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 220 KiB

After

Width:  |  Height:  |  Size: 156 KiB