Some formatting, cleanup, and a new chart.

public/assets/javascript/firefly/gcharts.js

@@ -1,5 +1,8 @@
 google.load('visualization', '1.1', {'packages': ['corechart', 'bar', 'sankey', 'table']});
 
+/*
+TODO manage the combination of default options AND custom options.
+ */
 function googleLineChart(URL, container) {
     if ($('#' + container).length == 1) {
         $.getJSON(URL).success(function (data) {
@@ -150,6 +153,43 @@ function googleStackedColumnChart(URL, container) {
     }
 }
 
+function googleComboChart(URL, container) {
+    if ($('#' + container).length == 1) {
+        $.getJSON(URL).success(function (data) {
+            /*
+             Get the data from the JSON
+             */
+            gdata = new google.visualization.DataTable(data);
+
+            /*
+             Format as money
+             */
+            var money = new google.visualization.NumberFormat({
+                decimalSymbol: ',',
+                groupingSymbol: '.',
+                prefix: '\u20AC '
+            });
+            for (i = 1; i < gdata.getNumberOfColumns(); i++) {
+                money.format(gdata, i);
+            }
+
+            /*
+             Create a new google charts object.
+             */
+            var chart = new google.visualization.ComboChart(document.getElementById(container));
+            /*
+             Draw it:
+             */
+            chart.draw(gdata, defaultComboChartOptions);
+
+        }).fail(function () {
+            $('#' + container).addClass('google-chart-error');
+        });
+    } else {
+        console.log('No container found called "' + container + '"');
+    }
+}
+
 function googlePieChart(URL, container) {
     if ($('#' + container).length == 1) {
         $.getJSON(URL).success(function (data) {