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

Altri avanzamenti x gestire sequencer con vis.js e redis

Browse Source
This commit is contained in:
Samuele E. Locatelli
2018-06-07 22:13:03 +02:00
parent 5a6be10b9c
commit edd6f453ff
8 changed files with 39 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP-Site/MappaStatoSeq.aspx
+3
View File
@@ -3,6 +3,8 @@
<%@ Register Src="~/WebUserControls/mod_sequencerStati.ascx" TagPrefix="uc1" TagName="mod_sequencerStati" %>
<%@ Register Src="~/WebUserControls/mod_sequencerStatiJS.ascx" TagPrefix="uc1" TagName="mod_sequencerStatiJS" %>
<%@ Register Src="~/WebUserControls/mod_mainMap.ascx" TagPrefix="uc1" TagName="mod_mainMap" %>
<%@ Register Src="~/WebUserControls/mod_realtimeClock.ascx" TagPrefix="uc1" TagName="mod_realtimeClock" %>
<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" runat="server">
<div id="alto" class="menuMainY">
@@ -19,6 +21,7 @@
</div>
<uc1:mod_mainMap runat="server" ID="mod_mainMap" />
</div>
<uc1:mod_realtimeClock runat="server" ID="mod_realtimeClock" />
<uc1:mod_sequencerStatiJS runat="server" ID="mod_sequencerStatiJS2" periodo='<%# intervalloAnalisi %>' idxMacchina="0" numSplit="1000" />
<%--<asp:Repeater ID="repSeq" runat="server" OnItemDataBound="repSeq_ItemDataBound" DataSourceID="odsMappa">
MP-Site/MappaStatoSeq.aspx.cs
+8 -1
View File
@@ -31,7 +31,10 @@ namespace MoonPro
get
{
intervalloDate answ = new intervalloDate();
answ.fine = DateTime.Now;
// arrotondo all'ultima ora x adesso..
DateTime finePeriodo = DateTime.Now;
finePeriodo = finePeriodo.Date.AddHours(finePeriodo.Hour);
answ.fine = finePeriodo;
answ.inizio = answ.fine.AddDays(-numGg);
return answ;
}
@@ -45,6 +48,8 @@ namespace MoonPro
{
ddlNumgg.DataBind();
ddlNumgg.SelectedValue = memLayer.ML.confReadString("seq_gg");
// imposto date di intervallo
mod_sequencerStatiJS2.periodo = intervalloAnalisi;
}
//if (memLayer.ML.BoolSessionObj("graphDataRefresh"))
//{
@@ -80,6 +85,7 @@ namespace MoonPro
protected void ddlNumgg_SelectedIndexChanged(object sender, EventArgs e)
{
mod_sequencerStatiJS2.periodo = intervalloAnalisi;
#if false
repSeq.DataBind();
#endif
@@ -121,6 +127,7 @@ namespace MoonPro
protected void btnReload_Click(object sender, EventArgs e)
{
mod_sequencerStatiJS2.periodo = intervalloAnalisi;
#if false
repSeq.DataBind();
#endif
MP-Site/MappaStatoSeq.aspx.designer.cs
Generated
+9
View File
@@ -48,6 +48,15 @@ namespace MoonPro {
/// </remarks>
protected global::MoonPro.WebUserControls.mod_mainMap mod_mainMap;
/// <summary>
/// Controllo mod_realtimeClock.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::MoonPro.WebUserControls.mod_realtimeClock mod_realtimeClock;
/// <summary>
/// Controllo mod_sequencerStatiJS2.
/// </summary>
MP-Site/WS/MPData.asmx.cs
+1 -1
View File
@@ -81,7 +81,7 @@ namespace MoonPro.WS
inizio = Convert.ToDateTime(dataFrom),
fine = Convert.ToDateTime(dataTo)
};
string rKey = string.Format("jsonSeq_MIF_{0}_{1}_{2}_{3}", idxMacch, numSplit, _intervallo.inizio.ToString("yyyyMMdd_hhmmss"), _intervallo.fine.ToString("yyyyMMdd_hhmmss")).Replace(" ", "_");
string rKey = string.Format("jsonSeq_MIF_{0}_{1}_{2}_{3}", idxMacch, numSplit, _intervallo.inizio.ToString("yyyyMMdd_HHmmss"), _intervallo.fine.ToString("yyyyMMdd_HHmmss")).Replace(" ", "_");
//logger.lg.scriviLog("Nome key: " + rKey);
// oggetti x proseguire...
MP-Site/Web.config
+1 -1
View File
@@ -19,7 +19,7 @@
<!--<add key="seqCacheDurMin" value="1440" />-->
<!--default valori-->
<add key="appName" value="MoonPro.18" />
<add key="seq_gg" value="1" />
<add key="seq_gg" value="15" />
<add key="seq_height" value="40" />
<add key="seq_numSpl" value="1000" />
<add key="UpdateToDefault" value="true" />
MP-Site/WebMasterPages/MAPO_refresh30.master
+3 -1
View File
@@ -9,7 +9,9 @@
<title>MoonPro - MOnitor ONline della PROduzione</title>
<link href="~/Content/bootstrap.min.css" rel="stylesheet" type="text/css" />
<link href="~/Content/Style.min.css" rel="stylesheet" type="text/css" />
<link href="https://fonts.googleapis.com/css?family=Roboto+Condensed" rel="stylesheet" />
<link href="https://fonts.googleapis.com/css?family=Roboto+Condensed" rel="stylesheet" />
<script type="text/jscript" src="../vis/vis.js"></script>
<link href="../vis/vis.css" rel="stylesheet" />
</head>
<body class="body">
<form id="form1" runat="server">
MP-Site/WebUserControls/mod_sequencerStatiJS.ascx
+10 -16
View File
@@ -1,5 +1,5 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_sequencerStatiJS.ascx.cs" Inherits="MoonPro.WebUserControls.mod_sequencerStatiJS" %>
<div id='tlArea_<%=UniqueID.Replace("$","_") %>'></div>
<div id='tlGruppi_<%=UniqueID.Replace("$","_") %>'></div>
<asp:HiddenField runat="server" ID="hfNumSplit" />
@@ -9,8 +9,11 @@
<script type="text/javascript">
// vedere: http://visjs.org/docs/timeline/
$(document).ready(reloadData_<%=UniqueID.Replace("$","_") %>);
$('<%=hfIdxMacc.UniqueID.Replace("$","_") %>').change(reloadData_<%=UniqueID.Replace("$","_") %>);
//$(document).ready(reloadData_<%=UniqueID.Replace("$","_") %>());
<%--$('<%=hfIdxMacc.UniqueID.Replace("$","_") %>').change(reloadData_<%=UniqueID.Replace("$","_") %>());
$('<%=hfDataFrom.UniqueID.Replace("$","_") %>').change(reloadData_<%=UniqueID.Replace("$","_") %>());--%>
Sys.WebForms.PageRequestManager.getInstance().add_endRequest(reloadData_<%=UniqueID.Replace("$","_") %>());
// (ri)caricamento dati
function reloadData_<%=UniqueID.Replace("$","_") %>() {
@@ -19,7 +22,7 @@
var idxMacc = document.getElementById('<%=hfIdxMacc.UniqueID.Replace("ctl00$","").Replace("$","_") %>').value;
var dataFrom = document.getElementById('<%=hfDataFrom.UniqueID.Replace("ctl00$","").Replace("$","_") %>').value;
var dataTo = document.getElementById('<%=hfDataTo.UniqueID.Replace("ctl00$","").Replace("$","_") %>').value;
if (idxMacc != null) {
if (idxMacc != null && dataFrom != null && dataTo != null && dataFrom != '' && dataTo != '') {
// load e draw timeline
$.ajax({
type: "GET",
@@ -37,20 +40,11 @@
var container = document.getElementById('tlArea_<%=UniqueID.Replace("$","_") %>');
//console.log(response);
var output = response.responseText.replace("{\"d\":null}", "");
var output = response.responseText.replace("{\"d\":null}", "");
//console.log(output);
var tlData = JSON.parse(output);
var tlData = JSON.parse(output);
//console.log(tlData);
// Configuration for the Timeline
var options = {
stack: false
, horizontalScroll: true
, moveable: true
, zoomable: true
, start: '2018-05-01'
, end: '2018-05-30'
};
// Crea la Timeline
var timeline = new vis.Timeline(container, tlData.Items, tlData.Groups, tlData.Options);
}
MP-Site/WebUserControls/mod_sequencerStatiJS.ascx.cs
+4 -2
View File
@@ -1,6 +1,7 @@
using SteamWare;
using System;
using System.Linq;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace MoonPro.WebUserControls
@@ -45,8 +46,8 @@ namespace MoonPro.WebUserControls
}
set
{
DataFrom = value.inizio.ToString("yyyy-MM-dd");
DataTo = value.fine.ToString("yyyy-MM-dd");
DataFrom = value.inizio.ToString("yyyy-MM-dd HH:00:00");
DataTo = value.fine.ToString("yyyy-MM-dd HH:00:00");
}
}
/// <summary>
@@ -91,5 +92,6 @@ namespace MoonPro.WebUserControls
hfDataTo.Value = value;
}
}
}
}