From f24a1b487a65dd0d565d536aa2708b315b5845f6 Mon Sep 17 00:00:00 2001
From: Gery Debongnie <ged@openerp.com>
Date: Tue, 10 Dec 2013 10:21:25 +0100
Subject: [PATCH] [IMP] improves the chart code to display correct bar chart
 when no groupby are selected (graph view, addon web_graph)

bzr revid: ged@openerp.com-20131210092125-fqv9by5xons81uo1
---
 addons/web_graph/static/src/js/charts.js | 154 +++++++++++++----------
 1 file changed, 87 insertions(+), 67 deletions(-)

diff --git a/addons/web_graph/static/src/js/charts.js b/addons/web_graph/static/src/js/charts.js
index 5f17cce4aef..8ef16d92b3e 100644
--- a/addons/web_graph/static/src/js/charts.js
+++ b/addons/web_graph/static/src/js/charts.js
@@ -1,78 +1,98 @@
 
 openerp.web_graph.draw_chart = function (mode, pivot, svg) {
+    openerp.web_graph[mode](pivot, svg);
+};
 
+
+openerp.web_graph.bar_chart = function (pivot, svg) {
+    var dim_x = pivot.rows.groupby.length,
+        dim_y = pivot.cols.groupby.length,
+        data;
+
+    if ((dim_x === 0) && (dim_y === 0)) {
+        data = [{key: 'Expected Revenue', values:[{
+            title: 'Total',
+            value: pivot.get_value(pivot.rows.main.id, pivot.cols.main.id),
+        }]}];
+        // debugger;
+    } else if ((dim_x === 0) && (dim_y === 1)){
+       
+     } else
+    {
+        data = _.map(pivot.rows.main.children, function (pt) {
+            var value = pivot.get_value(pt.id, pivot.cols.main.id),
+                title = (pt.title !== undefined) ? pt.title : 'Undefined';
+            return {title: title, value: value};
+        });
+        data = [{key: 'Bar chart', values:data}];
+    }
+    nv.addGraph(function () {
+      var chart = nv.models.discreteBarChart()
+            .x(function(d) { return d.title;})
+            .y(function(d) { return d.value;})
+            .tooltips(false)
+            .showValues(true)
+            .staggerLabels(true)
+            .width(650)
+            .height(400);
+
+        d3.select(svg)
+            .datum(data)
+            .attr('width', 650)
+            .attr('height', 400)
+            .call(chart);
+
+        nv.utils.windowResize(chart.update);
+        return chart;
+    });
+};
+
+
+openerp.web_graph.line_chart = function (pivot, svg) {
+    var data = _.map(pivot.rows.main.children, function (pt) {
+    var value = pivot.get_value(pt.id, pivot.cols.main.id),
+        title = (pt.title !== undefined) ? pt.title : 'Undefined';
+            return {x: title, y: value};
+        });
+
+    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(svg)
+            .attr('width', 600)
+            .attr('height', 300)
+            .datum([{key: 'Bar chart', values: data}])
+            .call(chart);
+
+        return chart;
+      });
+};
+
+openerp.web_graph.pie_chart = function (pivot, svg) {
     var data = _.map(pivot.rows.main.children, function (pt) {
         var value = pivot.get_value(pt.id, pivot.cols.main.id),
             title = (pt.title !== undefined) ? pt.title : 'Undefined';
         return {x: title, y: value};
     });
     
-    switch (mode) {
-        case 'bar_chart':
-            bar_chart();
-            break;
-        case 'line_chart':
-            line_chart();
-            break;
-        case 'pie_chart':
-            pie_chart();
-            break;
-    }
-    function bar_chart () {
-        nv.addGraph(function () {
-          var chart = nv.models.discreteBarChart()
-                .tooltips(false)
-                .showValues(true)
-                .staggerLabels(true)
-                .width(650)
-                .height(400);
+    nv.addGraph(function () {
+        var chart = nv.models.pieChart()
+            .color(d3.scale.category10().range())
+            .width(650)
+            .height(400);
 
-            d3.select(svg)
-                .datum([{key: 'Bar chart', values:data}])
-                .attr('width', 650)
-                .attr('height', 400)
-                .call(chart);
+        d3.select(svg)
+            .datum(data)
+            .transition().duration(1200)
+            .attr('width', 650)
+            .attr('height', 400)
+            .call(chart);
 
-            nv.utils.windowResize(chart.update);
-            return chart;
-        });
-    };
-
-    function line_chart () {
-        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(svg)
-                .attr('width', 600)
-                .attr('height', 300)
-                .datum([{key: 'Bar chart', values: data}])
-                .call(chart);
-
-            return chart;
-          });
-    };
-
-    function pie_chart () {
-        nv.addGraph(function () {
-            var chart = nv.models.pieChart()
-                .color(d3.scale.category10().range())
-                .width(650)
-                .height(400);
-
-            d3.select(svg)
-                .datum(data)
-                .transition().duration(1200)
-                .attr('width', 650)
-                .attr('height', 400)
-                .call(chart);
-
-            nv.utils.windowResize(chart.update);
-            return chart;
-        });
-    };
-
-}
+        nv.utils.windowResize(chart.update);
+        return chart;
+    });
+};