kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-24 22:48:18 +00:00
Code Issues Projects Releases Wiki Activity

Some cleaning up and more charts.

Browse Source
This commit is contained in:
James Cole
2016-04-26 09:21:57 +02:00
parent 01cab599bb
commit d551333fa2
15 changed files with 150 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/Http/Controllers/ReportController.php
View File

@@ -314,6 +314,9 @@ class ReportController extends Controller
// find the budgets we've spent money on this period with these accounts:
$budgets = $this->budgetHelper->getBudgetsWithExpenses($start, $end, $accounts);
// find the categories we've spent money on this period with these accounts:
$categories = $this->helper->getCategoriesWithExpenses($start, $end, $accounts);
Session::flash('gaEventCategory', 'report');
Session::flash('gaEventAction', 'year');
Session::flash('gaEventLabel', $start->format('Y'));
@@ -330,7 +333,7 @@ class ReportController extends Controller
'reports.default.year',
compact(
'start', 'accountReport', 'incomes', 'reportType', 'accountIds', 'end',
'expenses', 'incomeTopLength', 'expenseTopLength', 'tags', 'budgets'
'expenses', 'incomeTopLength', 'expenseTopLength', 'tags', 'budgets', 'categories'
)
);
}