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

[FIX] Undefined container element for Pie chart, error while string operation on boolean value. 

bzr revid: vda@tinyerp.com-20120215063746-7j0n14lms083hh79
This commit is contained in:
Vaibhav (OpenERP) 2012-02-15 12:07:46 +05:30
parent 750c5db2a3
commit 7ef0c1e17d
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -216,9 +216,11 @@ openerp.web_graph.GraphView = openerp.web.View.extend({
.pluck(this.group_field)
.uniq()
.map(function (value, index) {
if(value)
value = value.toLowerCase().replace(/[\s\/]+/g,'_')
return {
group: self.ordinate + '_' +
value.toLowerCase().replace(/[\s\/]+/g,'_'),
value,
text: value,
color: COLOR_PALETTE[index % COLOR_PALETTE.length]
};
@ -231,9 +233,11 @@ openerp.web_graph.GraphView = openerp.web.View.extend({
// second argument is coerced to a str, no good for boolean
r[self.abscissa] = records[0][self.abscissa];
_(records).each(function (record) {
if(record[self.group_field])
record[self.group_field] = record[self.group_field].toLowerCase().replace(/[\s\/]+/g,'_')
var key = _.str.sprintf('%s_%s',
self.ordinate,
record[self.group_field].toLowerCase().replace(/[\s\/]+/g,'_'));
record[self.group_field]);
r[key] = record[self.ordinate];
});
return r;
@ -349,7 +353,7 @@ openerp.web_graph.GraphView = openerp.web.View.extend({
self.renderer = null;
var chart = new dhtmlXChart({
view:"pie3D",
container:self.element_id+"-piechart",
container:self.widget_parent.element_id+"-piechart",
value:"#"+self.ordinate+"#",
pieInnerText:function(obj) {
var sum = chart.sum("#"+self.ordinate+"#");