From d4fcbc2c93e243a1e1b9be79276b15d73cba9512 Mon Sep 17 00:00:00 2001 From: gregor herrmann Date: Sat, 2 Jun 2018 01:50:51 +0200 Subject: [PATCH] use sensor_id and sensor_name from database --- web/seepark_web.py | 8 ++++---- web/static/seepark_web.js | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/web/seepark_web.py b/web/seepark_web.py index 74daa2f..910f0a9 100644 --- a/web/seepark_web.py +++ b/web/seepark_web.py @@ -4,10 +4,10 @@ app = Flask(__name__) @app.route("/data") def data(): data = { - 'water_temperature': [20, 19, 20, 21, 20, 21], - 'water_temperature_x': ['2018-05-20', '2018-05-21', '2018-05-22', '2018-05-23', '2018-05-24', '2018-05-27'], - 'air_temperature': [27, 32, 26, 29, 30, 31], - 'air_temperature_x': ['2018-05-21', '2018-05-22', '2018-05-23', '2018-05-24', '2018-05-25', '2018-05-27'], + '0316a2193bff': [20, 19, 20, 21, 20, 21], + '0316a2193bff_x': ['2018-05-20', '2018-05-21', '2018-05-22', '2018-05-23', '2018-05-24', '2018-05-27'], + '0316a21383ff': [27, 32, 26, 29, 30, 31], + '0316a21383ff_x': ['2018-05-21', '2018-05-22', '2018-05-23', '2018-05-24', '2018-05-25', '2018-05-27'], } return jsonify(data) diff --git a/web/static/seepark_web.js b/web/static/seepark_web.js index 3494dbb..c266172 100644 --- a/web/static/seepark_web.js +++ b/web/static/seepark_web.js @@ -7,12 +7,12 @@ var chart = c3.generate({ url: '/data', mimeType: 'json', xs: { - 'water_temperature': 'water_temperature_x', - 'air_temperature': 'air_temperature_x' + '0316a2193bff': '0316a2193bff_x', + '0316a21383ff': '0316a21383ff_x' }, names: { - 'water_temperature': 'Wassertemperatur', - 'air_temperature': 'Lufttemperatur' + '0316a2193bff': 'Wassertemperatur in 4 m Tiefe', + '0316a21383ff': 'Wassertemperatur in 5 m Tiefe' } }, axis: { -- 2.47.3