Completata review SITE!

This commit is contained in:
Samuele Locatelli
2023-09-12 19:39:36 +02:00
parent c3693bef4e
commit a0015ed4c6
4 changed files with 84 additions and 82 deletions
+8 -8
View File
@@ -8,18 +8,18 @@
<%@ Register Src="~/WebUserControls/mod_listaStatiEventi.ascx" TagName="mod_listaStatiEventi" TagPrefix="uc1" %>
<%@ Register Src="WebUserControls/mod_sequencerTempiCiclo.ascx" TagName="mod_sequencerTempiCiclo" TagPrefix="uc6" %>
<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" runat="Server">
<div id="contenuto">
<div id="contenuto" class="px-1">
<div id="alto">
<div id="Div1" class="menuMainY">
<asp:UpdatePanel ID="UpdatePanel2" runat="server" UpdateMode="Always">
<ContentTemplate>
<div class="d-flex justify-content-between mb-2">
<div class="px-2">
<div class="d-flex justify-content-between">
<div>
<a runat="server" class="btn btn-sm btn-outline-primary text-light" href="~/MappaStato.aspx">
<i class="fa fa-angle-double-left" aria-hidden="true"></i><%= traduci("CloseDetail") %>
</a>
</div>
<div class="px-2">
<div>
<uc2:mod_periodoAnalisi ID="Mod_periodoAnalisi1" runat="server" />
</div>
</div>
@@ -27,10 +27,10 @@
</asp:UpdatePanel>
</div>
</div>
<div id="medio">
<div id="medio" class="mt-2">
<asp:UpdatePanel ID="up_grafici" runat="server" UpdateMode="Conditional">
<ContentTemplate>
<div class="img-fluid">
<div class="shadow">
<uc5:mod_sequencerStati ID="Mod_sequencerStati1" runat="server"></uc5:mod_sequencerStati>
<uc6:mod_sequencerTempiCiclo ID="mod_sequencerTempiCiclo1" runat="server" />
</div>
@@ -40,7 +40,7 @@
<div id="basso" class="m-2">
<div class="row">
<div class="col-4 pr-1">
<div class="card">
<div class="card shadow rounded">
<div class="card-header p-1">
<h4><%: traduci("MachineCurrState") %></h4>
</div>
@@ -62,7 +62,7 @@
</div>
</div>
<div class="col-8 pl-1">
<div class="card">
<div class="card shadow rounded">
<div class="card-header p-1">
<h4><%: traduci("ProductionData") %></h4>
</div>
+1 -1
View File
@@ -10,7 +10,7 @@ namespace MP_SITE
protected intervalloDate _intervalloAnalisi;
protected resoconti _resoconti;
protected int deltaPlot = 16;
protected int deltaPlot = 24;
protected int durataMin;
protected string idxMacchina;
protected long standardZoom = 3;
@@ -1,6 +1,6 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_infoAggiuntive.ascx.cs"
Inherits="MP_SITE.WebUserControls.mod_infoAggiuntive" %>
<div id="InfoAggiuntive" class="row small">
<div id="InfoAggiuntive" class="row small mx-0">
<div class="col-12 col-lg-6">
<div class="card">
<div class="card-header bg-dark text-light py-1">
+74 -72
View File
@@ -1,79 +1,81 @@
<%@ Control Language="C#" AutoEventWireup="true" Inherits="MP_SITE.WebUserControls.mod_statoMacchina"
CodeBehind="mod_statoMacchina.ascx.cs" %>
CodeBehind="mod_statoMacchina.ascx.cs" %>
<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="asp" %>
<asp:Panel ID="pnlMacchina" runat="server" CssClass="statoMacchine">
<asp:HiddenField runat="server" ID="hfIdxMacchina" />
<div runat="server" id="divData" class="valoriResoconto">
<div class="clearDiv floCent gradGray text-center" style="font-size: 1em;">
<asp:LinkButton ID="valMacchina" runat="server" OnClick="lnkMacchina_Click" ForeColor="White" Font-Bold="true" />
<div class="shadow">
<asp:HiddenField runat="server" ID="hfIdxMacchina" />
<div runat="server" id="divData" class="valoriResoconto">
<div class="clearDiv floCent gradGray text-center" style="font-size: 1em;">
<asp:LinkButton ID="valMacchina" runat="server" OnClick="lnkMacchina_Click" ForeColor="White" Font-Bold="true" />
</div>
<div class="row small p-1">
<div class="col-12">
<asp:LinkButton ID="lnkMacchina" runat="server" OnClick="lnkMacchina_Click">
<div class="row">
<div class="col-3">
<asp:Label ID="lblCodArticolo" runat="server" />
</div>
<div class="col-9 text-end">
<asp:Label ID="valCodArticolo" runat="server" />
</div>
</div>
<div class="row">
<div class="col-6">
<asp:Label ID="valPODL" runat="server" />
</div>
<div class="col-6 text-end">
<asp:Label ID="valODL" runat="server" />
</div>
</div>
<div class="row">
<div class="col-3">
<asp:Label ID="lblProd" runat="server" />
</div>
<div class="col-9 text-end">
<asp:Label ID="valProd" runat="server" />
</div>
</div>
<div class="row">
<div class="col text-center">
<asp:Image runat="server" CssClass="img-fluid" ID="imgThumb" />
</div>
</div>
<div class="d-flex">
<div class="p-0">
<asp:Label ID="lblStato" runat="server" />
</div>
<div class="p-0 flex-grow-1 text-end">
<asp:Label ID="valStato" runat="server" />
</div>
</div>
<div class="d-flex">
<div class="p-0">
<asp:Label ID="lblDurata" runat="server" />
</div>
<div class="p-0 flex-grow-1 text-end">
<asp:Label ID="valDurata" runat="server" />
</div>
</div>
<div class="d-flex">
<div class="p-0">
<asp:Label ID="lblCausale" runat="server" />
</div>
<div class="p-0 flex-grow-1 text-end">
&nbsp;<asp:Label ID="valCausale" runat="server" />
</div>
</div>
</asp:LinkButton>
</div>
</div>
</div>
<div runat="server" id="divWarn" class="clearDiv floCent warning">
<asp:HyperLink ID="hlComWarning" runat="server" Target="_blank" NavigateUrl="~/erroreComunicazione.aspx"
Text="errore com (101)" />
</div>
</div>
<div class="row small p-1">
<div class="col-12">
<asp:LinkButton ID="lnkMacchina" runat="server" OnClick="lnkMacchina_Click">
<div class="row">
<div class="col-3">
<asp:Label ID="lblCodArticolo" runat="server" />
</div>
<div class="col-9 text-end">
<asp:Label ID="valCodArticolo" runat="server" />
</div>
</div>
<div class="row">
<div class="col-6">
<asp:Label ID="valPODL" runat="server" />
</div>
<div class="col-6 text-end">
<asp:Label ID="valODL" runat="server" />
</div>
</div>
<div class="row">
<div class="col-3">
<asp:Label ID="lblProd" runat="server" />
</div>
<div class="col-9 text-end">
<asp:Label ID="valProd" runat="server" />
</div>
</div>
<div class="row">
<div class="col text-center">
<asp:Image runat="server" CssClass="img-fluid" ID="imgThumb" />
</div>
</div>
<div class="d-flex">
<div class="p-0">
<asp:Label ID="lblStato" runat="server" />
</div>
<div class="p-0 flex-grow-1 text-end">
<asp:Label ID="valStato" runat="server" />
</div>
</div>
<div class="d-flex">
<div class="p-0">
<asp:Label ID="lblDurata" runat="server" />
</div>
<div class="p-0 flex-grow-1 text-end">
<asp:Label ID="valDurata" runat="server" />
</div>
</div>
<div class="d-flex">
<div class="p-0">
<asp:Label ID="lblCausale" runat="server" />
</div>
<div class="p-0 flex-grow-1 text-end">
<asp:Label ID="valCausale" runat="server" />
</div>
</div>
</asp:LinkButton>
</div>
</div>
</div>
<div runat="server" id="divWarn" class="clearDiv floCent warning">
<asp:HyperLink ID="hlComWarning" runat="server" Target="_blank" NavigateUrl="~/erroreComunicazione.aspx"
Text="errore com (101)" />
</div>
</asp:Panel>
<div runat="server" id="divSegnaposto" class="row" style="min-width: 12em; min-height: 12em; width: 100%;">
<div class="col-xs-12">
&nbsp;
</div>
<div class="col-xs-12">
&nbsp;
</div>
</div>