X-Git-Url: https://git.toastfreeware.priv.at/chrisu/seepark.git/blobdiff_plain/7b21e3c3006c09e924e8422798b5dbd6d734c468..28d193ff34844a996984f5276713ddd1d0a7f264:/web/seepark_web.py?ds=sidebyside diff --git a/web/seepark_web.py b/web/seepark_web.py index bb59732..edde374 100644 --- a/web/seepark_web.py +++ b/web/seepark_web.py @@ -85,16 +85,16 @@ def select_sensordata(sensor_id, sensor_type, begin, end, mode): ) duration = (end - begin).total_seconds() day = 60 * 60 * 24 - if duration < day: + if duration <= day: resolution = resolutions['day'] - elif duration < 7 * day: + elif duration <= 7 * day: resolution = resolutions['week'] - elif duration < 31 * day: + elif duration <= 31 * day: resolution = resolutions['month'] else: resolution = resolutions['year'] # TODO: filter out samples from 'result' - # something like + # something like # 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; return query.all()