Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Multiple chart fixes #166

Merged
merged 8 commits into from
Jan 17, 2013
Merged

Multiple chart fixes #166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
800c24f
Ignore IntelliJ IDEA project files
nurkiewicz Jan 10, 2013
82ed124
* Fixing charts when rows using multiple levels of the same hierarchy
nurkiewicz Jan 10, 2013
d91dc7f
No longer appending '[N]' counter unless labels have duplicates
nurkiewicz Jan 10, 2013
205a060
No longer appending '[N]' counter unless labels have duplicates - dea…
nurkiewicz Jan 10, 2013
8c6192d
Edge condition if no label is available
nurkiewicz Jan 10, 2013
54adea7
Introduce cellset local variable to avoid duplication
nurkiewicz Jan 10, 2013
3423da5
Fixing stacked bar chart by implicitly changing empty strings to 0
nurkiewicz Jan 10, 2013
1b30e8e
More distinct, pleasantly looking colors based on jqPlot project
nurkiewicz Jan 10, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -4,3 +4,5 @@ target/
node_modules/ node_modules/
*.DS_Store *.DS_Store
.*.swp .*.swp
*.iml
.idea
92 changes: 61 additions & 31 deletions js/saiku/plugins/Chart/plugin.js
View file
Open in desktop
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -47,15 +47,15 @@ var Chart = Backbone.View.extend({
"</div>").css({ "</div>").css({
'padding-bottom': '10px' 'padding-bottom': '10px'
}); });
this.nav.find('a').css({ this.nav.find('a').css({
color: '#666', color: '#666',
'margin-right': '5px', 'margin-right': '5px',
'text-decoration': 'none', 'text-decoration': 'none',
'border': '1px solid #ccc', 'border': '1px solid #ccc',
padding: '5px' padding: '5px'
}) })
.click(this.setOptions); .click(this.setOptions);

// Append chart to workspace // Append chart to workspace
$(this.workspace.el).find('.workspace_results') $(this.workspace.el).find('.workspace_results')
.prepend($(this.el).hide()) .prepend($(this.el).hide())
Expand Down Expand Up @@ -141,7 +141,7 @@ var Chart = Backbone.View.extend({
legend: true, legend: true,
legendPosition:"top", legendPosition:"top",
legendAlign: "right", legendAlign: "right",
colors: ["#B40010", "#CCC8B4", "#DDB965", "#72839D", "#1D2D40"], colors: ["#4bb2c5", "#c5b47f", "#EAA228", "#579575", "#839557", "#958c12", "#953579", "#4b5de4", "#d8b83f", "#ff5800", "#0085cc"],
type: 'BarChart' type: 'BarChart'
}, this.options); }, this.options);


Expand Down Expand Up @@ -204,50 +204,80 @@ var Chart = Backbone.View.extend({
this.data.metadata = []; this.data.metadata = [];
this.data.height = 0; this.data.height = 0;
this.data.width = 0; this.data.width = 0;


if (args.data.cellset && args.data.cellset.length > 0) { function makeSureUniqueLabels(resultset) {
function appendUniqueCounter() {
for(var i = 0; i < resultset.length; ++i) {
var record = resultset[i];
record[0] = record[0] + ' [' + (i + 1) + ']';
}
}

var labelsSet = {};
for(var i = 0; i < resultset.length; ++i) {
var record = resultset[i];
var label = record[0];
if(labelsSet[label]) {
appendUniqueCounter();
return;
} else {
labelsSet[label] = true;
}
}
}

var cellset = args.data.cellset;
if (cellset && cellset.length > 0) {


var lowest_level = 0; var lowest_level = 0;


for (var row = 0; row < args.data.cellset.length; row++) { for (var row = 0; row < cellset.length; row++) {
if (args.data.cellset[row][0].type == "ROW_HEADER_HEADER") { if (cellset[row][0].type == "ROW_HEADER_HEADER") {
this.data.metadata = []; this.data.metadata = [];
for (var field = 0; field < args.data.cellset[row].length; field++) { for (var field = 0; field < cellset[row].length; field++) {
if (args.data.cellset[row][field].type == "ROW_HEADER_HEADER") { if (cellset[row][field].type == "ROW_HEADER_HEADER") {
this.data.metadata.shift(); this.data.metadata.shift();
lowest_level = field; lowest_level = field;
} }


this.data.metadata.push({ this.data.metadata.push({
colIndex: field, colIndex: field,
colType: typeof(args.data.cellset[row + 1][field].value) !== "number" && colType: typeof(cellset[row + 1][field].value) !== "number" &&
isNaN(args.data.cellset[row + 1][field].value isNaN(cellset[row + 1][field].value
.replace(/[^a-zA-Z 0-9.]+/g,'')) ? "String" : "Numeric", .replace(/[^a-zA-Z 0-9.]+/g,'')) ? "String" : "Numeric",
colName: args.data.cellset[row][field].value colName: cellset[row][field].value
}); });
} }
} else if (args.data.cellset[row][0].value !== "null" && args.data.cellset[row][0].value !== "") { } else if (cellset[row][0].value !== "") {
var record = []; var record = [];
this.data.width = args.data.cellset[row].length; this.data.width = cellset[row].length;
for (var col = lowest_level; col < args.data.cellset[row].length; col++) { var label = [];
var value = args.data.cellset[row][col].value; for (var labelCol = lowest_level; labelCol >= 0; labelCol--) {
// check if the resultset contains the raw value, if not try to parse the given value var lastKnownUpperLevelRow = row;
if (args.data.cellset[row][col].properties.raw && args.data.cellset[row][col].properties.raw !== "null") while(cellset[lastKnownUpperLevelRow] && cellset[lastKnownUpperLevelRow][labelCol].value === 'null') {
{ --lastKnownUpperLevelRow;
value = parseFloat(args.data.cellset[row][col].properties.raw);
} else if (typeof(args.data.cellset[row][col].value) !== "number" &&
parseFloat(args.data.cellset[row][col].value.replace(/[^a-zA-Z 0-9.]+/g,'')))
{
value = parseFloat(args.data.cellset[row][col].value.replace(/[^a-zA-Z 0-9.]+/g,''));
} }
if (col == lowest_level) { if(cellset[lastKnownUpperLevelRow]) {
value += " [" + row + "]"; label.push(cellset[lastKnownUpperLevelRow][labelCol].value);
}
}
record.push(label.join('/'));
for (var col = lowest_level + 1; col < cellset[row].length; col++) {
var cell = cellset[row][col];
var value = cell.value || 0;
// check if the resultset contains the raw value, if not try to parse the given value
var raw = cell.properties.raw;
if (raw && raw !== "null") {
value = parseFloat(raw);
} else if (typeof(cell.value) !== "number" && parseFloat(cell.value.replace(/[^a-zA-Z 0-9.]+/g,''))) {
value = parseFloat(cell.value.replace(/[^a-zA-Z 0-9.]+/g,''));
} }
record.push(value); record.push(value);
} }
this.data.resultset.push(record); this.data.resultset.push(record);
} }
} }
makeSureUniqueLabels(this.data.resultset);
this.data.height = this.data.resultset.length; this.data.height = this.data.resultset.length;
this.render(); this.render();
} else { } else {
Expand Down