[REF] refactoring in progress. moves charts to its own file in addon web_graph

bzr revid: ged@openerp.com-20131115151659-g1lc0ypd9v3cxg1p

2 files changed, 116 insertions, 99 deletions

diff --git a/addons/web_graph/static/src/js/charts.js b/addons/web_graph/static/src/js/charts.js
new file mode 100644
index 00000000000..728b435dbd1
--- /dev/null
+++ b/addons/web_graph/static/src/js/charts.js
@@ -0,0 +1,84 @@
+
+var formatter = function (measure) {
+    return function (datapt) {
+        var val = datapt.attributes;
+        return {
+            x: datapt.attributes.value[1],
+            y: measure ? val.aggregates[measure] : val.length,
+        };        
+    };
+};
+
+
+var Charts = {
+    bar_chart : function (groups, measure) {
+        var formatted_data = [{
+                key: 'Bar chart',
+                values: _.map(groups, formatter(measure)),
+            }];
+
+        nv.addGraph(function () {
+            var chart = nv.models.discreteBarChart()
+                .tooltips(false)
+                .showValues(true)
+                .staggerLabels(true)
+                .width(650)
+                .height(400);
+
+            d3.select('.graph_chart svg')
+                .datum(formatted_data)
+                .attr('width', 650)
+                .attr('height', 400)
+                .call(chart);
+
+            nv.utils.windowResize(chart.update);
+            return chart;
+        });
+    },
+
+    line_chart: function (groups, measure, measure_label) {
+        var formatted_data = [{
+                key: measure_label,
+                values: _.map(groups, formatter(measure))
+            }];
+
+        nv.addGraph(function () {
+            var chart = nv.models.lineChart()
+                .x(function (d,u) { return u; })
+                .width(600)
+                .height(300)
+                .margin({top: 30, right: 20, bottom: 20, left: 60});
+
+            d3.select('.graph_chart svg')
+                .attr('width', 600)
+                .attr('height', 300)
+                .datum(formatted_data)
+                .call(chart);
+
+            return chart;
+          });
+    },
+
+    pie_chart: function (groups, measure) {
+        var formatted_data = _.map(groups, formatter(measure));
+
+        nv.addGraph(function () {
+            var chart = nv.models.pieChart()
+                .color(d3.scale.category10().range())
+                .width(650)
+                .height(400);
+
+            d3.select('.graph_chart svg')
+                .datum(formatted_data)
+                .transition().duration(1200)
+                .attr('width', 650)
+                .attr('height', 400)
+                .call(chart);
+
+            nv.utils.windowResize(chart.update);
+            return chart;
+        });
+    },
+
+
+};
\ No newline at end of file
diff --git a/addons/web_graph/static/src/js/graph.js b/addons/web_graph/static/src/js/graph.js
index 9f94f5eb0ee..ccec8f03ec3 100644
--- a/addons/web_graph/static/src/js/graph.js
+++ b/addons/web_graph/static/src/js/graph.js
@@ -126,6 +126,8 @@ instance.web_graph.GraphView = instance.web.View.extend({
 
 });
 
+
+
  /**
   * BasicDataView widget.  Basic widget to manage show/hide functionality
   * and to initialize some attributes.  It is inherited by PivotTable 
@@ -206,6 +208,35 @@ var BasicDataView = instance.web.Widget.extend({
 
 });
 
+
+
+ /**
+  * ChartView widget.  It displays the data in chart form, using the nvd3
+  * library.  Various modes include bar charts, pie charts or line charts.
+  */
+var ChartView = BasicDataView.extend({
+    template: 'chart_view',
+
+    set_mode: function (mode) {
+        this.mode = mode;
+        console.log("mode",mode);
+        this.render = this['render_' + mode];
+        this.need_redraw = true;
+    },
+
+    draw: function () {
+        var self = this;
+        this.$el.empty();
+        console.log("measrue",self.measure);
+        this.$el.append('<svg></svg>');
+        this.get_data(this.groupby.row).done(function (data) {
+            Charts[self.mode](data, self.measure, self.measure_label);
+        });
+    },
+
+
+
+});
  /**
   * PivotTable widget.  It displays the data in tabular data and allows the
   * user to drill down and up in the table
@@ -479,106 +510,8 @@ var PivotTable = BasicDataView.extend({
     }
 });
 
- /**
-  * ChartView widget.  It displays the data in chart form, using the nvd3
-  * library.  Various modes include bar charts, pie charts or line charts.
-  */
-var ChartView = BasicDataView.extend({
-    template: 'chart_view',
-
-    set_mode: function (mode) {
-        this.render = this['render_' + mode];
-        this.need_redraw = true;
-    },
-
-    draw: function () {
-        var self = this;
-        this.$el.empty();
-        this.$el.append('<svg></svg>');
-        this.get_data(this.groupby.row).done(function (data) {
-            self.render(data);
-        });
-    },
-
-    format_data:  function (datapt) {
-        var val = datapt.attributes;
-        return {
-            x: datapt.attributes.value[1],
-            y: this.measure ? val.aggregates[this.measure] : val.length,
-        };
-    },
-
-    render_bar_chart: function (data) {
-        var formatted_data = [{
-                key: 'Bar chart',
-                values: _.map(data, this.proxy('format_data')),
-            }];
-
-        nv.addGraph(function () {
-            var chart = nv.models.discreteBarChart()
-                .tooltips(false)
-                .showValues(true)
-                .staggerLabels(true)
-                .width(650)
-                .height(400);
-
-            d3.select('.graph_chart svg')
-                .datum(formatted_data)
-                .attr('width', 650)
-                .attr('height', 400)
-                .call(chart);
-
-            nv.utils.windowResize(chart.update);
-            return chart;
-        });
-    },
-
-    render_line_chart: function (data) {
-        var formatted_data = [{
-                key: this.measure_label,
-                values: _.map(data, this.proxy('format_data'))
-            }];
-
-        nv.addGraph(function () {
-            var chart = nv.models.lineChart()
-                .x(function (d,u) { return u; })
-                .width(600)
-                .height(300)
-                .margin({top: 30, right: 20, bottom: 20, left: 60});
-
-            d3.select('.graph_chart svg')
-                .attr('width', 600)
-                .attr('height', 300)
-                .datum(formatted_data)
-                .call(chart);
-
-            return chart;
-          });
-    },
-
-    render_pie_chart: function (data) {
-        var formatted_data = _.map(data, this.proxy('format_data'));
-
-        nv.addGraph(function () {
-            var chart = nv.models.pieChart()
-                .color(d3.scale.category10().range())
-                .width(650)
-                .height(400);
-
-            d3.select('.graph_chart svg')
-                .datum(formatted_data)
-                .transition().duration(1200)
-                .attr('width', 650)
-                .attr('height', 400)
-                .call(chart);
-
-            nv.utils.windowResize(chart.update);
-            return chart;
-        });
-    },
-
-});
 
+////////////////////////////////////////////////////////////////////////////////
 // utility
 function removeFromArray(array, element) {
     var index = array.indexOf(element);