[REF] large refactoring. it separates the data handling code (pivot) from the ui code (drawing, buttons, events (addon web_graph)

bzr revid: ged@openerp.com-20131122160449-lv2t09bs67ux42m5

3 files changed, 34 insertions, 716 deletions

diff --git a/addons/web_graph/static/src/js/charts.js b/addons/web_graph/static/src/js/charts.js
index f35d012b592..0ecd15d1daf 100644
--- a/addons/web_graph/static/src/js/charts.js
+++ b/addons/web_graph/static/src/js/charts.js
@@ -11,14 +11,9 @@ var formatter = function (measure) {
 
 
 var Charts = {
-    bar_chart : function (groups, measure) {
-        var formatted_data = [{
-                key: 'Bar chart',
-                values: _.map(groups, formatter(measure)),
-            }];
-
+    bar_chart : function (data) {
         nv.addGraph(function () {
-            var chart = nv.models.discreteBarChart()
+          var chart = nv.models.discreteBarChart()
                 .tooltips(false)
                 .showValues(true)
                 .staggerLabels(true)
@@ -26,7 +21,7 @@ var Charts = {
                 .height(400);
 
             d3.select('.graph_main_content svg')
-                .datum(formatted_data)
+                .datum(data)
                 .attr('width', 650)
                 .attr('height', 400)
                 .call(chart);
@@ -36,12 +31,7 @@ var Charts = {
         });
     },
 
-    line_chart: function (groups, measure, measure_label) {
-        var formatted_data = [{
-                key: measure_label,
-                values: _.map(groups, formatter(measure))
-            }];
-
+    line_chart: function (data) {
         nv.addGraph(function () {
             var chart = nv.models.lineChart()
                 .x(function (d,u) { return u; })
@@ -52,16 +42,14 @@ var Charts = {
             d3.select('.graph_main_content svg')
                 .attr('width', 600)
                 .attr('height', 300)
-                .datum(formatted_data)
+                .datum(data)
                 .call(chart);
 
             return chart;
           });
     },
 
-    pie_chart: function (groups, measure) {
-        var formatted_data = _.map(groups, formatter(measure));
-
+    pie_chart: function (data) {
         nv.addGraph(function () {
             var chart = nv.models.pieChart()
                 .color(d3.scale.category10().range())
@@ -69,7 +57,7 @@ var Charts = {
                 .height(400);
 
             d3.select('.graph_main_content svg')
-                .datum(formatted_data)
+                .datum(data[0].values)
                 .transition().duration(1200)
                 .attr('width', 650)
                 .attr('height', 400)
diff --git a/addons/web_graph/static/src/js/graph.js b/addons/web_graph/static/src/js/graph.js
index 7d7d575756c..cfabdead833 100644
--- a/addons/web_graph/static/src/js/graph.js
+++ b/addons/web_graph/static/src/js/graph.js
@@ -26,7 +26,8 @@ instance.web_graph.GraphView = instance.web.View.extend({
     events: {
         'click .graph_mode_selection li' : function (event) {
             event.preventDefault();
-            this.mode = event.target.attributes['data-mode'].nodeValue;
+            var mode = event.target.attributes['data-mode'].nodeValue;
+            this.switch_mode(mode);
         },
 
         'click .web_graph_click' : function (event) {
@@ -125,7 +126,7 @@ instance.web_graph.GraphView = instance.web.View.extend({
 
     start: function () {
         this.table = $('<table></table>');
-        this.svg = $('<svg></svg>');
+        this.svg = $('<div><svg></svg></div>');
         this.$el.filter('.graph_main_content').append(this.table);
         this.$el.filter('.graph_main_content').append(this.svg);
         return this.load_view();
@@ -150,6 +151,21 @@ instance.web_graph.GraphView = instance.web.View.extend({
         return this._super();
     },
 
+    switch_mode: function (mode) {
+        var self = this;
+        this.mode = mode;
+        if (mode === 'pivot') {
+            this.table.css('display', 'block');
+            this.svg.css('display','none');
+        } else {
+            this.table.css('display', 'none');
+            this.svg.remove();
+            this.svg = $('<div><svg></svg></div>');
+            this.$el.filter('.graph_main_content').append(this.svg);
+            Charts[mode](this.pivot_table.get_chart_data());
+
+        }
+    },
 
     handle_header_event: function (options) {
         var pivot = this.pivot_table,
@@ -174,7 +190,6 @@ instance.web_graph.GraphView = instance.web.View.extend({
                                        y: event.pageY});
             }
         }
-
     },
 
     display_dropdown: function (options) {
@@ -288,696 +303,4 @@ instance.web_graph.GraphView = instance.web.View.extend({
     }
 });
 
-
-
-//     make_top_headers : function () {
-//         var self = this,
-//             header;
-
-//         function partition (columns) {
-//             return _.reduce(columns, function (partial, col) {
-//                 if (partial.length === 0) return [[col]];
-//                 if (col.path.length > _.first(_.last(partial)).path.length) {
-//                     _.last(partial).push(col);
-//                 } else {
-//                     partial.push([col]);
-//                 }
-//                 return partial;
-//             }, []);
-//         }
-
-//         function side_by_side(blocks) {
-//             var result = _.zip.apply(_,blocks);
-//             result = _.map(result, function(line) {return _.compact(_.flatten(line))});
-//             return result;
-//         }
-
-//         function make_header_cell(col, span) {
-//             var options = {
-//                 is_border:true,
-//                 foldable:true,
-//                 row_span: (span === undefined) ? 1 : span,
-//                 col_id: col.id,
-//             };
-//             var result = self.make_cell(col.value, options);
-//             if (col.expanded) {
-//                 result.find('.icon-plus-sign')
-//                     .removeClass('icon-plus-sign')
-//                     .addClass('icon-minus-sign');
-//             }
-//             return result;
-//         }
-
-//         function calculate_width(cols) {
-//             if (cols.length === 1) {
-//                 return 1;
-//             }
-//             var p = partition(_.rest(cols));
-//             return _.reduce(p, function(x, y){ return x + calculate_width(y); }, 0);
-//         }
-
-//         function make_header_cells(cols, height) {
-//             var p = partition(cols);
-//             if ((p.length === 1) && (p[0].length === 1)) {
-//                 var result = [[make_header_cell(cols[0], height)]];
-//                 return result;
-//             }
-//             if ((p.length === 1) && (p[0].length > 1)) {
-//                 var cell = make_header_cell(p[0][0]);
-//                 cell.attr('colspan', calculate_width(cols));
-//                 return [[cell]].concat(make_header_cells(_.rest(cols), height - 1));
-//             }
-//             if (p.length > 1) {
-//                 return side_by_side(_.map(p, function (group) {
-//                     return make_header_cells(group, height);
-//                 }));
-//             }
-//         }
-
-//         if (this.cols.length === 1) {
-//             header = $('<tr></tr>');
-//             header.append(this.make_cell('', {is_border:true}));
-//             header.append(this.make_cell(this.cols[0].value, 
-//                 {is_border:true, foldable:true, col_id:this.cols[0].id}));
-//             header.addClass('graph_top');
-//             this.headers = [header];
-//         } else {
-//             var height = _.max(_.map(self.cols, function(g) {return g.path.length;}));
-//             var header_rows = make_header_cells(_.rest(this.cols), height);
-
-//             header_rows[0].splice(0,0,self.make_cell('', {is_border:true, }).attr('rowspan', height))
-//             self.headers = [];
-//             _.each(header_rows, function (cells) {
-//                 header = $('<tr></tr>');
-//                 header.append(cells);
-//                 header.addClass('graph_top');
-//                 self.headers.push(header);
-//             });
-//         }
-//     },
-
-
-    // mode: 'pivot',   // pivot, bar_chart, line_chart or pie_chart
-    // pivot_table: null,
-
-    // events: {
-    //     'click .graph_mode_selection li' : function (event) {
-    //         event.preventDefault();
-    //         this.mode = event.target.attributes['data-mode'].nodeValue;
-    //         this.display_data();
-    //     },
-    // },
-
-    // display_data : function () {
-    //     var content = this.$el.filter('.graph_main_content');
-    //     content.find('svg').remove();
-    //     var self = this;
-    //     if (this.mode === 'pivot') {
-    //         this.pivot_table.show();
-    //     } else {
-    //         this.pivot_table.hide();
-    //         content.append('<svg></svg>');
-    //         var view_fields = this.data.row_groupby.concat(this.data.measure, this.data.col_groupby);
-    //         query_groups(this.data.model, view_fields, this.data.domain, this.data.row_groupby).then(function (groups) {
-    //             Charts[self.mode](groups, self.data.measure, self.data.measure_label);
-    //         });
-
-    //     }
-    // },
-
-
-        // if (this.pivot_table) {
-        //     this.pivot_table.draw(true);
-        // } else {
-
-        //     this.pivot_table = new PivotTable(this.data);
-        //     this.pivot_table.appendTo('.graph_main_content');
-        // }
-        // this.display_data();
-
- /**
-  * PivotTable widget.  It displays the data in tabular data and allows the
-  * user to drill down and up in the table
-  */
-// var PivotTable = instance.web.Widget.extend({
-//     template: 'pivot_table',
-
-//     init: function (data) {
-//         var self = this;
-//         makePivotTable(this.data).done(function (table) {
-//             self.pivottable = table;
-//         });
-//     },
-
-// });
-
-// var PivotTable = instance.web.Widget.extend({
-//     template: 'pivot_table',
-//     data: null,
-//     headers: [],
-//     rows: [],
-//     cols: [],
-//     id_seed : 0,
-
-//     events: {
-//         'click .web_graph_click' : function (event) {
-//             event.preventDefault();
-
-//             if (event.target.attributes['data-row-id'] !== undefined) {
-//                 this.handle_row_event(event);
-//             }
-//             if (event.target.attributes['data-col-id'] !== undefined) {
-//                 this.handle_col_event(event);
-//             }
-//         },
-
-//         'click a.field-selection' : function (event) {
-//             var id,
-//                 field_id = event.target.attributes['data-field-id'].nodeValue;
-//             event.preventDefault();
-//             this.dropdown.remove();
-//             if (event.target.attributes['data-row-id'] !== undefined) {
-//                 id = event.target.attributes['data-row-id'].nodeValue;
-//                 this.expand_row(id, field_id);
-//             } 
-//             if (event.target.attributes['data-col-id'] !== undefined) {
-//                 id = event.target.attributes['data-col-id'].nodeValue;
-//                 this.expand_col(id, field_id);
-//             } 
-//         },
-//     },
-
-//     handle_row_event: function (event) {
-//         var row_id = event.target.attributes['data-row-id'].nodeValue,
-//             row = this.get_row(row_id);
-
-//         if (row.expanded) {
-//             this.fold_row(row_id);
-//         } else {
-//             if (row.path.length < this.data.row_groupby.length) {
-//                 var field_to_expand = this.data.row_groupby[row.path.length];
-//                 this.expand_row(row_id, field_to_expand);
-//             } else {
-//                 this.display_dropdown({row_id:row_id, 
-//                                        target: $(event.target), 
-//                                        x: event.pageX, 
-//                                        y: event.pageY});
-//             }
-//         }
-//     },
-
-//     handle_col_event: function (event) {
-//         var col_id = event.target.attributes['data-col-id'].nodeValue,
-//             col = this.get_col(col_id);
-
-//         if (col.expanded) {
-//             this.fold_col(col_id);
-//         } else {
-//             if (col.path.length < this.data.col_groupby.length) {
-//                 var field_to_expand = this.data.col_groupby[col.path.length];
-//                 this.expand_col(col_id, field_to_expand);
-//             } else {
-//                 this.display_dropdown({col_id: col_id, 
-//                                        target: $(event.target), 
-//                                        x: event.pageX, 
-//                                        y: event.pageY});
-//             }
-//         }
-//     },
-
-//     init: function (data) {
-//         this.data = data;
-//         makePivotTable(this.data).done(function (table) {
-//             self.pivottable = table;
-//         });
-
-//     },
-
-//     start: function () {
-//         this.draw(true);
-//     },
-
-//     draw: function (load_data) {
-//         var self = this;
-
-//         if (load_data) {
-//             var view_fields = this.data.row_groupby.concat(this.data.measure, this.data.col_groupby);
-//             query_groups_data(this.data.model, view_fields, this.data.domain, this.data.col_groupby, this.data.row_groupby[0])
-//                 .then(function (groups) {
-//                     self.data.groups = groups;
-//                     return self.get_groups([]);
-//                 }).then(function (total) {
-//                     total[0].path = [];
-//                     self.data.total = [total];
-//                     self.build_table();
-//                     self.draw(false);
-//                 });
-//         } else {
-//             this.$el.empty();
-
-//             this.draw_top_headers();
-
-//             _.each(this.rows, function (row) {
-//                 self.$el.append(row.html);
-//             });
-//         }
-//     },
-
-//     show: function () {
-//         this.$el.css('display', 'block');
-//     },
-
-//     hide: function () {
-//         this.$el.css('display', 'none');
-//     },
-
-//     display_dropdown: function (options) {
-//         var self = this,
-//             already_grouped = self.data.row_groupby.concat(self.data.col_groupby),
-//             possible_groups = _.difference(self.data.important_fields, already_grouped),
-//             dropdown_options = {
-//                 fields: _.map(possible_groups, function (field) {
-//                     return {id: field, value: self.get_descr(field)};
-//             })};
-//         if (options.row_id) {
-//             dropdown_options.row_id= options.row_id;
-//         } else {
-//             dropdown_options.col_id = options.col_id;
-//         }
-
-//         this.dropdown = $(QWeb.render('field_selection', dropdown_options));
-//         options.target.after(this.dropdown);
-//         this.dropdown.css({position:'absolute',
-//                            left:options.x,
-//                            top:options.y});
-//         $('.field-selection').next('.dropdown-menu').toggle();
-//     },
-
-//     build_table: function () {
-//         var self = this;
-//         this.rows = [];
-
-
-//         var col_id = this.generate_id();
-
-//         this.cols= [{
-//             id: col_id,
-//             path: [],
-//             value: this.data.measure_label,
-//             expanded: false,
-//             parent: null,
-//             children: [],
-//             cells: [],    // a cell is {td:<jquery td>, row_id:<some id>}
-//             domain: this.data.domain,
-//         }];
-
-//         self.make_top_headers();
-
-//         var main_row = this.make_row(this.data.total[0]);
-
-//         _.each(this.data.groups, function (group) {
-//             self.make_row(group, main_row.id);
-//         });
-//     },
-
-//     get_descr: function (field_id) {
-//         return this.data.fields[field_id].string;
-//     },
-
-//     get_groups: function (groupby) {
-//         var view_fields = this.data.row_groupby.concat(this.data.measure, this.data.col_groupby);
-//         return query_groups(this.data.model, view_fields, this.data.domain, groupby);
-//     },
-
-//     make_top_headers : function () {
-//         var self = this,
-//             header;
-
-//         function partition (columns) {
-//             return _.reduce(columns, function (partial, col) {
-//                 if (partial.length === 0) return [[col]];
-//                 if (col.path.length > _.first(_.last(partial)).path.length) {
-//                     _.last(partial).push(col);
-//                 } else {
-//                     partial.push([col]);
-//                 }
-//                 return partial;
-//             }, []);
-//         }
-
-//         function side_by_side(blocks) {
-//             var result = _.zip.apply(_,blocks);
-//             result = _.map(result, function(line) {return _.compact(_.flatten(line))});
-//             return result;
-//         }
-
-//         function make_header_cell(col, span) {
-//             var options = {
-//                 is_border:true,
-//                 foldable:true,
-//                 row_span: (span === undefined) ? 1 : span,
-//                 col_id: col.id,
-//             };
-//             var result = self.make_cell(col.value, options);
-//             if (col.expanded) {
-//                 result.find('.icon-plus-sign')
-//                     .removeClass('icon-plus-sign')
-//                     .addClass('icon-minus-sign');
-//             }
-//             return result;
-//         }
-
-//         function calculate_width(cols) {
-//             if (cols.length === 1) {
-//                 return 1;
-//             }
-//             var p = partition(_.rest(cols));
-//             return _.reduce(p, function(x, y){ return x + calculate_width(y); }, 0);
-//         }
-
-//         function make_header_cells(cols, height) {
-//             var p = partition(cols);
-//             if ((p.length === 1) && (p[0].length === 1)) {
-//                 var result = [[make_header_cell(cols[0], height)]];
-//                 return result;
-//             }
-//             if ((p.length === 1) && (p[0].length > 1)) {
-//                 var cell = make_header_cell(p[0][0]);
-//                 cell.attr('colspan', calculate_width(cols));
-//                 return [[cell]].concat(make_header_cells(_.rest(cols), height - 1));
-//             }
-//             if (p.length > 1) {
-//                 return side_by_side(_.map(p, function (group) {
-//                     return make_header_cells(group, height);
-//                 }));
-//             }
-//         }
-
-//         if (this.cols.length === 1) {
-//             header = $('<tr></tr>');
-//             header.append(this.make_cell('', {is_border:true}));
-//             header.append(this.make_cell(this.cols[0].value, 
-//                 {is_border:true, foldable:true, col_id:this.cols[0].id}));
-//             header.addClass('graph_top');
-//             this.headers = [header];
-//         } else {
-//             var height = _.max(_.map(self.cols, function(g) {return g.path.length;}));
-//             var header_rows = make_header_cells(_.rest(this.cols), height);
-
-//             header_rows[0].splice(0,0,self.make_cell('', {is_border:true, }).attr('rowspan', height))
-//             self.headers = [];
-//             _.each(header_rows, function (cells) {
-//                 header = $('<tr></tr>');
-//                 header.append(cells);
-//                 header.addClass('graph_top');
-//                 self.headers.push(header);
-//             });
-//         }
-//     },
-
-//     draw_top_headers: function () {
-//         var self = this;
-//         $("tr.graph_top").remove();
-//         _.each(this.headers.reverse(), function (header) {
-//             self.$el.prepend(header);
-//         });
-
-//     },
-
-//     make_row: function (groups, parent_id) {
-//         var self = this,
-//             path,
-//             value,
-//             expanded,
-//             domain,
-//             parent,
-//             has_parent = (parent_id !== undefined),
-//             row_id = this.generate_id();
-
-//         if (has_parent) {
-//             parent = this.get_row(parent_id);
-//             path = parent.path.concat(groups[0].attributes.value[1]);
-//             value = groups[0].attributes.value[1];
-//             expanded = false;
-//             parent.children.push(row_id);
-//             domain = groups[0].model._domain;
-//         } else {
-//             parent = null;
-//             path = [];
-//             value = 'Total';
-//             expanded = true;
-//             domain = this.data.domain;
-//         }
-
-//         var jquery_row = $('<tr></tr>');
-
-//         var header = self.make_cell(value, {is_border:true, indent: path.length, foldable:true, row_id: row_id});
-//         jquery_row.append(header);
-
-//         var cell;
-
-//         _.each(this.cols, function (col) {
-//             var element = _.find(groups, function (group) {
-//                 return _.isEqual(_.rest(group.path), col.path);
-//             });
-//             if (element === undefined) {
-//                 cell = self.make_cell('');
-//             } else {
-//                 cell = self.make_cell(element.attributes.aggregates[self.data.measure]);                
-//             }
-//             if (col.expanded) {
-//                 cell.css('display', 'none');
-//             }
-//             col.cells.push({td:cell, row_id:row_id});
-//             jquery_row.append(cell);
-//         });
-
-//         if (!has_parent) {
-//             header.find('.icon-plus-sign')
-//                 .removeClass('icon-plus-sign')
-//                 .addClass('icon-minus-sign');            
-//         }
-
-//         var row = {
-//             id: row_id,
-//             path: path,
-//             value: value,
-//             expanded: expanded,
-//             parent: parent_id,
-//             children: [],
-//             html: jquery_row,
-//             domain: domain,
-//         };
-//         this.rows.push(row);  // to do, insert it properly, after all childs of parent
-//         return row;
-//     },
-
-//     generate_id: function () {
-//         this.id_seed += 1;
-//         return this.id_seed - 1;
-//     },
-
-//     get_row: function (id) {
-//         return _.find(this.rows, function(row) {
-//             return (row.id == id);
-//         });
-//     },
-
-//     get_col: function (id) {
-//         return _.find(this.cols, function(col) {
-//             return (col.id == id);
-//         });
-//     },
-
-//     make_cell: function (content, options) {
-//         options = _.extend({is_border: false, indent:0, foldable:false}, options);
-//         content = (content !== undefined) ? content : 'Undefined';
-
-//         var cell = $('<td></td>');
-//         if (options.is_border) cell.addClass('graph_border');
-//         if (options.row_span) cell.attr('rowspan', options.row_span);
-//         if (options.col_span) cell.attr('rowspan', options.col_span);
-//         _.each(_.range(options.indent), function () {
-//             cell.prepend($('<span/>', {class:'web_graph_indent'}));
-//         });
-
-//         if (options.foldable) {
-//             var attrs = {class:'icon-plus-sign web_graph_click', href:'#'};
-//             if (options.row_id !== undefined) attrs['data-row-id'] = options.row_id;
-//             if (options.col_id !== undefined) attrs['data-col-id'] = options.col_id;
-//             var plus = $('<span/>', attrs);
-//             plus.append(' ');
-//             plus.append(content);
-//             cell.append(plus);
-//         } else {
-//             cell.append(content);
-//         }
-//         return cell;
-//     },
-
-//     expand_row: function (row_id, field_id) {
-//         var self = this;
-//         var row = this.get_row(row_id);
-
-//         if (row.path.length == this.data.row_groupby.length) {
-//             this.data.row_groupby.push(field_id);
-//         }
-//         row.expanded = true;
-//         row.html.find('.icon-plus-sign')
-//             .removeClass('icon-plus-sign')
-//             .addClass('icon-minus-sign');
-
-//         var visible_fields = this.data.row_groupby.concat(this.data.col_groupby, this.data.measure);
-//         query_groups_data(this.data.model, visible_fields, row.domain, this.data.col_groupby, field_id)
-//             .then(function (groups) {
-//                 _.each(groups.reverse(), function (group) {
-//                     var new_row = self.make_row(group, row_id);
-//                     row.html.after(new_row.html);
-//                 });
-//         });
-
-//     },
-
-//     expand_col: function (col_id, field_id) {
-//         var self = this;
-//         var col = this.get_col(col_id);
-
-//         if (col.path.length == this.data.col_groupby.length) {
-//             this.data.col_groupby.push(field_id);
-//         }
-//         col.expanded = true;
-
-//         var visible_fields = this.data.row_groupby.concat(this.data.col_groupby, this.data.measure);
-//         query_groups_data(this.data.model, visible_fields, col.domain, this.data.row_groupby, field_id)
-//             .then(function (groups) {
-//                 _.each(groups, function (group) {
-//                     var new_col = {
-//                         id: self.generate_id(),
-//                         path: col.path.concat(group[0].attributes.value[1]),
-//                         value: group[0].attributes.value[1],
-//                         expanded: false,
-//                         parent: col_id,
-//                         children: [],
-//                         cells: [],    // a cell is {td:<jquery td>, row_id:<some id>}
-//                         domain: group[0].model._domain,
-//                     };
-//                     col.children.push(new_col.id);
-//                     insertAfter(self.cols, col, new_col)
-//                     _.each(col.cells, function (cell) {
-//                         var col_path = self.get_row(cell.row_id).path;
-
-//                         var datapt = _.find(group, function (g) {
-//                             return _.isEqual(g.path.slice(1), col_path);
-//                         });
-
-//                         var value;
-//                         if (datapt === undefined) {
-//                             value = '';
-//                         } else {
-//                             value = datapt.attributes.aggregates[self.data.measure];
-//                         }
-//                         var new_cell = {
-//                             row_id: cell.row_id,
-//                             td: self.make_cell(value)
-//                         };
-//                         new_col.cells.push(new_cell);
-//                         cell.td.after(new_cell.td);
-//                         cell.td.css('display','none');
-//                     });
-
-//                 });
-//             self.make_top_headers();
-//             self.draw_top_headers();
-//         });
-//     },
-
-//     fold_row: function (row_id) {
-//         var self = this;
-//         var row = this.get_row(row_id);
-
-//         _.each(row.children, function (child_row) {
-//             self.remove_row(child_row);
-//         });
-//         row.children = [];
-
-//         row.expanded = false;
-//         row.html.find('.icon-minus-sign')
-//             .removeClass('icon-minus-sign')
-//             .addClass('icon-plus-sign');
-
-//         var fold_levels = _.map(self.rows, function(g) {return g.path.length;});
-//         var new_groupby_length = _.max(fold_levels); 
-
-//         this.data.row_groupby.splice(new_groupby_length);
-//     },
-
-//     remove_row: function (row_id) {
-//         var self = this;
-//         var row = this.get_row(row_id);
-
-//         _.each(row.children, function (child_row) {
-//             self.remove_row(child_row);
-//         });
-
-//         row.html.remove();
-//         removeFromArray(this.rows, row);
-
-//         _.each(this.cols, function (col) {
-//             col.cells = _.filter(col.cells, function (cell) {
-//                 return cell.row_id !== row_id;
-//             });
-//         });
-//     },
-
-//     fold_col: function (col_id) {
-//         var self = this;
-//         var col = this.get_col(col_id);
-
-//         _.each(col.children, function (child_col) {
-//             self.remove_col(child_col);
-//         });
-//         col.children = [];
-
-//         _.each(col.cells, function (cell) {
-//             cell.td.css('display','table-cell');
-//         });
-//         col.expanded = false;
-//         // row.html.find('.icon-minus-sign')
-//         //     .removeClass('icon-minus-sign')
-//         //     .addClass('icon-plus-sign');
-
-//         var fold_levels = _.map(self.cols, function(g) {return g.path.length;});
-//         var new_groupby_length = _.max(fold_levels); 
-
-//         this.data.col_groupby.splice(new_groupby_length);
-//         this.make_top_headers();
-//         this.draw_top_headers();
-
-            
-//     },
-    
-//     remove_col: function (col_id) {
-//         var self = this;
-//         var col = this.get_col(col_id);
-
-//         _.each(col.children, function (child_col) {
-//             self.remove_col(child_col);
-//         });
-
-//         _.each(col.cells, function (cell) {
-//             cell.td.remove();
-//         });
-//         // row.html.remove();
-//         removeFromArray(this.cols, col);
-
-//         // _.each(this.cols, function (col) {
-//         //     col.cells = _.filter(col.cells, function (cell) {
-//         //         return cell.row_id !== row_id;
-//         //     });
-//         // });
-//     },
-
-
-// });
-
 };
diff --git a/addons/web_graph/static/src/js/pivot.js b/addons/web_graph/static/src/js/pivot.js
index 081470fcb37..4ab6b637422 100644
--- a/addons/web_graph/static/src/js/pivot.js
+++ b/addons/web_graph/static/src/js/pivot.js
@@ -1,5 +1,4 @@
 
-
 var PivotTable = openerp.web.Class.extend({
 	init: function (options) {
 		this.rows = [];
@@ -198,7 +197,6 @@ var PivotTable = openerp.web.Class.extend({
                 });
                 col.is_expanded = true;
         });
-
 	},
 
 	make_col: function (groups, parent) {
@@ -216,6 +214,15 @@ var PivotTable = openerp.web.Class.extend({
 		return new_col.id;
 	},
 
+	get_chart_data: function () {
+		var self = this;
+		var values = _.map(this.rows[0].children, function (pt) {
+			var val = self.get_value(pt.id, 2);
+			return {x: pt.name, y: val};
+		});
+		return [{key: 'Bar chart', values: values}];
+
+	},
 
 });