Skip to content

GitLab

Commit 2e9e8353 authored by Vladislav Rykov's avatar Vladislav Rykov
Browse files

separated device variables better control

parent de9f85de
Hide whitespace changes
Inline Side-by-side
app/app/views.py
View file @ 2e9e8353
...@@ -432,7 +432,8 @@ def application_device_data(appkey, devid, var, dest, page): ...@@ -432,7 +432,8 @@ def application_device_data(appkey, devid, var, dest, page):
arr = '[' arr = '['
last = [ddm.decode_datum(d, dev[3]) for d in last[1]] last = [ddm.decode_datum(d, dev[3]) for d in last[1]]
for d in last: for d in last:
arr += '[new Date('+str(d[0])+'*1000),'+str(d[2][var])+'],' if var in d[2]:
arr += '[new Date('+str(d[0])+'*1000),'+str(d[2][var])+'],'
arr += ']' arr += ']'
return arr return arr
elif dest == 'table': elif dest == 'table':
...@@ -442,7 +443,8 @@ def application_device_data(appkey, devid, var, dest, page): ...@@ -442,7 +443,8 @@ def application_device_data(appkey, devid, var, dest, page):
if last[0]: if last[0]:
last = [ddm.decode_datum(d, dev[3]) for d in last[1]] last = [ddm.decode_datum(d, dev[3]) for d in last[1]]
for d in last: for d in last:
t += '<tr><th>'+d[1]+'</th><th>'+str(d[2][var])+'</th></tr>' if var in d[2]:
t += '<tr><th>'+d[1]+'</th><th>'+str(d[2][var])+'</th></tr>'
return t return t
......
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