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

Continu fix con padding vari

Browse Source
This commit is contained in:
Samuele Locatelli
2023-09-12 19:19:42 +02:00
parent 3dd4d8c912
commit c3693bef4e
10 changed files with 102 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP-SITE/AnalisiProduzione.aspx
+21 -24
View File
@@ -6,31 +6,28 @@
<%@ Register Src="~/WebUserControls/mod_AnPro_DettGg.ascx" TagPrefix="uc1" TagName="mod_AnPro_DettGg" %>
<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" runat="server">
<div id="medio" class="p-2">
<div class="p-3">
<div class="row">
<div class="col-3">
<div class="uiMini">
<div class="card ">
<div class="card-header">
<h4><%: traduci("FiltroPeriodoImpianti") %></h4>
</div>
<div class="card-body p-0">
<div class="row p-1">
<div class="col-4">
<asp:CheckBox CssClass="btn btn-default" ID="chkOdlClosed" Checked="false" runat="server" AutoPostBack="True" Text='<%# traduci("ODLChiusi") %>' Width="100%" OnCheckedChanged="chkOdlClosed_CheckedChanged" />
</div>
<div class="col-4">
<asp:CheckBox CssClass="btn btn-default" ID="chkOdlOpen" Checked="true" runat="server" AutoPostBack="True" Text='<%# traduci("ODLAperti") %>' Width="100%" OnCheckedChanged="chkOdlOpen_CheckedChanged" />
</div>
<div class="col-4">
<asp:CheckBox CssClass="btn btn-default" ID="chkOdlNew" Checked="false" runat="server" AutoPostBack="True" Text='<%# traduci("PODL") %>' Width="100%" OnCheckedChanged="chkOdlNew_CheckedChanged" />
</div>
<div class="col-12">
<uc1:mod_periodoAnalisi runat="server" ID="mod_periodoAnalisi" />
<asp:ListBox ID="listMacchine" runat="server" DataSourceID="odsMacchine" DataTextField="label" DataValueField="value" SelectionMode="Multiple" Height="30em" Width="100%" AutoPostBack="true" OnSelectedIndexChanged="listMacchine_SelectedIndexChanged" OnDataBound="listMacchine_DataBound" Font-Size="1.5em"></asp:ListBox>
<asp:ObjectDataSource ID="odsMacchine" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getAttive" TypeName="MapoDb.DS_UtilityTableAdapters.v_selMacchineTableAdapter"></asp:ObjectDataSource>
</div>
<div class="card shadow">
<div class="card-header">
<h4><%: traduci("FiltroPeriodoImpianti") %></h4>
</div>
<div class="card-body p-0">
<div class="row p-1">
<div class="col-4">
<asp:CheckBox CssClass="btn btn-default" ID="chkOdlClosed" Checked="false" runat="server" AutoPostBack="True" Text='<%# traduci("ODLChiusi") %>' Width="100%" OnCheckedChanged="chkOdlClosed_CheckedChanged" />
</div>
<div class="col-4">
<asp:CheckBox CssClass="btn btn-default" ID="chkOdlOpen" Checked="true" runat="server" AutoPostBack="True" Text='<%# traduci("ODLAperti") %>' Width="100%" OnCheckedChanged="chkOdlOpen_CheckedChanged" />
</div>
<div class="col-4">
<asp:CheckBox CssClass="btn btn-default" ID="chkOdlNew" Checked="false" runat="server" AutoPostBack="True" Text='<%# traduci("PODL") %>' Width="100%" OnCheckedChanged="chkOdlNew_CheckedChanged" />
</div>
<div class="col-12">
<uc1:mod_periodoAnalisi runat="server" ID="mod_periodoAnalisi" />
<asp:ListBox ID="listMacchine" runat="server" DataSourceID="odsMacchine" DataTextField="label" DataValueField="value" SelectionMode="Multiple" Height="30em" Width="100%" AutoPostBack="true" OnSelectedIndexChanged="listMacchine_SelectedIndexChanged" OnDataBound="listMacchine_DataBound" Font-Size="1.5em"></asp:ListBox>
<asp:ObjectDataSource ID="odsMacchine" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getAttive" TypeName="MapoDb.DS_UtilityTableAdapters.v_selMacchineTableAdapter"></asp:ObjectDataSource>
</div>
</div>
</div>
@@ -54,4 +51,4 @@
</div>
</div>
</div>
</asp:Content>
</asp:Content>
MP-SITE/MappaStato.aspx
+1 -1
View File
@@ -5,7 +5,7 @@
<%@ Register Src="~/WebUserControls/mod_statoMacchina.ascx" TagName="mod_statoMacchina" TagPrefix="uc1" %>
<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" runat="Server">
<div>
<div class="pt-1">
<asp:Repeater runat="server" ID="repRows" DataSourceID="odsRows">
<ItemTemplate>
<div class="row m-2">
MP-SITE/MappaStatoSeq.aspx
+40 -38
View File
@@ -4,46 +4,48 @@
<%@ Register Src="~/WebUserControls/mod_sequencerStatiJS.ascx" TagPrefix="uc1" TagName="mod_sequencerStatiJS" %>
<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" runat="server">
<div class="row pt-3">
<div class="col-4 col-lg-3 col-xl-2 text-end">
</div>
<div class="col-4 col-lg-6 col-xl-8">
<asp:LinkButton runat="server" ID="lbtForceReload" CssClass="btn btn-sm btn-danger w-50" OnClick="lbtForceReload_Click"><i class="fa fa-exclamation-triangle"></i> FORZA CARICAMENTO DATI <i class="fa fa-exclamation-triangle"></i></asp:LinkButton>
</div>
<div class="col-4 col-lg-3 col-xl-2 text-end">
<div class="input-group input-group-sm">
<span class="input-group-text"><% = traduci("numDays") %></span>
<asp:DropDownList runat="server" ID="ddlNumgg" AutoPostBack="True" OnSelectedIndexChanged="ddlNumgg_SelectedIndexChanged" DataSourceID="odsGg" DataTextField="label" DataValueField="value" OnDataBound="ddlNumgg_DataBound" CssClass="form-select form-select-sm" Width="3em">
</asp:DropDownList>
<asp:ObjectDataSource ID="odsGg" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getSubsetMult" TypeName="MapoDb.DS_UtilityTableAdapters.v_selTallyTableAdapter">
<SelectParameters>
<asp:Parameter DefaultValue="1" Name="minVal" Type="Int32" />
<asp:Parameter DefaultValue="90" Name="maxVal" Type="Int32" />
<asp:Parameter DefaultValue="5" Name="mult" Type="Int32" />
</SelectParameters>
</asp:ObjectDataSource>
<div class="py-2 px-3">
<div class="row">
<div class="col-4 col-lg-3 col-xl-2 text-end">
</div>
<div class="col-4 col-lg-6 col-xl-8">
<asp:LinkButton runat="server" ID="lbtForceReload" CssClass="btn btn-sm btn-danger w-50" OnClick="lbtForceReload_Click"><i class="fa fa-exclamation-triangle"></i> FORZA CARICAMENTO DATI <i class="fa fa-exclamation-triangle"></i></asp:LinkButton>
</div>
<div class="col-4 col-lg-3 col-xl-2 text-end">
<div class="input-group input-group-sm">
<span class="input-group-text"><% = traduci("numDays") %></span>
<asp:DropDownList runat="server" ID="ddlNumgg" AutoPostBack="True" OnSelectedIndexChanged="ddlNumgg_SelectedIndexChanged" DataSourceID="odsGg" DataTextField="label" DataValueField="value" OnDataBound="ddlNumgg_DataBound" CssClass="form-select form-select-sm" Width="3em">
</asp:DropDownList>
<asp:ObjectDataSource ID="odsGg" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getSubsetMult" TypeName="MapoDb.DS_UtilityTableAdapters.v_selTallyTableAdapter">
<SelectParameters>
<asp:Parameter DefaultValue="1" Name="minVal" Type="Int32" />
<asp:Parameter DefaultValue="90" Name="maxVal" Type="Int32" />
<asp:Parameter DefaultValue="5" Name="mult" Type="Int32" />
</SelectParameters>
</asp:ObjectDataSource>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-12">
<div runat="server" id="divGraphJS">
<uc1:mod_sequencerStatiJS runat="server" ID="mod_sequencerStatiJS2" numGG='<%# Convert.ToInt32(ddlNumgg.SelectedValue) %>' idxMacchina="0" numSplit="100" />
</div>
<div runat="server" id="divGraphLegacy">
<asp:Repeater ID="repSeq" runat="server" OnItemDataBound="repSeq_ItemDataBound" DataSourceID="odsMappa">
<ItemTemplate>
<div style="float: left; clear: both; font-size: 0.8em; width: 64px; height: 36px; margin: 2px 0px; padding: 2px 4px; text-align: center;" class='<%# cssStatoMacchina(Eval("idxMacchina").ToString()) %>'>
<asp:LinkButton ID="lnkMacchina" runat="server" OnClick="lnkMacchina_Click" CommandArgument='<%# Eval("idxMacchina") %>'>
<asp:Label runat="server" ID="lblMacchina" Text='<%# nomeMacchina(Eval("idxMacchina").ToString()) %>' />
</asp:LinkButton>
</div>
<div style="float: left; background-color: transparent;">
<uc1:mod_sequencerStati runat="server" ID="seqStato" identificativo='<%# Eval("idxMacchina") %>' intervallo='<%# intervalloAnalisi %>' graphHeight="32" />
</div>
</ItemTemplate>
</asp:Repeater>
<asp:ObjectDataSource ID="odsMappa" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="GetData" TypeName="MapoDb.DS_applicazioneTableAdapters.StatoMacchineTableAdapter" FilterExpression="NOT idxMacchina LIKE '%#%'"></asp:ObjectDataSource>
<div class="row">
<div class="col-12">
<div runat="server" id="divGraphJS">
<uc1:mod_sequencerStatiJS runat="server" ID="mod_sequencerStatiJS2" numGG='<%# Convert.ToInt32(ddlNumgg.SelectedValue) %>' idxMacchina="0" numSplit="100" />
</div>
<div runat="server" id="divGraphLegacy">
<asp:Repeater ID="repSeq" runat="server" OnItemDataBound="repSeq_ItemDataBound" DataSourceID="odsMappa">
<ItemTemplate>
<div style="float: left; clear: both; font-size: 0.8em; width: 64px; height: 36px; margin: 2px 0px; padding: 2px 4px; text-align: center;" class='<%# cssStatoMacchina(Eval("idxMacchina").ToString()) %>'>
<asp:LinkButton ID="lnkMacchina" runat="server" OnClick="lnkMacchina_Click" CommandArgument='<%# Eval("idxMacchina") %>'>
<asp:Label runat="server" ID="lblMacchina" Text='<%# nomeMacchina(Eval("idxMacchina").ToString()) %>' />
</asp:LinkButton>
</div>
<div style="float: left; background-color: transparent;">
<uc1:mod_sequencerStati runat="server" ID="seqStato" identificativo='<%# Eval("idxMacchina") %>' intervallo='<%# intervalloAnalisi %>' graphHeight="32" />
</div>
</ItemTemplate>
</asp:Repeater>
<asp:ObjectDataSource ID="odsMappa" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="GetData" TypeName="MapoDb.DS_applicazioneTableAdapters.StatoMacchineTableAdapter" FilterExpression="NOT idxMacchina LIKE '%#%'"></asp:ObjectDataSource>
</div>
</div>
</div>
</div>
MP-SITE/StatisticheImpiego.aspx
+16 -19
View File
@@ -4,34 +4,31 @@
<%@ Register Src="~/WebUserControls/mod_periodoAnalisi.ascx" TagPrefix="uc1" TagName="mod_periodoAnalisi" %>
<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" runat="server">
<div id="medio" class="p-2">
<div class="p-3">
<div class="row">
<div class="col-3">
<div class="uiMini">
<div class="card ">
<div class="card-header">
<h3 class="panel-title"><%: traduci("FiltroPeriodoImpianti") %></h3>
</div>
<div class="card-body p-0">
<div class="row p-1">
<div class="col-12">
<uc1:mod_periodoAnalisi runat="server" ID="mod_periodoAnalisi" />
<br />
<asp:ListBox ID="listMacchine" runat="server" DataSourceID="odsMacchine" DataTextField="label" DataValueField="value" SelectionMode="Multiple" Height="400px" Width="100%" AutoPostBack="true" OnSelectedIndexChanged="listMacchine_SelectedIndexChanged" OnDataBound="listMacchine_DataBound" Font-Size="1.5em"></asp:ListBox>
<asp:ObjectDataSource ID="odsMacchine" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getAttive" TypeName="MapoDb.DS_UtilityTableAdapters.v_selMacchineTableAdapter" FilterExpression="NOT value LIKE '%#%'"></asp:ObjectDataSource>
</div>
<div class="col-3 uiMini2">
<div class="card shadow">
<div class="card-header">
<h3 class="panel-title"><%: traduci("FiltroPeriodoImpianti") %></h3>
</div>
<div class="card-body p-0" style="min-height:40em;">
<div class="row p-1">
<div class="col-12">
<uc1:mod_periodoAnalisi runat="server" ID="mod_periodoAnalisi" />
<br />
<asp:ListBox ID="listMacchine" runat="server" DataSourceID="odsMacchine" DataTextField="label" DataValueField="value" SelectionMode="Multiple" Height="23em" Width="100%" AutoPostBack="true" OnSelectedIndexChanged="listMacchine_SelectedIndexChanged" OnDataBound="listMacchine_DataBound" Font-Size="1.5em"></asp:ListBox>
<asp:ObjectDataSource ID="odsMacchine" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getAttive" TypeName="MapoDb.DS_UtilityTableAdapters.v_selMacchineTableAdapter" FilterExpression="NOT value LIKE '%#%'"></asp:ObjectDataSource>
</div>
</div>
</div>
</div>
</div>
<div class="col-9 text-center">
<div class="card ">
<div class="card shadow">
<div class="card-header">
<h3 class="panel-title"><%: traduci("Statistiche") %></h3>
</div>
<div class="card-body p-0">
<div class="card-body p-0" style="min-height:40em;">
<div class="row p-1">
<div class="col-12">
<div id="medio1">
@@ -52,4 +49,4 @@
</div>
</div>
</div>
</asp:Content>
</asp:Content>
MP-Site/WebUserControls/mod_AnPro_DettArt.ascx
+1 -1
View File
@@ -2,7 +2,7 @@
<%@ Register Src="~/WebUserControls/mod_righePag.ascx" TagName="mod_righePag" TagPrefix="uc2" %>
<div class="card">
<div class="card shadow">
<div class="card-header bg-info text-light">
<h5 class="card-title"><%: traduci("AnProDetODL") %></h5>
</div>
MP-Site/WebUserControls/mod_AnPro_DettGg.ascx
+1 -1
View File
@@ -2,7 +2,7 @@
<%@ Register Src="~/WebUserControls/mod_righePag.ascx" TagName="mod_righePag" TagPrefix="uc2" %>
<div class="card">
<div class="card shadow">
<div class="card-header bg-info text-light">
<h5 class="card-title2"><%: traduci("AnProDetGG") %></h5>
</div>
MP-Site/WebUserControls/mod_AnPro_ODL.ascx
+1 -1
View File
@@ -2,7 +2,7 @@
<%@ Register Src="~/WebUserControls/mod_righePag.ascx" TagName="mod_righePag" TagPrefix="uc2" %>
<div class="card">
<div class="card shadow">
<div class="card-header py-1">
<h4 class="card-title"><%: traduci("AnProTotPerOdl") %></h4>
</div>
MP-Site/WebUserControls/mod_AnPro_PODL.ascx
+1 -1
View File
@@ -2,7 +2,7 @@
<%@ Register Src="~/WebUserControls/mod_righePag.ascx" TagName="mod_righePag" TagPrefix="uc2" %>
<div class="card">
<div class="card shadow">
<div class="card-header py-1 bg-success">
<div class="row">
<div class="col-2"></div>
MP-Site/WebUserControls/mod_AnPro_Totali.ascx
+1
View File
@@ -3,4 +3,5 @@
<%@ Register Src="~/WebUserControls/mod_AnPro_PODL.ascx" TagPrefix="uc1" TagName="mod_AnPro_PODL" %>
<uc1:mod_AnPro_ODL runat="server" id="mod_AnPro_ODL" />
<br />
<uc1:mod_AnPro_PODL runat="server" id="mod_AnPro_PODL" />
MP-Site/WebUserControls/mod_AnPro_Totali.ascx.designer.cs
Generated
+19 -17
View File
@@ -1,32 +1,34 @@
//------------------------------------------------------------------------------
// <generato automaticamente>
// Codice generato da uno strumento.
// <auto-generated>
// This code was generated by a tool.
//
// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se
// il codice viene rigenerato.
// </generato automaticamente>
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
namespace MP_SITE.WebUserControls {
public partial class mod_AnPro_Totali {
namespace MP_SITE.WebUserControls
{
public partial class mod_AnPro_Totali
{
/// <summary>
/// Controllo mod_AnPro_ODL.
/// mod_AnPro_ODL control.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::MP_SITE.WebUserControls.mod_AnPro_ODL mod_AnPro_ODL;
/// <summary>
/// Controllo mod_AnPro_PODL.
/// mod_AnPro_PODL control.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::MP_SITE.WebUserControls.mod_AnPro_PODL mod_AnPro_PODL;
}