Last fix SITE

This commit is contained in:
Samuele Locatelli
2023-09-13 07:32:47 +02:00
parent e1ebe72eac
commit 3b0d0878c9
2 changed files with 46 additions and 39 deletions
+45 -38
View File
@@ -5,46 +5,53 @@
<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" runat="server">
<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 class="card shadow">
<div class="card-header">
<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>
<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="card-body bg-secondary bg-gradient p-1">
<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>
</div>
+1 -1
View File
@@ -220,7 +220,7 @@ namespace MP_SITE
if (e != null)
{
mod_sequencerStati sequencer = (mod_sequencerStati)e.Item.FindControl("seqStato");
sequencer.larghezza = memLayer.ML.IntSessionObj("WindowWidth") - 110;
sequencer.larghezza = memLayer.ML.IntSessionObj("WindowWidth") - 120;
sequencer.graphHeight = memLayer.ML.CRI("seq_height");
sequencer.numSplit = memLayer.ML.CRI("seq_numSpl");
try