odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP]graph x axis item. 

bzr revid: vme@tinyerp.com-20120201090221-44sxb9m418nhukly
This commit is contained in:
Vidhin Mehta (OpenERP) 2012-02-01 14:32:21 +05:30
parent 60c47d9f98
commit 7b171c0eac
4 changed files with 2716 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/web_graph/__openerp__.py
View File

@ -5,7 +5,7 @@
"version": "2.0",
"depends": ['web'],
"js": [
"static/lib/dhtmlxGraph/codebase/dhtmlxchart_debug.js",
"static/lib/dhtmlxGraph/codebase/dhtmlxchart.js",
"static/src/js/graph.js"],
"css": ["static/lib/dhtmlxGraph/codebase/dhtmlxchart.css"],
'qweb' : [

2
addons/web_graph/static/lib/dhtmlxGraph/codebase/dhtmlxchart.css
View File

@ -9,7 +9,7 @@ To use it on other terms or get Professional edition of the component please con
.dhx_map_img{width:100%;height:100%;position:absolute;top:0;left:0;border:0;filter:alpha(opacity=0);}
.dhx_axis_item_y{position:absolute;height:10px;line-height:10px;text-align:right;}
.dhx_axis_title_y{text-align:center;font-family:Verdana;-webkit-transform:rotate(-90deg);-moz-transform:rotate(-90deg);filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=3);-o-transform:rotate(-90deg);padding-left:3px;}
.dhx_axis_item_x{text-align:right;margin-top:30px;margin-left:-14px;font-size:8pt;-webkit-transform:rotate(-60deg);-moz-transform:rotate(-60deg);filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=2);-o-transform:rotate(-60deg);padding-left:3px;}
.dhx_axis_item_x{text-align:left;margin-top:20px;margin-left:-14px;font-size:8pt;-webkit-transform:rotate(-60deg);-moz-transform:rotate(-60deg);filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=2);-o-transform:rotate(-60deg);padding-left:3px;}
.dhx_axis_title_x{text-align:center;margin-top:50px;}
.dhx_chart_legend{position:absolute;}
.dhx_chart_legend_item{height:18px;line-height:18px;padding:2px;}

2834
addons/web_graph/static/lib/dhtmlxGraph/codebase/dhtmlxchart.js
View File

File diff suppressed because it is too large Load Diff

10
addons/web_graph/static/src/js/graph.js
View File

@ -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));
});