From a24ed3c503ff7ba883a0d283dbeec0b75783a3bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Patrick=20L=C3=BChne?= <patrick@luehne.de>
Date: Mon, 26 Feb 2018 13:23:39 +0100
Subject: [PATCH] Apply aggregation for single-view charts (#121)

Due to a mistake, the aggregation method was invoked only on the new
multiview charts but not on single-view charts. With this change,
single-view charts are handled like multiview charts with only one view.
This fixes the aggregation issue, makes things more consistent, and
cleans up the code.
---
 docs/assets/js/charts.js | 37 +++++++++++++++----------------------
 1 file changed, 15 insertions(+), 22 deletions(-)

diff --git a/docs/assets/js/charts.js b/docs/assets/js/charts.js
index d61c133c..35b63a6e 100644
--- a/docs/assets/js/charts.js
+++ b/docs/assets/js/charts.js
@@ -319,39 +319,32 @@ function createHistoryChart(canvas, actionBar)
             const context = canvas.getContext('2d');
 
             // Collect the data for each view in an array
-            let views = readConfig($(canvas), 'views');
+            let views;
 
-            // Aggregate data for each view separately
-            if (views != undefined)
+            if (hasConfig($(canvas), 'views'))
             {
+                views = readConfig($(canvas), 'views');
+
                 for (let i = 0; i < views.length; i++)
-                {
-                    if ('aggregate' in views[i] && views[i].aggregate != false)
-                        views[i].data = aggregateTimeData(data, views[i].aggregate);
-                    else
-                        views[i].data = data;
-                }
+                    views[i].data = data;
             }
             else
             {
-                views = [{'data': data, 'aggregate': false, 'default': true}];
-
-                // Compatibility with old format, to be removed after migrating all charts
-                if (hasConfig($(canvas), 'aggregate'))
-                    views[0]['aggregate'] = readConfig($(canvas), 'aggregate');
-
-                if (hasConfig($(canvas), 'slice'))
-                    views[0]['slice'] = readConfig($(canvas), 'slice');
-
-                if (hasConfig($(canvas), 'series'))
-                    views[0]['series'] = readConfig($(canvas), 'series');
+                if ($(canvas).data('config') != undefined)
+                    views = [$(canvas).data('config')];
+                else
+                    views = [{}];
 
-                if (hasConfig($(canvas), 'visibleSeries'))
-                    views[0]['visibleSeries'] = readConfig($(canvas), 'visibleSeries');
+                views[0].default = true;
+                views[0].data = data;
             }
 
+            // Aggregate data for each view separately
             for (let i = 0; i < views.length; i++)
             {
+                if ('aggregate' in views[i] && views[i].aggregate != false)
+                    views[i].data = aggregateTimeData(views[i].data, views[i].aggregate);
+
                 if ('slice' in views[i])
                 {
                     const sliceIndex0 = Math.max(0, Math.min(views[i].data.length,