From 0362859a8ef5d9a206d7d6910fd7664ec894a2b3 Mon Sep 17 00:00:00 2001 From: marc Date: Tue, 12 Jul 2011 22:23:14 +0200 Subject: =?UTF-8?q?Ausgabe=20unabh=C3=A4ngig=20vom=20Datentyp.=20Akutelles?= =?UTF-8?q?ten=20Wert.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ebus/webapp/.__init__.py.swp | Bin 12288 -> 0 bytes ebus/webapp/__init__.py | 43 +++++++++++++++++++++++++------------ ebus/webapp/static/.index.html.swp | Bin 12288 -> 0 bytes ebus/webapp/static/index.html | 6 ++++-- 4 files changed, 33 insertions(+), 16 deletions(-) delete mode 100644 ebus/webapp/.__init__.py.swp delete mode 100644 ebus/webapp/static/.index.html.swp (limited to 'ebus') diff --git a/ebus/webapp/.__init__.py.swp b/ebus/webapp/.__init__.py.swp deleted file mode 100644 index f68e2d4..0000000 Binary files a/ebus/webapp/.__init__.py.swp and /dev/null differ diff --git a/ebus/webapp/__init__.py b/ebus/webapp/__init__.py index 486187b..76cec16 100644 --- a/ebus/webapp/__init__.py +++ b/ebus/webapp/__init__.py @@ -19,27 +19,42 @@ Session.configure(bind=engine) @app.route('/') def index_file(): return static_files("index.html") - #return bottle.static_file("index.html", root="./static") @app.route('/static/:filename') def static_files(filename): return bottle.static_file(filename, root=os.path.join(os.path.dirname(__file__),"static")) +@app.route('/sensor/:name') +def sensor_data_single(name): + #s = Session() + #sensorid = s.query(model.Sensor).filter(model.Sensor.name == name).first() + #values = Session().query(model.Value).add_columns("timestamp","value_float","value_string","value_int") + #values = values.filter(model.Value.sensor == sensorid) + #return json.dumps(values.first().value_int) + return sensor_data_fromto(name,None,None) + @app.route('/sensor/:name/:startdate/:enddate') -def sensor_data(name,startdate,enddate): - #data = [-10,50935],[-9,50305],[-8,50403] - now = datetime.datetime.now() - # -24h - first = now.date() - datetime.timedelta(2) - last = now.date() +def sensor_data_fromto(name,startdate,enddate): s = Session() - sensorid = s.query(model.Sensor).filter(model.Sensor.name == name).first() + sensorid = s.query(model.Sensor).filter(model.Sensor.name == name).first() values = Session().query(model.Value).add_columns("timestamp","value_float","value_string","value_int") - values = values.filter(model.Value.sensor == sensorid) - values = values.filter(model.Value.timestamp.between(first,last)) + values = values.filter(model.Value.sensor == sensorid) + + if startdate == None or enddate == None: + queried_values = [] + queried_values.append(values.first()) + else: + now = datetime.datetime.now() + f = datetime.datetime.fromtimestamp(float(startdate)) + t = datetime.datetime.fromtimestamp(float(enddate)) + values = values.filter(model.Value.timestamp.between(f,t)) + queried_values = values.all() v = [] - for value in values.all(): - v.append([int(time.mktime(value.timestamp.timetuple())*1000),value.value_float]) + for value in queried_values: + if value.value_float != None: + v.append([int((time.mktime(value.timestamp.timetuple())+time.altzone*-1)*1000),value.value_float]) # time.altzone ist negativ + elif value.value_int != None: + 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 "

%s

" % dir(values[0]) - #return json.dumps(data) diff --git a/ebus/webapp/static/.index.html.swp b/ebus/webapp/static/.index.html.swp deleted file mode 100644 index 2a39bee..0000000 Binary files a/ebus/webapp/static/.index.html.swp and /dev/null differ diff --git a/ebus/webapp/static/index.html b/ebus/webapp/static/index.html index 84db15a..754fd62 100644 --- a/ebus/webapp/static/index.html +++ b/ebus/webapp/static/index.html @@ -5,7 +5,9 @@ -

ULTIMATE CONTROL PANEL

TEST

-- cgit v1.2.1