From 0aedbd386ceb9123dc9ddea99f8e0e644d1d9ee3 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Mon, 20 Jun 2011 09:55:02 +0200 Subject: [FIX] use Number.toFixed instead of doing decimal rounding by hand bzr revid: xmo@openerp.com-20110620075502-3p1v1asit32ti9um --- addons/base_graph/static/src/js/graph.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons/base_graph/static/src/js/graph.js') diff --git a/addons/base_graph/static/src/js/graph.js b/addons/base_graph/static/src/js/graph.js index edf3809d6f1..fc3cea371cf 100644 --- a/addons/base_graph/static/src/js/graph.js +++ b/addons/base_graph/static/src/js/graph.js @@ -296,7 +296,7 @@ openerp.base_graph.GraphView = openerp.base.Controller.extend({ 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, -- cgit v1.2.3 From ca34076fbd5d24f2a77954bd07f77d227daf45bd Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Mon, 20 Jun 2011 12:05:57 +0200 Subject: [IMP] rollback namespace-alteration to dhtmlXChart, fix dhtmlxscheduler and dhtmlxgantt to not fuck up the root dhtmlx namespace (which is what breaks chart) bzr revid: xmo@openerp.com-20110620100557-zya9u6a3zuhhs0c3 --- addons/base_graph/static/src/js/graph.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'addons/base_graph/static/src/js/graph.js') diff --git a/addons/base_graph/static/src/js/graph.js b/addons/base_graph/static/src/js/graph.js index fc3cea371cf..d5c16f1cb90 100644 --- a/addons/base_graph/static/src/js/graph.js +++ b/addons/base_graph/static/src/js/graph.js @@ -226,7 +226,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.view_id+"-barchart", value:"#"+group_list[0]+"#", @@ -289,7 +289,7 @@ 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.view_id+"-piechart", value:"#"+self.operator_field+"#", -- cgit v1.2.3 From ec186dfb7d394a337744a70aab3b042feeddbbf8 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Mon, 20 Jun 2011 16:39:46 +0200 Subject: [FIX] race condition between graph view loading and search request: View.start() should return a promise if it makes an async call, so caller (ViewManager in this case) knows when the graph view is ready for action Also inherit from View bzr revid: xmo@openerp.com-20110620143946-tv0qx84e0y06zxu7 --- addons/base_graph/static/src/js/graph.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'addons/base_graph/static/src/js/graph.js') diff --git a/addons/base_graph/static/src/js/graph.js b/addons/base_graph/static/src/js/graph.js index d5c16f1cb90..4dec023b93f 100644 --- a/addons/base_graph/static/src/js/graph.js +++ b/addons/base_graph/static/src/js/graph.js @@ -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; -- cgit v1.2.3