From 745f4a7523d3686d7cd2cebd71978870f78f8fed Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Sun, 28 Jun 2015 13:07:23 +0200
Subject: [PATCH] Small chart and layout fixes [skip ci]

---
 app/Http/Controllers/Chart/BillController.php |  2 +-
 public/css/firefly.css                        |  2 +-
 public/js/charts.js                           | 18 +++++++++---------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/Http/Controllers/Chart/BillController.php b/app/Http/Controllers/Chart/BillController.php
index dd1ab20a61..4853e7375e 100644
--- a/app/Http/Controllers/Chart/BillController.php
+++ b/app/Http/Controllers/Chart/BillController.php
@@ -57,7 +57,7 @@ class BillController extends Controller
         $cache->addProperty('bills');
         $cache->addProperty('frontpage');
         if ($cache->has()) {
-            // return Response::json($cache->get()); // @codeCoverageIgnore
+             return Response::json($cache->get()); // @codeCoverageIgnore
         }
 
         $bills  = $repository->getActiveBills();
diff --git a/public/css/firefly.css b/public/css/firefly.css
index 8cf5bf464b..81b3942858 100644
--- a/public/css/firefly.css
+++ b/public/css/firefly.css
@@ -10,4 +10,4 @@
     height: 100%;
     margin: 0;
     padding: 0;
-}
\ No newline at end of file
+}
diff --git a/public/js/charts.js b/public/js/charts.js
index 7259043b83..d395fe08cd 100644
--- a/public/js/charts.js
+++ b/public/js/charts.js
@@ -55,8 +55,8 @@ var defaultAreaOptions = {
     pointHitDetectionRadius: 5,
     datasetFill: true,
     scaleFontSize: 10,
-    responsive: true,
-    scaleLabel:           "<%= '" + currencySymbol + " ' + Number(value).toFixed(2).replace('.', ',') %>",
+    responsive: false,
+    scaleLabel: " <%= '" + currencySymbol + " ' + Number(value).toFixed(0).replace('.', ',') %>",
     tooltipFillColor: "rgba(0,0,0,0.5)",
     multiTooltipTemplate: "<%=datasetLabel%>: <%= '" + currencySymbol + " ' + Number(value).toFixed(2).replace('.', ',') %>"
 };
@@ -69,7 +69,7 @@ var defaultPieOptions = {
     pointHitDetectionRadius: 5,
     datasetFill: false,
     scaleFontSize: 10,
-    responsive: true,
+    responsive: false,
     tooltipFillColor: "rgba(0,0,0,0.5)",
     tooltipTemplate: "<%if (label){%><%=label%>: <%}%>" + currencySymbol + " <%= value %>",
 
@@ -83,8 +83,8 @@ var defaultLineOptions = {
     pointHitDetectionRadius: 5,
     datasetFill: false,
     scaleFontSize: 10,
-    responsive: true,
-    scaleLabel:      "<%= '" + currencySymbol + " ' + Number(value).toFixed(2).replace('.', ',') %>",
+    responsive: false,
+    scaleLabel:      "<%= '" + currencySymbol + " ' + Number(value).toFixed(0).replace('.', ',') %>",
     tooltipFillColor: "rgba(0,0,0,0.5)",
     tooltipTemplate: "<%if (label){%><%=label%>: <%}%>" + currencySymbol + " <%= value %>",
 };
@@ -96,8 +96,8 @@ var defaultColumnOptions = {
     pointHitDetectionRadius: 5,
     datasetFill: false,
     scaleFontSize: 10,
-    responsive: true,
-    scaleLabel:           "<%= '" + currencySymbol + " ' + Number(value).toFixed(2).replace('.', ',') %>",
+    responsive: false,
+    scaleLabel:           "<%= '" + currencySymbol + " ' + Number(value).toFixed(0).replace('.', ',') %>",
     tooltipFillColor: "rgba(0,0,0,0.5)",
     tooltipTemplate:      "<%if (label){%><%=label%>: <%}%>" + currencySymbol + " <%= value %>",
     multiTooltipTemplate: "<%=datasetLabel%>: " + currencySymbol + " <%= Number(value).toFixed(2).replace('.', ',') %>"
@@ -110,8 +110,8 @@ var defaultStackedColumnOptions = {
     pointHitDetectionRadius: 5,
     datasetFill: false,
     scaleFontSize: 10,
-    responsive: true,
-    scaleLabel:           "<%= '" + currencySymbol + " ' + Number(value).toFixed(2).replace('.', ',') %>",
+    responsive: false,
+    scaleLabel:           "<%= '" + currencySymbol + " ' + Number(value).toFixed(0).replace('.', ',') %>",
     tooltipFillColor: "rgba(0,0,0,0.5)",
     multiTooltipTemplate: "<%=datasetLabel%>: " + currencySymbol + " <%= Number(value).toFixed(2).replace('.', ',') %>"