From: Philipp Spitzer Date: Wed, 30 May 2018 21:39:28 +0000 (+0200) Subject: The chart now shows the test data. X-Git-Url: https://git.toastfreeware.priv.at/chrisu/seepark.git/commitdiff_plain/ee028e1011a667330b65e34b2607125a109a7d58?ds=sidebyside;hp=94d0742cda00973bee15f951fcba142d481b807f The chart now shows the test data. --- diff --git a/web/static/seepark_web.js b/web/static/seepark_web.js index b58ad45..0c8d851 100644 --- a/web/static/seepark_web.js +++ b/web/static/seepark_web.js @@ -1,22 +1,20 @@ var chart = c3.generate({ - bindto: '#chart', - data: { - x: 'x', -// xFormat: '%Y%m%d', // 'xFormat' can be used as custom format of 'x' - columns: [ - ['x', '2013-01-01', '2013-01-02', '2013-01-03', '2013-01-04', '2013-01-05', '2013-01-06'], -// ['x', '20130101', '20130102', '20130103', '20130104', '20130105', '20130106'], - ['data1', 30, 200, 100, 400, 150, 250], - ['data2', 130, 340, 200, 500, 250, 350] - ] - }, - axis: { - x: { - type: 'timeseries', - tick: { - format: '%Y-%m-%d' - } - } - } + bindto: '#chart', + data: { + url: '/data', + mimeType: 'json', + xs: { + 'water_temperature': 'water_temperature_x', + 'air_temperature': 'air_temperature_x' + } + }, + axis: { + x: { + type: 'timeseries', + tick: { + format: '%Y-%m-%d' + } + } + } });