From: gregor herrmann <gregor@toastfreeware.priv.at>
Date: Thu, 2 Aug 2018 09:41:54 +0000 (+0200)
Subject: oops, looks like we made a logic error when refactoring
X-Git-Url: https://git.toastfreeware.priv.at/chrisu/seepark.git/commitdiff_plain/f093a1699e33f0e41cf970aafd2624aac8389bb5

oops, looks like we made a logic error when refactoring
---

diff --git a/web/seepark_web.py b/web/seepark_web.py
index a6d3930..82715dc 100644
--- a/web/seepark_web.py
+++ b/web/seepark_web.py
@@ -75,7 +75,7 @@ def select_sensordata(sensor_id, sensor_type, begin, end, mode):
         query = query.filter(Sensors.timestamp >= begin)
     if end is not None:
         query = query.filter(Sensors.timestamp <= end)
-    if mode == 'consolidated' and begin is None and end is None:
+    if mode == 'consolidated' and begin is not None and end is not None:
         # copied from munin/master/_bin/munin-cgi-graph.in
         # interval in seconds for data points
         resolutions = dict(
@@ -106,7 +106,7 @@ def select_openweatherdata(cityid, begin, end, mode):
         query = query.filter(OpenWeatherMap.datetime >= begin)
     if end is not None:
         query = query.filter(OpenWeatherMap.datetime <= end)
-    if mode == 'consolidated' and begin is None and end is None:
+    if mode == 'consolidated' and begin is not None and end is not None:
         # copied from munin/master/_bin/munin-cgi-graph.in
         # interval in seconds for data points
         resolutions = dict(