Commit fa1ce97e authored by Vladislav Rykov's avatar Vladislav Rykov
Browse files

dev data table + graph optimizations + preset fixes

parent 5b12e9a8
from psycopg2 import sql
from app.helpers.misc import with_psql
from datetime import datetime
@with_psql
......@@ -66,6 +67,31 @@ def get_last_range(cur, appkey, devid, r):
return (True, data)
@with_psql
def get_last_hours(cur, appkey, devid, hours, p):
tn = 'dev_' +str(appkey)+ '_' +str(devid)
last = get_last_n(appkey, devid, 1)
utcb = last[1][0][0] - hours*3600*p
utcu = utcb + hours*3600
print(utcb, utcu)
query = """
SELECT * FROM
{}
WHERE
utc > %s
AND
utc <= %s
ORDER BY utc DESC
"""
cur.execute(
sql.SQL(query).format(sql.Identifier(tn)), [utcb, utcu])
data = cur.fetchall()
if (data == []):
return (False, 'There is no data for the device.')
else:
return (True, data)
@with_psql
def get_all(cur, appkey, devid):
......
This diff is collapsed.
......@@ -35,19 +35,7 @@
<div id="{{ k }}" class="tabcontent">
<div id="curve_chart_{{ k }}"></div>
<table class="table">
<thead>
<th>Time</th>
<th>{{ k }}</th>
</thead>
<tbody>
{% for d in data %}
<tr>
<th> {{ d[1] }} </th>
<th>{{ d[2][k] }}</th>
</tr>
{% endfor %}
</tbody>
<table class="table" id="table_{{ k }}">
</table>
</div>
{% endfor %}
......@@ -102,6 +90,7 @@
</div>
{% if data %}
<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.0/jquery.min.js"></script>
<script type="text/javascript">
google.charts.load('current', {'packages':['corechart']});
......@@ -151,8 +140,8 @@
document.getElementById(dname).style.display = "block";
evt.currentTarget.className += " active";
fetch(window.origin+'/dev-data/'+dname+'/graph/200/1').then(res => res.text()).then(data => drawChart(dname, eval(data)));
fetch(window.origin+'/dev-data/'+dname+'/graph/1').then(res => res.text()).then(data => drawChart(dname, eval(data)));
fetch(window.origin+'/dev-data/'+dname+'/table/1').then(res => res.text()).then(data => $('#table_'+dname).html(data));
}
document.getElementById("tab_{{ data[0][2] | first }}").click();
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment