From: gregor herrmann <gregor@toastfreeware.priv.at>
Date: Thu, 2 Aug 2018 10:10:28 +0000 (+0200)
Subject: generalize convert_to_c3: sensors and weather have different fields
X-Git-Url: https://git.toastfreeware.priv.at/chrisu/seepark.git/commitdiff_plain/7157d90050101aa4149f126cccf275622d7a4e17

generalize convert_to_c3: sensors and weather have different fields
---

diff --git a/web/seepark_web.py b/web/seepark_web.py
index 82715dc..b132960 100644
--- a/web/seepark_web.py
+++ b/web/seepark_web.py
@@ -131,12 +131,12 @@ def select_openweatherdata(cityid, begin, end, mode):
     return query.all()
 
 
-def convert_to_c3(result):
+def convert_to_c3(result, id, field_x, field_y):
     c3result = defaultdict(list)
     for row in result:
-        c3result[row.sensor_id].append(row.value)
-        dt = row.timestamp.strftime('%Y-%m-%d %H:%M:%S')
-        c3result[row.sensor_id + '_x'].append(dt)
+        c3result[getattr(row, id)].append(getattr(row, field_y))
+        dt = getattr(row, field_x).strftime('%Y-%m-%d %H:%M:%S')
+        c3result[str(getattr(row, id)) + '_x'].append(dt)
     return c3result
 
 
@@ -163,7 +163,7 @@ def sensordata(sensor_id=None, sensor_type=None):
     result = select_sensordata(sensor_id, sensor_type, begin, end, mode)
 
     if format == 'c3':
-        return convert_to_c3(result)
+        return convert_to_c3(result, 'sensor_id', 'timestamp', 'value')
     return result
 
 
@@ -176,7 +176,7 @@ def openweathermapdata(cityid):
     result = select_openweatherdata(cityid, begin, end, mode)
 
     if format == 'c3':
-        return convert_to_c3(result)
+        return convert_to_c3(result, 'cityid', 'datetime', 'temp')
     return result