summaryrefslogtreecommitdiff
path: root/addons/web_graph/static/src/js/graph.js
diff options
context:
space:
mode:
authorVidhin Mehta (OpenERP) <vme@tinyerp.com>2012-02-01 14:32:21 +0530
committerVidhin Mehta (OpenERP) <vme@tinyerp.com>2012-02-01 14:32:21 +0530
commit7b171c0eacd24532056d38fcf85f4ab2e811f4f4 (patch)
tree6005bd6419b9ac207ca60961df56ba1cf34c0500 /addons/web_graph/static/src/js/graph.js
parent60c47d9f98793d5591807722dc1352ee7fe94861 (diff)
[IMP]graph x axis item.
bzr revid: vme@tinyerp.com-20120201090221-44sxb9m418nhukly
Diffstat (limited to 'addons/web_graph/static/src/js/graph.js')
-rw-r--r--addons/web_graph/static/src/js/graph.js10
1 files changed, 6 insertions, 4 deletions
diff --git a/addons/web_graph/static/src/js/graph.js b/addons/web_graph/static/src/js/graph.js
index f153a2155f0..966f3c1b006 100644
--- a/addons/web_graph/static/src/js/graph.js
+++ b/addons/web_graph/static/src/js/graph.js
@@ -97,7 +97,7 @@ openerp.web_graph.GraphView = openerp.web.View.extend({
this.$element.html(QWeb.render("GraphView", {
"fields_view": this.fields_view,
"chart": this.chart,
- 'element_id': this.element_id
+ 'element_id': this.widget_parent.element_id
}));
var fields = _(this.columns).pluck('name').concat([this.abscissa]);
@@ -267,7 +267,7 @@ openerp.web_graph.GraphView = openerp.web.View.extend({
self.renderer = null;
var charts = new dhtmlXChart({
view: view_chart,
- container: self.element_id+"-"+self.chart+"chart",
+ container: self.widget_parent.element_id+"-"+self.chart+"chart",
value:"#"+group_list[0].group+"#",
gradient: (self.chart == "bar") ? "3d" : "light",
alpha: (self.chart == "area") ? 0.6 : 1,
@@ -304,6 +304,8 @@ openerp.web_graph.GraphView = openerp.web.View.extend({
}
}
});
+ self.$element.find("#"+self.widget_parent.element_id+"-"+self.chart+"chart").width(
+ self.$element.find("#"+self.widget_parent.element_id+"-"+self.chart+"chart").width()+120);
for (var m = 1; m<group_list.length;m++){
var column = group_list[m];
@@ -326,8 +328,8 @@ openerp.web_graph.GraphView = openerp.web.View.extend({
});
}
charts.parse(results, "json");
- self.$element.find("#"+self.element_id+"-"+self.chart+"chart").height(
- self.$element.find("#"+self.element_id+"-"+self.chart+"chart").height()+50);
+ self.$element.find("#"+self.widget_parent.element_id+"-"+self.chart+"chart").height(
+ self.$element.find("#"+self.widget_parent.element_id+"-"+self.chart+"chart").height()+50);
charts.attachEvent("onItemClick", function(id) {
self.open_list_view(charts.get(id));
});