[IMP] finally uses the full width and height to draw charts, instead of hardcoded numbers (in graph view) (addon web_graph)

bzr revid: ged@openerp.com-20131211140140-shlpos1jt3z8wj41

1 files changed, 11 insertions, 2 deletions

diff --git a/addons/web_graph/static/src/js/graph.js b/addons/web_graph/static/src/js/graph.js
index 8070bb152ce..f1d08968626 100644
--- a/addons/web_graph/static/src/js/graph.js
+++ b/addons/web_graph/static/src/js/graph.js
@@ -61,6 +61,8 @@ instance.web_graph.GraphView = instance.web.View.extend({
     start: function () {
         this.table = $('<table></table>');
         this.$('.graph_main_content').append(this.table);
+        this.width = this.$el.width();
+        this.height = this.$el.parent().parent().height(); // to get view manager body
         instance.web.bus.on('click', this, function (ev) {
             if (this.dropdown) {
                 this.dropdown.remove();
@@ -178,8 +180,15 @@ instance.web_graph.GraphView = instance.web.View.extend({
                     this.draw_table();
                 } else {
                     this.$('.graph_main_content').append($('<div><svg></svg></div>'));
-                    var svg = this.$('.graph_main_content svg')[0];
-                    openerp.web_graph.draw_chart(this.mode, this.pivot_table, svg, this.measure_label());
+                    var options = {
+                        svg: this.$('.graph_main_content svg')[0],
+                        mode: this.mode,
+                        pivot: this.pivot_table,
+                        width: this.width,
+                        height: this.height - 30,
+                        measure_label: this.measure_label()
+                    };
+                    openerp.web_graph.draw_chart(options);
                 }
             }
         }