From 35b005a713dfc2160b9b887ab1fa37668a0bb504 Mon Sep 17 00:00:00 2001 From: gregor herrmann Date: Thu, 30 Aug 2018 18:49:44 +0200 Subject: [PATCH] editorial change: move a def() around --- web/seepark_web.py | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/web/seepark_web.py b/web/seepark_web.py index bd22d31..59e0c8b 100644 --- a/web/seepark_web.py +++ b/web/seepark_web.py @@ -59,19 +59,6 @@ class OpenWeatherMap(db.Model): __tablename__ = 'openweathermap' -def select_sensordata(sensor_id, sensor_type, begin, end): - query = Sensors.query - if sensor_id is not None: - query = query.filter(Sensors.sensor_id == sensor_id) - if sensor_type is not None: - query = query.filter(Sensors.value_type == sensor_type) - if begin is not None: - query = query.filter(Sensors.timestamp >= begin) - if end is not None: - query = query.filter(Sensors.timestamp <= end) - return query.all() - - def calc_grouping_resolution(begin, end): """How many data points should be between the timestamps begin and end?""" # copied from munin/master/_bin/munin-cgi-graph.in @@ -94,6 +81,19 @@ def calc_grouping_resolution(begin, end): return resolution +def select_sensordata(sensor_id, sensor_type, begin, end): + query = Sensors.query + if sensor_id is not None: + query = query.filter(Sensors.sensor_id == sensor_id) + if sensor_type is not None: + query = query.filter(Sensors.value_type == sensor_type) + if begin is not None: + query = query.filter(Sensors.timestamp >= begin) + if end is not None: + query = query.filter(Sensors.timestamp <= end) + return query.all() + + def select_sensordata_grouped(sensor_id, sensor_type, begin, end): # determine resolution (interval in seconds for data points) resolution = calc_grouping_resolution(begin, end) -- 2.47.3