seepark_web.js: use our new sensors API instead of the random data

[chrisu/seepark.git] / web / seepark_web.py

diff --git a/web/seepark_web.py b/web/seepark_web.py
index 68929fc8154afdaf09b44c25c4d4b70de4278f63..9ad59f124d3a78f18b81f49bf43f17885cd958ef 100644 (file)
--- a/web/seepark_web.py
+++ b/web/seepark_web.py
@@ -54,31 +54,43 @@ def select_sensordata(initial_where, initial_sql_args):
         cursor = conn.execute(sql, *sql_args)
         result = [dict(row) for row in cursor]
 
         cursor = conn.execute(sql, *sql_args)
         result = [dict(row) for row in cursor]
 

-        mode = request.args.get('mode', 'full')
-        if mode == 'consolidated':
-            if begin is None or end is None:
-                pass
+    mode = request.args.get('mode', 'full')
+    if mode == 'consolidated':
+        if begin is None or end is None:
+            pass
+        else:
+            # copied from munin/master/_bin/munin-cgi-graph.in
+            resolutions = dict(
+                day   =   300,
+                week  =  1800,
+                month =  7200,
+                year  = 86400,
+            )
+            duration = (end - begin).total_seconds()
+            day = 60 * 60 * 24
+            if duration < day:
+                resolution = resolutions['day']
+            elif duration < 7 * day:
+                resolution = resolutions['week']
+            elif duration < 31 * day:
+                resolution = resolutions['month']

             else:
             else:

-                # copied from munin/master/_bin/munin-cgi-graph.in
-                resolutions = dict(
-                    day   =   300,
-                    week  =  1800,
-                    month =  7200,
-                    year  = 86400,
-                )
-                duration = (end - begin).total_seconds()
-                day = 60 * 60 * 24
-                if duration < day:
-                    resolution = resolutions['day']
-                elif duration < 7 * day:
-                    resolution = resolutions['week']
-                elif duration < 31 * day:
-                    resolution = resolutions['month']
-                else:
-                    resolution = resolutions['year']
-                # TODO: filter out samples from 'result'
-                # like loop over results and skip if timestamp(n+1)-timestamp(n)<resolution
-
+                resolution = resolutions['year']
+            # TODO: filter out samples from 'result'
+            # like loop over results and skip if timestamp(n+1)-timestamp(n)<resolution
+
+    format = request.args.get('format', 'default')
+    if format == 'c3':
+        c3result = dict()
+        for row in result:
+            if not row['sensor_id'] in c3result:
+                c3result[row['sensor_id']] = list()
+            c3result[row['sensor_id']].append(row['value'])
+            if not row['sensor_id'] + '_x' in c3result:
+                c3result[row['sensor_id'] + '_x'] = list()
+            dt = row['timestamp'].strftime('%Y-%m-%d %H:%M:%S')
+            c3result[row['sensor_id'] + '_x'].append(dt)
+        result = c3result

     return result
 
 
     return result
 
 


@@ -100,6 +112,7 @@ def sensorid(version, sensor_id):
     begin=<datetime>, optional, format like "2018-05-19T21:07:53"
     end=<datetime>, optional, format like "2018-05-19T21:07:53"
     mode=<full|consolidated>, optional. return all rows (default) or with lower resolution (for charts)
     begin=<datetime>, optional, format like "2018-05-19T21:07:53"
     end=<datetime>, optional, format like "2018-05-19T21:07:53"
     mode=<full|consolidated>, optional. return all rows (default) or with lower resolution (for charts)

+    format=<default|c3>, optional. return result as returned by sqlalchemy (default) or formatted for c3.js

     """
     result = select_sensordata('sensor_id=%s', sensor_id)
     return jsonify(result)
     """
     result = select_sensordata('sensor_id=%s', sensor_id)
     return jsonify(result)


@@ -113,6 +126,7 @@ def sensortype(version, sensor_type):
     begin=<datetime>, optional, format like "2018-05-19T21:07:53"
     end=<datetime>, optional, format like "2018-05-19T21:07:53"
     mode=<full|consolidated>, optional. return all rows (default) or with lower resolution (for charts)
     begin=<datetime>, optional, format like "2018-05-19T21:07:53"
     end=<datetime>, optional, format like "2018-05-19T21:07:53"
     mode=<full|consolidated>, optional. return all rows (default) or with lower resolution (for charts)

+    format=<default|c3>, optional. return result as returned by sqlalchemy (default) or formatted for c3.js

     """
     result = select_sensordata('value_type=%s', sensor_type)
     return jsonify(result)
     """
     result = select_sensordata('value_type=%s', sensor_type)
     return jsonify(result)