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

[IMP] web_graph: when exporting to xls, export float data as raw instead of string

Browse Source 
bzr revid: mat@openerp.com-20140404154726-n5dm2fhan6liem01
This commit is contained in:
Martin Trigaux
2014-04-04 17:47:26 +02:00
parent ba52cde0b5 28f0649a71
commit 7c79674a3e
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/web_graph/static/src/js/graph_widget.js
+8 -8
View File
@@ -381,11 +381,11 @@ openerp.web_graph.Graph = openerp.web.Widget.extend({
// Convert Pivot data structure into table structure :
// compute rows, cols, colors, cell width, cell height, ...
// ----------------------------------------------------------------------
build_table: function() {
build_table: function(raw) {
return {
headers: this.build_headers(),
measure_row: this.build_measure_row(),
rows: this.build_rows(),
rows: this.build_rows(raw),
nbr_measures: this.pivot.measures.length,
title: this.title,
};
@@ -435,8 +435,8 @@ openerp.web_graph.Graph = openerp.web.Widget.extend({
return result;
},
make_cell: function (row, col, value, index) {
var formatted_value = openerp.web.format_value(value, {type:this.pivot.measures[index].type}),
make_cell: function (row, col, value, index, raw) {
var formatted_value = raw && !_.isUndefined(value) ? value : openerp.web.format_value(value, {type:this.pivot.measures[index].type}),
cell = {value:formatted_value};
if (this.heatmap_mode === 'none') { return cell; }
@@ -450,7 +450,7 @@ openerp.web_graph.Graph = openerp.web.Widget.extend({
return cell;
},
build_rows: function () {
build_rows: function (raw) {
var self = this,
pivot = this.pivot,
m, cell;
@@ -460,13 +460,13 @@ openerp.web_graph.Graph = openerp.web.Widget.extend({
_.each(pivot.get_cols_leaves(), function (col) {
var values = pivot.get_values(row.id,col.id);
for (m = 0; m < pivot.measures.length; m++) {
cells.push(self.make_cell(row,col,values[m], m));
cells.push(self.make_cell(row,col,values[m], m, raw));
}
});
if (pivot.get_cols_leaves().length > 1) {
var totals = pivot.get_total(row);
for (m = 0; m < pivot.measures.length; m++) {
cell = self.make_cell(row, pivot.main_col(), totals[m], m);
cell = self.make_cell(row, pivot.main_col(), totals[m], m, raw);
cell.is_bold = 'true';
cells.push(cell);
}
@@ -743,7 +743,7 @@ openerp.web_graph.Graph = openerp.web.Widget.extend({
openerp.web.blockUI();
this.session.get_file({
url: '/web_graph/export_xls',
data: {data: JSON.stringify(this.build_table())},
data: {data: JSON.stringify(this.build_table(true))},
complete: openerp.web.unblockUI,
error: c.rpc_error.bind(c)
});