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

fix demo TC

Browse Source
This commit is contained in:
Samuele E. Locatelli
2018-06-03 22:16:53 +02:00
parent 4734272d9b
commit b8335f4a46
2 changed files with 43 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP-Site/MappaStatoSeq.aspx
+29 -28
View File
@@ -4,34 +4,35 @@
<%@ Register Src="~/WebUserControls/mod_mainMap.ascx" TagPrefix="uc1" TagName="mod_mainMap" %>
<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" runat="server">
<div id="alto" class="menuMainY">
<div style="float: right; padding-right: 10px;">
<asp:Label runat="server" ID="lblGiorno" ForeColor="White">selez. gg:</asp:Label>
<asp:DropDownList runat="server" ID="ddlNumgg" AutoPostBack="True" OnSelectedIndexChanged="ddlNumgg_SelectedIndexChanged" DataSourceID="odsGg" DataTextField="label" DataValueField="value">
</asp:DropDownList>
<asp:ObjectDataSource ID="odsGg" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getSubset" TypeName="MapoDb.DS_UtilityTableAdapters.v_selTallyTableAdapter">
<SelectParameters>
<asp:Parameter DefaultValue="1" Name="minVal" Type="Int32" />
<asp:Parameter DefaultValue="30" Name="maxVal" Type="Int32" />
</SelectParameters>
</asp:ObjectDataSource>
</div>
<uc1:mod_mainMap runat="server" ID="mod_mainMap" />
<div id="alto" class="menuMainY">
<div style="float: right; padding-right: 10px;">
<asp:Label runat="server" ID="lblGiorno" ForeColor="White">selez. gg:</asp:Label>
<asp:DropDownList runat="server" ID="ddlNumgg" AutoPostBack="True" OnSelectedIndexChanged="ddlNumgg_SelectedIndexChanged" DataSourceID="odsGg" DataTextField="label" DataValueField="value">
</asp:DropDownList>
<asp:ObjectDataSource ID="odsGg" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getSubset" TypeName="MapoDb.DS_UtilityTableAdapters.v_selTallyTableAdapter">
<SelectParameters>
<asp:Parameter DefaultValue="1" Name="minVal" Type="Int32" />
<asp:Parameter DefaultValue="30" Name="maxVal" Type="Int32" />
</SelectParameters>
</asp:ObjectDataSource>
</div>
<asp:Repeater ID="repSeq" runat="server" OnItemDataBound="repSeq_ItemDataBound" DataSourceID="odsMappa">
<ItemTemplate>
<div style="float: left; clear: both; font-size: 0.8em; width: 70px; 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; padding: 2px; background-color: white;">
<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>
<uc1:mod_mainMap runat="server" ID="mod_mainMap" />
</div>
<asp:Repeater ID="repSeq" runat="server" OnItemDataBound="repSeq_ItemDataBound" DataSourceID="odsMappa">
<ItemTemplate>
<div style="float: left; clear: both; font-size: 0.8em; width: 70px; 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; padding: 2px; background-color: white;">
<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 style="text-align: center; margin: auto; padding: 5px; clear: both;">
<asp:Button ID="btnReload" runat="server" Text="FORZA CARICAMENTO DATI" OnClick="btnReload_Click" Font-Size="1.3em" Width="20em" />
</div>
<div style="text-align: center; margin: auto; padding: 5px; clear: both;">
<asp:Button ID="btnReload" runat="server" Text="FORZA CARICAMENTO DATI" OnClick="btnReload_Click" Font-Size="1.3em" Width="20em" />
</div>
</asp:Content>
MP-Site/test.aspx
+14 -14
View File
@@ -5,7 +5,6 @@
<uc1:mod_realtimeClock ID="mod_realtimeClock1" runat="server" />
<div id="timelineArea"></div>
<br />
<div id="tcArea"></div>
<script type="text/javascript">
@@ -106,10 +105,10 @@
}
function plotTC(response) {
//var output = response.responseText.replace("{\"d\":null}", "");
var output = response.responseText.replace("{\"d\":null}", "");
//// recupero il container grafici
//var container = document.getElementById('tcArea');
// recupero il container grafici
var container = document.getElementById('tcArea');
//// ITES da deserializzazione risposta
//var items = JSON.parse(output);
//console.log(items);
@@ -129,21 +128,22 @@
//};
var items = [
{ x: '2014-06-11', y: 10 },
{ x: '2014-06-12', y: 25 },
{ x: '2014-06-13', y: 30 },
{ x: '2014-06-14', y: 10 },
{ x: '2014-06-15', y: 15 },
{ x: '2014-06-16', y: 30 }
{ x: '2018-06-11', y: 10, group: 0 },
{ x: '2018-06-12', y: 25, group: 0 },
{ x: '2018-06-13', y: 30, group: 0 },
{ x: '2018-06-14', y: 10, group: 1 },
{ x: '2018-06-15', y: 15, group: 1 },
{ x: '2018-06-16', y: 30, group: 1 }
];
var dataset = new vis.DataSet(items);
var options = {
start: '2014-06-10',
end: '2014-06-18',
//start: '2018-06-10',
//end: '2018-06-18',
sort: false,
sampling: false,
style: 'points'
sampling: true,
style: 'points',
height: '80px'
};
// crea lo scatter dei TC