IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Attempt to fix bug #133

Browse Source
This commit is contained in:
James Cole 2015-12-24 09:45:21 +01:00
parent a6d71988f2
commit 5a61a11a61
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Generator/Chart/Budget/ChartJsBudgetChartGenerator.php
View File

@ -129,10 +129,8 @@ class ChartJsBudgetChartGenerator implements BudgetChartGenerator
foreach ($entries as $entry) { foreach ($entries as $entry) {
$array = [ $array = [
'label' => $entry[0]->formatLocalized($format), 'label' => $entry[0]->formatLocalized($format),
'data' => [], 'data' => array_shift($entry),
]; ];
array_shift($entry);
$array['data'] = $entry;
$data['datasets'][] = $array; $data['datasets'][] = $array;
} }

3
app/Http/Controllers/Chart/BudgetController.php
View File

@ -290,7 +290,6 @@ class BudgetController extends Controller
} }
// filter empty budgets: // filter empty budgets:
foreach ($allBudgets as $budget) { foreach ($allBudgets as $budget) {
$spent = $repository->balanceInPeriodForList($budget, $start, $end, $accounts); $spent = $repository->balanceInPeriodForList($budget, $start, $end, $accounts);
if ($spent != 0) { if ($spent != 0) {
@ -315,7 +314,7 @@ class BudgetController extends Controller
$start->endOfMonth()->addDay(); $start->endOfMonth()->addDay();
} }
$data = $this->generator->year($allBudgets, $entries); $data = $this->generator->year($budgets, $entries);
$cache->store($data); $cache->store($data);
return Response::json($data); return Response::json($data);