Merge lp:~openerp-dev/openerp-web/trunk-graph-export-xls-float-mat into lp:openerp-web

[Martin Trigaux (OpenERP)]

Adding raw format capability to web_grap

[Ferdinand (office-chricar)]

see last comment in bug report

review: Needs Fixing

[lp:~openerp-dev/openerp-web/trunk-graph-export-xls-float-mat]

3966. By Martin Trigaux (OpenERP) on 2014-04-04

[FIX] skip undefined and keep formating as empty string

[Martin Trigaux (OpenERP) (mat-openerp)]

Fixed for reported case and merged in trunk

revno: 3965 [merge]
revision-id: <email address hidden>

[Ferdinand (office-chricar)]

thanks

=== modified file 'addons/web_graph/static/src/js/graph_widget.js'
--- addons/web_graph/static/src/js/graph_widget.js	2014-03-11 13:22:00 +0000
+++ addons/web_graph/static/src/js/graph_widget.js	2014-04-04 15:18:02 +0000
@@ -381,11 +381,11 @@
     // 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 @@
         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 @@
         return cell;
     },
 
-    build_rows: function () {
+    build_rows: function (raw) {
         var self = this,
             pivot = this.pivot,
             m, cell;
@@ -460,13 +460,13 @@
             _.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.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)
         });