From 2e9bbe4e27630f6f6bdfd714adcae35b7734d582 Mon Sep 17 00:00:00 2001 From: Philipp Spitzer Date: Wed, 22 Aug 2018 22:47:44 +0200 Subject: [PATCH] Include timestamp and value label so that those columns appear in the output. --- web/seepark_web.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/web/seepark_web.py b/web/seepark_web.py index 368f208..cbe55f8 100644 --- a/web/seepark_web.py +++ b/web/seepark_web.py @@ -94,7 +94,9 @@ def select_sensordata_grouped(sensor_id, sensor_type, begin, end): # Let the database do the grouping. Example in SQL (MySQL): # select to_seconds(datetime) DIV (60*60*24) as interval_id, min(datetime), max(datetime), min(temp), avg(temp), max(temp), count(temp) from openweathermap group by interval_id order by interval_id; - query = db.session.query(func.to_seconds(Sensors.timestamp).op('div')(resolution).label('g'), func.min(Sensors.timestamp), func.mean(Sensors.value), + query = db.session.query(func.to_seconds(Sensors.timestamp).op('div')(resolution).label('g'), + func.min(Sensors.timestamp).label('timestamp'), + func.avg(Sensors.value).label('value'), Sensors.sensor_id, Sensors.value_type, Sensors.sensor_name) if sensor_id is not None: query = query.filter(Sensors.sensor_id == sensor_id) -- 2.47.3