odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] makes sure that the values displayed in the pivot table are properly formatted according to their types (addon web_graph) 

bzr revid: ged@openerp.com-20131211124307-z9lxbn39spahlxpw
This commit is contained in:
Gery Debongnie 2013-12-11 13:43:07 +01:00
parent 3453d9da01
commit 14d0a6e74c
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
addons/web_graph/static/src/js/graph.js
View File

@ -407,9 +407,15 @@ instance.web_graph.GraphView = instance.web.View.extend({
});
},
get_measure_type: function () {
var measure = this.pivot_table.measure;
return (measure) ? this.fields[measure].type : 'integer';
},
draw_row: function (row) {
var self = this,
pivot = this.pivot_table,
measure_type = this.get_measure_type(),
html_row = $('<tr></tr>'),
row_header = this.make_border_cell(1,1)
.append(this.make_header_title(row).attr('data-id', row.id))
@ -448,7 +454,7 @@ instance.web_graph.GraphView = instance.web.View.extend({
if (value === undefined) {
return cell;
}
cell.append(value);
cell.append(instance.web.format_value(value, {type: measure_type}));
if (self.mode === 'heatmap') {
total = pivot.get_total();
color = Math.floor(50 + 205*(total - value)/total);