Skip to content
Snippets Groups Projects
Commit 0e69f3df authored by jkerdreu's avatar jkerdreu
Browse files

Repush 


git-svn-id: https://redmine.imt-atlantique.fr/svn/xaal/code/Python/trunk@2189 b32b6428-25c9-4566-ad07-03861ab6144f
parent bf51cb6a
Branches
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
apps/dashboard/xaal/dashboard/templates/base.mako
+ 2
− 0
View file @ 0e69f3df
......@@ -11,6 +11,7 @@
<meta name="mobile-web-app-capable" content="yes">
<link rel="manifest" href="/static/manifest.json">
<link rel="icon" href="/static/imgs/favicon.ico">
<meta name="theme-color" content="#333" />
<!-- CSS & Fonts -->
<link href="/static/css/site.css" rel="stylesheet">
......@@ -25,6 +26,7 @@
<li><a href="#" onclick="openNav()">&#9776;</a></li>
<li><a href="/devices">Devices</a></li>
<li class="active"><a href="/grid">Grid</a></li>
<li><a href="/graph">Graph</a></li>
<!--
<li><a href="/bottle_info">HTTPD</a></li>
<li><a href="/links">Links</a></li>
......
apps/dashboard/xaal/dashboard/templates/graph.mako deleted 100644 → 0
+ 0
− 122
View file @ bf51cb6a
<%inherit file="base.mako"/>
<script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.13.0/moment.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/chart.js@2.8.0"></script>
<script src="https://cdn.jsdelivr.net/npm/hammerjs@2.0.8"></script>
<script src="https://cdn.jsdelivr.net/npm/chartjs-plugin-zoom@0.7.0"></script>
<br/>
<div class="content">
<div id="data">Warp10 datas for ${addr} daily</div>
<canvas id="chart" height=150></canvas>
</div>
<script>
//================ JS tools ====================================================
// dumbs functions to mimic jQuery selectors
var _ = function ( elem ) {
return document.querySelector( elem );
}
var __ = function ( elem ) {
return document.querySelectorAll( elem );
}
function update(data) {
//console.log(data);
//_('#data').innerHTML = "<pre>" + data +"</pre>";
clearData(chart);
addData(chart,data);
}
function clearData(chart) {
if (chart.hasOwnProperty('datasets')) {
chart.datasets.forEach((dataset) => {
dataset.data = [];
})
}
chart.data.labels=[];
chart.update();
}
function load(addr) {
var getUrl = window.location;
var url = getUrl.protocol + "//" + getUrl.host + "/warp10/daily/"+addr;
console.log(url);
fetch(url)
.then(response => response.json())
.then(data => update(data))
.catch(err => console.log(err))
}
function addData(chart, data) {
data.forEach((kv) => {
chart.data.labels.push(kv[0]);
chart.data.datasets[0].data.push(kv[1]);
}
);
//chart.data.labels.push(label);
//chart.data.datasets.forEach((dataset) => {
// dataset.data.push(data);
//});
chart.update();
chart.render();
}
var config = {
type: 'line',
data: {
datasets: [{
label: "Warp10 data",
borderColor: "#00bbd7",
pointRadius: 1,
borderWidth: 2,
}]
},
options: {
scales: {
xAxes: [{
type: 'time',
time: {
parser: 'X'
}
}],
},
}
};
var ctx = document.getElementById("chart").getContext("2d");
chart=new Chart(ctx, config);
//load("b4cec9fa-7513-4d87-bfc1-ee1107176cf0");
function refresh() {
console.log('Loading datas');
//load('2f31c922-01b2-4097-bfae-5753dde2cd42');
load('${addr}');
//load('7965f9be-92af-11e8-80cd-408d5c18c801');
}
refresh();
/*
setInterval(() => {
refresh();
},1000 * 60);
*/
</script>
apps/dashboard/xaal/dashboard/templates/grid.mako
+ 149
− 67
View file @ 0e69f3df
<%inherit file="base.mako"/>
<%namespace name="widgets" file="widgets.mako" />
<link href="/static/css/btns.css" rel="stylesheet">
<div class="grid-background">
<div class="grid">
<div class="grid-box">
<div style="text-align:center;">
${widgets.lamp('lamp_entree')}
${widgets.lamp('lamp_couloir')}
</div>
</div>
<b>Eclairage</b><br/>
<!-- <div style="text-align:center;"> -->
<!-- <span data-is="powerrelay" xaal_addr="092725ef-ca87-45d5-a619-9d7680046c91"/> -->
<!-- </div> -->
<!-- <div style="text-align:center;"> -->
<!-- <span data-is="powerrelay" xaal_addr="092725ef-ca87-45d5-a619-9d7680046c92"/> -->
<!-- </div> -->
<!-- <div style="text-align:center;"> -->
<!-- <span data-is="powerrelay" xaal_addr="092725ef-ca87-45d5-a619-9d7680046c94"/> -->
<!-- </div> -->
<table width=100%>
<tr>
<td>Salle</td>
<td><span data-is="powerrelay" xaal_addr="092725ef-ca87-45d5-a619-9d7680046c91"/></td>
</tr>
<tr>
<td>Salon</td>
<td><span data-is="powerrelay" xaal_addr="092725ef-ca87-45d5-a619-9d7680046c92"/></td>
</tr>
<tr>
<td>Test</td>
<td><span data-is="powerrelay" xaal_addr="092725ef-ca87-45d5-a619-9d7680046c94"/></td>
</tr>
</table>
<div class="grid-box">
<div style="text-align:center;">
${widgets.lamp('lamp_salon')}
${widgets.lamp('lamp_salle')}
</div>
</div>
<div class="grid-box">
<div style="text-align:center;">
${widgets.lamp('lamp_cuisine')}
${widgets.lamp('lamp_sdb')}
</div>
</div>
<div class="grid-box">
<div style="text-align:center;">
<b>Volet cuisine</b>
<span data-is="shutter" xaal_addr="2fe70f46-3ece-44d1-af34-2d82e10fb854"></span>
</div>
</div>
<div class="grid-box">
<div style="text-align:center;">
<b>Volet SDB</b>
<span data-is="shutter" xaal_addr="e4b05165-be5d-46d5-acd0-4da7be1158ed"></span>
<div>
<b>Température</b>
<!--<i class="fa fa-thermometer-half temperature" aria-hidden="true"></i> -->
<table>
<tr>
<td>Ext.</td>
<td>
<a href="/generic/5fcc6ad1-804d-49cb-b66c-e877f2374905">
<span data-is="thermometer" xaal_addr="5fcc6ad1-804d-49cb-b66c-e877f2374905"></span>
</a>
</td>
</tr>
<tr>
<td>Bureau</td>
<td>
<a href="/generic/2f31c922-01b2-4097-bfae-5753dde2cd42">
<span data-is="thermometer" xaal_addr="2f31c922-01b2-4097-bfae-5753dde2cd42"></span>
</a>
</td>
</tr>
<tr>
<td>Salon</td>
<td>
<a href="/generic/2f31c921-01b2-4097-bfae-5753dde2cd42">
<span data-is="thermometer" xaal_addr="2f31c921-01b2-4097-bfae-5753dde2cd42"></span>
</a>
</td>
</tr>
<tr>
<td>Chambre</td>
<td>
<a href="/generic/5ef94374-92af-11e8-80cd-408d5c18c800">
<span data-is="thermometer" xaal_addr="5ef94374-92af-11e8-80cd-408d5c18c800"></span>
</a>
</td>
</tr>
<tr>
<td>Owen</td>
<td>
<a href="/generic/af1f75e4-92af-11e8-80cd-408d5c18c800">
<span data-is="thermometer" xaal_addr="af1f75e4-92af-11e8-80cd-408d5c18c800"></span>
</a>
</td>
</tr>
</table>
</div>
</div>
<div class="grid-box">
<div style="text-align:center;">
${widgets.lamp('lamp_test')}
<div>
<b>Humidité</b>
<table>
<tr>
<td>Ext.</td>
<td>
<a href="/generic/5fcc6ad2-804d-49cb-b66c-e877f2374905">
<span data-is="hygrometer" xaal_addr="5fcc6ad2-804d-49cb-b66c-e877f2374905"></span>
</a>
</td>
</tr>
<tr>
<td>Bureau</td>
<td>
<a href="/generic/2f31c922-01b2-4097-bfae-5753dde2cd43">
<span data-is="hygrometer" xaal_addr="2f31c922-01b2-4097-bfae-5753dde2cd43"></span>
</a>
</td>
</tr>
<tr>
<td>Salon</td>
<td>
<a href="/generic/2f31c921-01b2-4097-bfae-5753dde2cd43">
<span data-is="hygrometer" xaal_addr="2f31c921-01b2-4097-bfae-5753dde2cd43"></span>
</a>
</td>
</tr>
<tr>
<td>Chambre</td>
<td>
<a href="/generic/5ef94374-92af-11e8-80cd-408d5c18c801">
<span data-is="hygrometer" xaal_addr="5ef94374-92af-11e8-80cd-408d5c18c801"></span>
</a>
</td>
</tr>
<tr>
<td>Owen</td>
<td>
<a href="/generic/af1f75e4-92af-11e8-80cd-408d5c18c801">
<span data-is="hygrometer" xaal_addr="af1f75e4-92af-11e8-80cd-408d5c18c801"></span>
</a>
</td>
</tr>
</table>
</div>
</div>
<div class="grid-box">
<b>Température</b>
${widgets.list_thermometer(['temp_owm','temp_bureau'])}
</div>
<div class="grid-box">
<b>Humidité</b>
${widgets.list_hygrometer(['rh_owm','rh_bureau'])}
</div>
<div class="grid-box">
<b>Al</b><br/>
<div style="text-align:center;">
<b>Wall Plug</b>
<span data-is="powerrelay" xaal_addr="5e50a1ed-5290-4cdb-b00f-1f968eee4401"></span>
<span data-is="powerrelay" xaal_addr="9e2d91a0-905a-11e8-9cdd-02150400d000"/>
</div>
<br/>
<span data-is="powermeter" xaal_addr="5e50a1ed-5290-4cdb-b00f-1f968eee4402"></span>
<div style="text-align:center;">
<span data-is="powerrelay" xaal_addr="9e2d91a0-905a-11e8-9cdd-02150400d001"/>
</div>
</div>
<div class="grid-box">
<div style="text-align:center;">
<b>Test1</b>
<span data-is="lamp" xaal_addr="dde4ab86-076f-11e8-b7ec-00fec8f71301"></span>
<span data-is="lamp" xaal_addr="0a238b82-0760-11e8-b576-00fec8f71301"></span>
</div>
<div class="grid-box" style="text-align:center;">
<br/><br/><br/><br/>
<span data-is="clock"/>
</div>
<div class="grid-box two">
<div data-is="generic-attrs" xaal_addr="7b81512c-0a96-11e8-ad38-3c77e618c6f7"></div>
<div data-is="generic-attrs" xaal_addr="aa4d1cbc-92af-11e8-80cd-408d5c18c800"></div>
</div>
<div class="grid-box two" style="align:center;">
<!-- img src="http://10.77.3.51/video3.mjpg" width=250 -->
</div>
<div class="grid-box" style="text-align:center;">
<br/><br/><br/>
<span data-is="clock"/>
<generic-attrs xaal_addr="092725ef-ca87-45d5-a619-9d7680046c94"></generic-attrs>
</div>
</div> <!-- end of grid -->
</div><!-- end of grib background -->
</div>
</div>
<script type="riot/tag" src="/static/tags/powerrelay.tag"></script>
<script type="riot/tag" src="/static/tags/hygrometer.tag"></script>
<script type="riot/tag" src="/static/tags/thermometer.tag"></script>
<script type="riot/tag" src="/static/tags/powermeter.tag"></script>
<script type="riot/tag" src="/static/tags/lamp.tag"></script>
<script type="riot/tag" src="/static/tags/shutter.tag"></script>
<script type="riot/tag" src="/static/tags/clock.tag"></script>
<script type="riot/tag" src="/static/tags/generic_attrs.tag"></script>
<script type="riot/tag" src="/static/tags/clock.tag"></script>
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment