pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] many small tweaks, add some comment, rename variables to have better more informative names in excel export functionality in graph view (addon web_graph)

Browse Source 
bzr revid: ged@openerp.com-20140205131406-kdw5ht9u8gct9xbo
This commit is contained in:
Gery Debongnie
2014-02-05 14:14:06 +01:00
parent 19d6d98da8
commit d0961eb09e
2 changed files with 35 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/web_graph/static/src/js/graph_widget.js
+6 -4
View File
@@ -25,6 +25,7 @@ openerp.web_graph.Graph = openerp.web.Widget.extend({
this.bar_ui = options.bar_ui || 'group';
this.graph_view = options.graph_view || null;
this.pivot_options = options;
this.title = options.title || 'Data';
},
start: function() {
@@ -40,7 +41,7 @@ openerp.web_graph.Graph = openerp.web.Widget.extend({
}
openerp.session.rpc('/web_graph/check_xlwt').then(function (result) {
if (result) { self.$('.graph_options_selection label').toggle(true); }
self.$('.graph_options_selection label').toggle(result);
});
return this.model.call('fields_get', []).then(function (f) {
@@ -371,7 +372,8 @@ openerp.web_graph.Graph = openerp.web.Widget.extend({
headers: this.build_headers(),
measure_row: this.build_measure_row(),
rows: this.build_rows(),
nbr_measures: this.pivot.measures.length
nbr_measures: this.pivot.measures.length,
title: this.title,
};
},
@@ -394,10 +396,10 @@ openerp.web_graph.Graph = openerp.web.Widget.extend({
});
if (pivot.get_cols_leaves().length > 1) {
rows[0].push({width:nbr_measures, height:height, title: _t('Total'), id: pivot.cols.headers[0].id });
rows[0].push({width: nbr_measures, height: height, title: _t('Total'), id: pivot.main_col().id });
}
if (pivot.cols.headers.length === 1) {
rows = [[{width:nbr_measures, height:1, title: _t('Total'), id: pivot.cols.headers[0].id, expanded: false}]];
rows = [[{width: nbr_measures, height: 1, title: _t('Total'), id: pivot.main_col().id, expanded: false}]];
}
return rows;
},