jprdonnelly/redash
1
0
Fork 0
mirror of https://github.com/getredash/redash.git synced 2025-12-25 01:03:20 -05:00
Code Issues Projects Releases Wiki Activity

Support multiple series on one row

Browse Source
This commit is contained in:
Arik Fraimovich
2013-11-05 13:50:27 +02:00
parent 770a8a8d57
commit 584c0d8509
1 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
rd_ui/app/scripts/services.js
View File

@@ -87,21 +87,20 @@
_.each(this.getData(), function (row) {
var point = {};
var seriesName = undefined;
var yName = "";
var xName = "";
var xValue = 0;
var yValues = {};
_.map(row, function (value, definition) {
_.each(row, function (value, definition) {
var type = definition.split("::")[1];
var name = definition.split("::")[0];
if (type == 'x') {
xName = name;
xValue = value;
point[type] = value;
}
if (type == 'y') {
yName = name;
yValues[name] = value;
point[type] = value;
}
@@ -110,19 +109,26 @@
}
});
if (seriesName === undefined) {
seriesName = yName;
}
if (series[seriesName] == undefined) {
series[seriesName] = {
name: seriesName,
type: 'column',
data: []
var addPointToSeries = function(seriesName, point) {
if (series[seriesName] == undefined) {
series[seriesName] = {
name: seriesName,
type: 'column',
data: []
}
}
series[seriesName]['data'].push(point);
}
if (seriesName === undefined) {
_.each(yValues, function(yValue, seriesName) {
addPointToSeries(seriesName, {'x': xValue, 'y': yValue});
});
} else {
addPointToSeries(seriesName, point);
}
series[seriesName]['data'].push(point);
});
return _.values(series);