From ab523b61025727e4093f95913c067bc3e34ed341 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Sun, 10 Apr 2016 17:03:36 +0200
Subject: [PATCH] Make chart pretty

---
 app/Generator/Chart/Bill/ChartJsBillChartGenerator.php | 3 +++
 public/js/global/charts.js                             | 6 +++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/Generator/Chart/Bill/ChartJsBillChartGenerator.php b/app/Generator/Chart/Bill/ChartJsBillChartGenerator.php
index 722d729c08..30af6845e1 100644
--- a/app/Generator/Chart/Bill/ChartJsBillChartGenerator.php
+++ b/app/Generator/Chart/Bill/ChartJsBillChartGenerator.php
@@ -74,14 +74,17 @@ class ChartJsBillChartGenerator implements BillChartGeneratorInterface
         }
 
         $data['datasets'][] = [
+            'type'  => 'bar',
             'label' => trans('firefly.minAmount'),
             'data'  => $minAmount,
         ];
         $data['datasets'][] = [
+            'type'  => 'line',
             'label' => trans('firefly.billEntry'),
             'data'  => $actualAmount,
         ];
         $data['datasets'][] = [
+            'type'  => 'bar',
             'label' => trans('firefly.maxAmount'),
             'data'  => $maxAmount,
         ];
diff --git a/public/js/global/charts.js b/public/js/global/charts.js
index bfb21473c0..71c2aa8037 100644
--- a/public/js/global/charts.js
+++ b/public/js/global/charts.js
@@ -160,6 +160,11 @@ var defaultColumnOptions = {
             }
         }]
     },
+    elements: {
+        line: {
+            fill: false
+        }
+    },
     tooltips: {
         mode: 'label',
         callbacks: {
@@ -302,7 +307,6 @@ function columnChart(URL, container, options) {
             dataset.backgroundColor = fillColors[i];
             newData.datasets.push(dataset);
         }
-        //new Chart(ctx).Bar(newData, defaultColumnOptions);
         new Chart(ctx, {
             type: 'bar',
             data: data,