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

[MERGE] graph issues fixes

Browse Source 
bzr revid: xmo@openerp.com-20120215092422-0emfdu4cx3opuxxk
This commit is contained in:
Xavier Morel
2012-02-15 10:24:22 +01:00
parent 137612b4c5 7ef0c1e17d
commit 99f01e1df2
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/web_graph/static/src/js/graph.js
+10 -6
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,'_'),
group: _.str.sprintf('%s_%s', self.ordinate, 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) {
var key = _.str.sprintf('%s_%s',
self.ordinate,
record[self.group_field].toLowerCase().replace(/[\s\/]+/g,'_'));
var value = record[self.group_field];
if(value) {
record[self.group_field] = value.toLowerCase().replace(/[\s\/]+/g,'_');
}
var key = _.str.sprintf('%s_%s', self.ordinate, value);
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+"#");