kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-30 10:33:30 +00:00
Code Issues Projects Releases Wiki Activity

Small chart and layout fixes [skip ci]

Browse Source
This commit is contained in:
James Cole
2015-06-28 13:07:23 +02:00
parent 60254dafd7
commit 745f4a7523
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Chart/BillController.php
View File

@@ -57,7 +57,7 @@ class BillController extends Controller
$cache->addProperty('bills'); $cache->addProperty('bills');
$cache->addProperty('frontpage'); $cache->addProperty('frontpage');
if ($cache->has()) { if ($cache->has()) {
// return Response::json($cache->get()); // @codeCoverageIgnore return Response::json($cache->get()); // @codeCoverageIgnore
} }
$bills = $repository->getActiveBills(); $bills = $repository->getActiveBills();

18
public/js/charts.js
View File

@@ -55,8 +55,8 @@ var defaultAreaOptions = {
pointHitDetectionRadius: 5, pointHitDetectionRadius: 5,
datasetFill: true, datasetFill: true,
scaleFontSize: 10, scaleFontSize: 10,
responsive: true, responsive: false,
scaleLabel: "<%= '" + currencySymbol + " ' + Number(value).toFixed(2).replace('.', ',') %>", scaleLabel: " <%= '" + currencySymbol + " ' + Number(value).toFixed(0).replace('.', ',') %>",
tooltipFillColor: "rgba(0,0,0,0.5)", tooltipFillColor: "rgba(0,0,0,0.5)",
multiTooltipTemplate: "<%=datasetLabel%>: <%= '" + currencySymbol + " ' + Number(value).toFixed(2).replace('.', ',') %>" multiTooltipTemplate: "<%=datasetLabel%>: <%= '" + currencySymbol + " ' + Number(value).toFixed(2).replace('.', ',') %>"
}; };
@@ -69,7 +69,7 @@ var defaultPieOptions = {
pointHitDetectionRadius: 5, pointHitDetectionRadius: 5,
datasetFill: false, datasetFill: false,
scaleFontSize: 10, scaleFontSize: 10,
responsive: true, responsive: false,
tooltipFillColor: "rgba(0,0,0,0.5)", tooltipFillColor: "rgba(0,0,0,0.5)",
tooltipTemplate: "<%if (label){%><%=label%>: <%}%>" + currencySymbol + " <%= value %>", tooltipTemplate: "<%if (label){%><%=label%>: <%}%>" + currencySymbol + " <%= value %>",
@@ -83,8 +83,8 @@ var defaultLineOptions = {
pointHitDetectionRadius: 5, pointHitDetectionRadius: 5,
datasetFill: false, datasetFill: false,
scaleFontSize: 10, scaleFontSize: 10,
responsive: true, responsive: false,
scaleLabel: "<%= '" + currencySymbol + " ' + Number(value).toFixed(2).replace('.', ',') %>", scaleLabel: "<%= '" + currencySymbol + " ' + Number(value).toFixed(0).replace('.', ',') %>",
tooltipFillColor: "rgba(0,0,0,0.5)", tooltipFillColor: "rgba(0,0,0,0.5)",
tooltipTemplate: "<%if (label){%><%=label%>: <%}%>" + currencySymbol + " <%= value %>", tooltipTemplate: "<%if (label){%><%=label%>: <%}%>" + currencySymbol + " <%= value %>",
}; };
@@ -96,8 +96,8 @@ var defaultColumnOptions = {
pointHitDetectionRadius: 5, pointHitDetectionRadius: 5,
datasetFill: false, datasetFill: false,
scaleFontSize: 10, scaleFontSize: 10,
responsive: true, responsive: false,
scaleLabel: "<%= '" + currencySymbol + " ' + Number(value).toFixed(2).replace('.', ',') %>", scaleLabel: "<%= '" + currencySymbol + " ' + Number(value).toFixed(0).replace('.', ',') %>",
tooltipFillColor: "rgba(0,0,0,0.5)", tooltipFillColor: "rgba(0,0,0,0.5)",
tooltipTemplate: "<%if (label){%><%=label%>: <%}%>" + currencySymbol + " <%= value %>", tooltipTemplate: "<%if (label){%><%=label%>: <%}%>" + currencySymbol + " <%= value %>",
multiTooltipTemplate: "<%=datasetLabel%>: " + currencySymbol + " <%= Number(value).toFixed(2).replace('.', ',') %>" multiTooltipTemplate: "<%=datasetLabel%>: " + currencySymbol + " <%= Number(value).toFixed(2).replace('.', ',') %>"
@@ -110,8 +110,8 @@ var defaultStackedColumnOptions = {
pointHitDetectionRadius: 5, pointHitDetectionRadius: 5,
datasetFill: false, datasetFill: false,
scaleFontSize: 10, scaleFontSize: 10,
responsive: true, responsive: false,
scaleLabel: "<%= '" + currencySymbol + " ' + Number(value).toFixed(2).replace('.', ',') %>", scaleLabel: "<%= '" + currencySymbol + " ' + Number(value).toFixed(0).replace('.', ',') %>",
tooltipFillColor: "rgba(0,0,0,0.5)", tooltipFillColor: "rgba(0,0,0,0.5)",
multiTooltipTemplate: "<%=datasetLabel%>: " + currencySymbol + " <%= Number(value).toFixed(2).replace('.', ',') %>" multiTooltipTemplate: "<%=datasetLabel%>: " + currencySymbol + " <%= Number(value).toFixed(2).replace('.', ',') %>"