diff options
| author | Xavier Morel <xmo@openerp.com> | 2011-09-26 13:25:25 +0200 |
|---|---|---|
| committer | Xavier Morel <xmo@openerp.com> | 2011-09-26 13:25:25 +0200 |
| commit | ebf51467e9d55e0a28afb850edf82c5ee51c2bc4 (patch) | |
| tree | 9d0159bdce9a08faeacef31af1cf47712c0b1a23 /addons/web_graph/static/src | |
| parent | 47094e8adb39696638ecb7f4882812a47d0038e1 (diff) | |
| parent | 895c2ab980b71f7a0f8785c67a4e3e846525ea71 (diff) | |
[FIX] overlapping graphs in dashboard
lp bug: https://launchpad.net/bugs/854692 fixed
bzr revid: xmo@openerp.com-20110926112525-h596n82mqw5ol4bx
Diffstat (limited to 'addons/web_graph/static/src')
| -rw-r--r-- | addons/web_graph/static/src/js/graph.js | 10 | ||||
| -rw-r--r-- | addons/web_graph/static/src/xml/web_graph.xml | 2 |
2 files changed, 5 insertions, 7 deletions
diff --git a/addons/web_graph/static/src/js/graph.js b/addons/web_graph/static/src/js/graph.js index 2a493b89166..86c37b5508a 100644 --- a/addons/web_graph/static/src/js/graph.js +++ b/addons/web_graph/static/src/js/graph.js @@ -49,8 +49,6 @@ openerp.web_graph.GraphView = openerp.web.View.extend({ this.operator = []; this.group_field = []; this.orientation = this.fields_view.arch.attrs.orientation || ''; - this.elem_id = this.$element[0]['id']; - _.each(this.fields_view.arch.children, function (field) { if (field.attrs.operator) { this.operator.push(field.attrs.name); @@ -98,7 +96,7 @@ openerp.web_graph.GraphView = openerp.web.View.extend({ }, schedule_chart: function(results) { - this.$element.html(QWeb.render("GraphView", {"fields_view": this.fields_view, "chart": this.chart,'elem_id': this.elem_id})); + this.$element.html(QWeb.render("GraphView", {"fields_view": this.fields_view, "chart": this.chart,'element_id': this.element_id})); _.each(results, function (result) { _.each(result, function (field_value, field_name) { @@ -304,7 +302,7 @@ openerp.web_graph.GraphView = openerp.web.View.extend({ var bar_chart = new dhtmlXChart({ view: view_chart, - container: self.elem_id+"-barchart", + container: self.element_id+"-barchart", value:"#"+group_list[0]+"#", gradient: "3d", border: false, @@ -374,7 +372,7 @@ openerp.web_graph.GraphView = openerp.web.View.extend({ }); } bar_chart.parse(_.values(abscissa_data), "json"); - jQuery("#"+self.elem_id+"-barchart").height(jQuery("#"+self.elem_id+"-barchart").height()+50); + jQuery("#"+self.element_id+"-barchart").height(jQuery("#"+self.element_id+"-barchart").height()+50); bar_chart.attachEvent("onItemClick", function(id) { self.open_list_view(bar_chart.get(id)); }); @@ -383,7 +381,7 @@ openerp.web_graph.GraphView = openerp.web.View.extend({ var self = this; var chart = new dhtmlXChart({ view:"pie3D", - container:self.elem_id+"-piechart", + container:self.element_id+"-piechart", value:"#"+self.operator_field+"#", pieInnerText:function(obj) { var sum = chart.sum("#"+self.operator_field+"#"); diff --git a/addons/web_graph/static/src/xml/web_graph.xml b/addons/web_graph/static/src/xml/web_graph.xml index 4320b9f156e..90349623946 100644 --- a/addons/web_graph/static/src/xml/web_graph.xml +++ b/addons/web_graph/static/src/xml/web_graph.xml @@ -1,4 +1,4 @@ <template> - <div t-name="GraphView" t-att-id="elem_id+'-'+chart+'chart'" + <div t-name="GraphView" t-att-id="element_id+'-'+chart+'chart'" style="height:300px;position:relative;"/> </template>
\ No newline at end of file |