summaryrefslogtreecommitdiff
path: root/ebus/webapp/__init__.py
diff options
context:
space:
mode:
authoryvesf <yvesf-git@xapek.org>2011-07-17 16:00:10 +0200
committeryvesf <yvesf-git@xapek.org>2011-07-17 16:00:10 +0200
commit578f530ca0d0c01166b9a28fd0b2e0ab0ef750cc (patch)
treec38516b28133bf2c552cdf2756a2726999d01417 /ebus/webapp/__init__.py
parent314608a4f88b78a84556db9101b004f405534be7 (diff)
downloadebus-alt-578f530ca0d0c01166b9a28fd0b2e0ab0ef750cc.tar.gz
ebus-alt-578f530ca0d0c01166b9a28fd0b2e0ab0ef750cc.zip
.js ausgelagert; overview plot - keine selektion
Diffstat (limited to 'ebus/webapp/__init__.py')
-rw-r--r--ebus/webapp/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/ebus/webapp/__init__.py b/ebus/webapp/__init__.py
index bd78033..d65e2d1 100644
--- a/ebus/webapp/__init__.py
+++ b/ebus/webapp/__init__.py
@@ -64,7 +64,7 @@ def sensor_data_fromto(name,startdate,enddate):
v.append([int((time.mktime(value.timestamp.timetuple())+time.altzone*-1)*1000),value.value_int])
elif value.value_string != None:
v.append([int((time.mktime(value.timestamp.timetuple())+time.altzone*-1)*1000),value.value_string])
- return json.dumps(v)
+ return {'data':v, 'error':None}
# rechnet zeit so um wie Javascript