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

Timeline funzionante... testare x performances...

Browse Source
This commit is contained in:
Samuele E. Locatelli
2018-06-02 08:52:33 +02:00
parent cc63fecd71
commit d0aaa9a8de
3 changed files with 89 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP-Site/WebMasterPages/MAPO_refresh.master
+36 -34
View File
@@ -6,43 +6,45 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">
<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" />
<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" />
<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">
<asp:ScriptManager ID="sm" runat="server" EnablePartialRendering="true" EnableScriptGlobalization="true" EnableScriptLocalization="true">
</asp:ScriptManager>
<%--<asp:ToolkitScriptManager ID="sm" runat="server" EnablePartialRendering="true" EnableScriptGlobalization="true"
<form id="form1" runat="server">
<asp:ScriptManager ID="sm" runat="server" EnablePartialRendering="true" EnableScriptGlobalization="true" EnableScriptLocalization="true">
</asp:ScriptManager>
<%--<asp:ToolkitScriptManager ID="sm" runat="server" EnablePartialRendering="true" EnableScriptGlobalization="true"
EnableScriptLocalization="true">
</asp:ToolkitScriptManager>--%>
<asp:UpdatePanel ID="updPanelPagina" runat="server" UpdateMode="Conditional" RenderMode="Inline">
<ContentTemplate>
<asp:Timer ID="Timer1" runat="server" Interval="10000" OnTick="Timer1_Tick">
</asp:Timer>
<table class="formatTableGeneral" id="tblFormat" cellspacing="0" cellpadding="0">
<tr>
<td class="topMenu">
<uc1:mod_menuTop ID="Mod_menuTop1" runat="server" />
</td>
</tr>
<tr>
<td class="bodyMainCenter sfondoMain">
<div>
<asp:ContentPlaceHolder ID="ContentPlaceHolder1" runat="server">
</asp:ContentPlaceHolder>
</div>
</td>
</tr>
<tr>
<td class="bottomWrite">
<uc2:mod_menuBottom ID="Mod_menuBottom1" runat="server" />
</td>
</tr>
</table>
</ContentTemplate>
</asp:UpdatePanel>
</form>
<asp:UpdatePanel ID="updPanelPagina" runat="server" UpdateMode="Conditional" RenderMode="Inline">
<ContentTemplate>
<asp:Timer ID="Timer1" runat="server" Interval="10000" OnTick="Timer1_Tick">
</asp:Timer>
<table class="formatTableGeneral" id="tblFormat" cellspacing="0" cellpadding="0">
<tr>
<td class="topMenu">
<uc1:mod_menuTop ID="Mod_menuTop1" runat="server" />
</td>
</tr>
<tr>
<td class="bodyMainCenter sfondoMain">
<div>
<asp:ContentPlaceHolder ID="ContentPlaceHolder1" runat="server">
</asp:ContentPlaceHolder>
</div>
</td>
</tr>
<tr>
<td class="bottomWrite">
<uc2:mod_menuBottom ID="Mod_menuBottom1" runat="server" />
</td>
</tr>
</table>
</ContentTemplate>
</asp:UpdatePanel>
</form>
</body>
</html>
MP-Site/test.aspx
+42 -3
View File
@@ -1,5 +1,44 @@
<%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/MAPO_empty.Master" AutoEventWireup="true" CodeBehind="test.aspx.cs" Inherits="MoonPro.test" %>
<%@ Register src="WebUserControls/mod_realtimeClock.ascx" tagname="mod_realtimeClock" tagprefix="uc1" %>
<%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/MAPO_refresh.Master" AutoEventWireup="true" CodeBehind="test.aspx.cs" Inherits="MoonPro.test" %>
<%@ Register Src="WebUserControls/mod_realtimeClock.ascx" TagName="mod_realtimeClock" TagPrefix="uc1" %>
<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" runat="server">
<uc1:mod_realtimeClock ID="mod_realtimeClock1" runat="server" />
<uc1:mod_realtimeClock ID="mod_realtimeClock1" runat="server" />
<div id="visualization"></div>
<script type="text/javascript">
// DOM element where the Timeline will be attached
var container = document.getElementById('visualization');
// Create a DataSet (allows two way data-binding)
var items = new vis.DataSet([
{ id:1, content:'item 1', start:'2018-04-20 00:00:00', end:'2018-04-24 23:59:59', group:'1', className:'sv' }
,{ id:2, content:'item 2', start:'2018-04-14 00:00:00', end:'2018-04-15 23:59:59', group:'1', className:'sg' }
,{ id:3, content:'item 3', start:'2018-04-18 00:00:00', end:'2018-04-19 23:59:59', group:'1', className:'sr' }
,{ id:4, content:'item 4', start:'2018-04-16 00:00:00', end:'2018-04-17 23:59:59', group:'1', className:'sv' }
,{ id:5, content:'item 5', start:'2018-04-25 00:00:00', end:'2018-04-26 23:59:59', group:'1', className:'sg' }
,{ id:6, content:'item 6', start:'2018-04-27 00:00:00', end:'2018-04-30 23:59:59', group:'1', className:'sr' }
]);
var groups = [
{
id: 1
,content: 'Macc 1'
},
{
id: 2,
content: 'Macc 2'
// Optional: a field 'className', 'style', 'order', [properties]
}
// more groups...
];
// Configuration for the Timeline
var options = {
stack: false
};
// Create a Timeline
var timeline = new vis.Timeline(container, items, groups, options);
</script>
</asp:Content>
MP-Site/test.aspx.designer.cs
Generated
+11 -12
View File
@@ -1,24 +1,23 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// <generato automaticamente>
// Codice generato da uno strumento.
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se
// il codice viene rigenerato.
// </generato automaticamente>
//------------------------------------------------------------------------------
namespace MoonPro
{
namespace MoonPro {
public partial class test {
/// <summary>
/// mod_realtimeClock1 control.
/// Controllo mod_realtimeClock1.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// 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_realtimeClock1;
}