martin/mdot_server
1
0
Fork 0
mirror of https://gitlab.silvrtree.co.uk/martind2000/mdot_server.git synced 2025-02-10 12:19:16 +00:00
Code Issues Projects Releases Wiki Activity

new graph

Browse Source
This commit is contained in:
Martin Donnelly 2016-08-15 15:06:12 +01:00
parent 6efd3a7a9e
commit 3cfa66268b
2 changed files with 34 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/js/mdot.js
View File

@ -274,7 +274,7 @@ var self = this;
var chartData = []; var chartData = [];
var temporal = {high:0, low:0}; var temporal = {high:0, low:0};
var HL = {high:0,low:0} var HL = {high:0,low:0};
_(this.collection.models).each(function(i) { _(this.collection.models).each(function(i) {
var dt = i.get('dt'); var dt = i.get('dt');

44
app/test.html
View File

@ -13,15 +13,37 @@
</head> </head>
<body> <body>
<div id="main"></div> <div class="mui-container">
<div id="graph"></div> <div class='mui-row'>
<div class="mui-col-md-3" >
<div id="main">
</div>
<div id="graph">
</div>
</div>
<div class="mui-col-md-9">
<div class="mui-container">
<div id="chartdiv" style="width:100%; height:600px;"></div>
</div>
</div>
</div>
<!--<div id="main"></div>-->
<!--<div id="graph"></div>-->
<div id="output"></div> <div id="output"></div>
<script type="text/template" id="main-template"> <script type="text/template" id="main-template">
<div class="mui-container"> <div class="mui-container">
<div class="mui-row"> <div class="mui-row">
<div class="mui-select mui-col-md-6"> <div class="mui-select">
<select id="device" name="device"> <select id="device" name="device">
<option> <option>
@ -79,22 +101,24 @@
</select> <label>Device</label> </select> <label>Device</label>
</div> </div>
<div class="mui-col-md-3"> </div>
<div class="mui-row">
<div class="mui-col-md-6">
<div class="mui-textfield"> <div class="mui-textfield">
<input type="date" placeholder="" id='from' name="from" /> <label>From</label> <input type="date" placeholder="" id='from' name="from" /> <label>From</label>
</div> </div>
</div> </div>
<div class="mui-col-md-3"> <div class="mui-col-md-6">
<div class="mui-textfield"> <div class="mui-textfield">
<input type="date" placeholder="" id='to' name="to" /> <label>To</label> <input type="date" placeholder="" id='to' name="to" /> <label>To</label>
</div> </div>
</div> </div>
</div> </div>
<div class="mui-row">
<button id='refresh' class="mui-btn mui-btn--small mui-btn--primary">Refresh</button>
</div> </div>
<div class="mui-row">
<button id='refresh' class="mui-btn mui-btn--small mui-btn--primary">Refresh</button>
</div> </div>
</script> </script>
@ -104,6 +128,7 @@
<script type="text/template" id="list-template"> <script type="text/template" id="list-template">
<ul></ul> <ul></ul>
</script> </script>
<script type="text/template" id="item-template"> <script type="text/template" id="item-template">
<div class="mui-row"> <div class="mui-row">
<div class="mui-col-md-2"><%= item.timestamp %></div> <div class="mui-col-md-2"><%= item.timestamp %></div>
@ -118,7 +143,7 @@
<script type="text/template" id="AMChart-template"> <script type="text/template" id="AMChart-template">
<div class="mui-container"> <div class="mui-container">
<div class="mui-row"> <div class="mui-row">
<div class="mui-select mui-col-md-6"> <div class="mui-select mui-col-md-12">
<select id="displaymode" name="displaymode"> <select id="displaymode" name="displaymode">
<option value="0"></option> <option value="0"></option>
<option value="1"> <option value="1">
@ -144,9 +169,6 @@
</div> </div>
</div> </div>
</div> </div>
<div class="mui-container">
<div id="chartdiv" style="width:100%; height:600px;"></div>
</div>
</script> </script>