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

[FIX] incompatibility between dhtmlx.Scheduler and dhtmlx.Chart, bug in dhtmlx.Chart when first data serties contains the value 0 in some places, race condition in graph addon

Browse Source 
bzr revid: xmo@openerp.com-20110620170922-9443v3gtqza3vu2z
This commit is contained in:
Xavier Morel
2011-06-20 19:09:22 +02:00
parent d44a542efb ec186dfb7d
commit 9853c3a23f
10 changed files with 414 additions and 3081 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/base_graph/static/src/js/graph.js
+5 -5
View File
@@ -14,7 +14,7 @@ var COLOR_PALETTE = [
QWeb.add_template('/base_graph/static/src/xml/base_graph.xml');
openerp.base.views.add('graph', 'openerp.base_graph.GraphView');
openerp.base_graph.GraphView = openerp.base.Controller.extend({
openerp.base_graph.GraphView = openerp.base.View.extend({
init: function(view_manager, session, element_id, dataset, view_id) {
this._super(session, element_id);
@@ -31,7 +31,7 @@ openerp.base_graph.GraphView = openerp.base.Controller.extend({
this.$element.hide();
},
start: function() {
this.rpc("/base_graph/graphview/load", {"model": this.model, "view_id": this.view_id}, this.on_loaded);
return this.rpc("/base_graph/graphview/load", {"model": this.model, "view_id": this.view_id}, this.on_loaded);
},
on_loaded: function(data) {
this.all_fields = data.all_fields;
@@ -270,7 +270,7 @@ openerp.base_graph.GraphView = openerp.base.Controller.extend({
y_axis = ordinate_description;
}
var bar_chart = new dhtmlxchartChart({
var bar_chart = new dhtmlXChart({
view: view_chart,
container: self.elem_id+"-barchart",
value:"#"+group_list[0]+"#",
@@ -337,14 +337,14 @@ openerp.base_graph.GraphView = openerp.base.Controller.extend({
},
schedule_pie: function(result) {
var self = this;
var chart = new dhtmlxchartChart({
var chart = new dhtmlXChart({
view:"pie3D",
container:self.elem_id+"-piechart",
value:"#"+self.operator_field+"#",
pieInnerText:function(obj) {
var sum = chart.sum("#"+self.operator_field+"#");
var val = obj[self.operator_field] / sum * 100 ;
return Math.round(val * 10)/10 + "%";
return val.toFixed(1) + "%";
},
gradient:"3d",
height: 20,