pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] fix line chart x-axis labels: it now correctly uses the name of the row, and not a number (addon web_graph)

Browse Source 
bzr revid: ged@openerp.com-20140422150441-3vll2jw69z319yza
This commit is contained in:
Gery Debongnie
2014-04-22 17:04:41 +02:00
parent 394897383f
commit 0241b762b2
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/web_graph/static/src/js/graph_widget.js
+7 -2
View File
@@ -688,9 +688,12 @@ openerp.web_graph.Graph = openerp.web.Widget.extend({
dim_x = this.pivot.rows.groupby.length,
dim_y = this.pivot.cols.groupby.length;
var rows = this.pivot.get_rows_with_depth(dim_x),
labels = _.pluck(rows, 'title');
var data = _.map(this.pivot.get_cols_leaves(), function (col) {
var values = _.map(self.pivot.get_rows_with_depth(dim_x), function (row) {
return {x: row.title, y: self.pivot.get_values(row.id,col.id)[0] || 0};
var values = _.map(rows, function (row, index) {
return {x: index, y: self.pivot.get_values(row.id,col.id)[0] || 0};
});
var title = _.map(col.path, function (p) {
return p || _t('Undefined');
@@ -705,6 +708,8 @@ openerp.web_graph.Graph = openerp.web.Widget.extend({
var chart = nv.models.lineChart()
.x(function (d,u) { return u; });
chart.xAxis.tickFormat(function (d,u) {return labels[d];});
d3.select(self.svg)
.attr('width', self.width)
.attr('height', self.height)