kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-11-16 06:38:09 +00:00
Code Issues Projects Releases Wiki Activity

Include tags in multi year report [skip ci]

Browse Source
This commit is contained in:
James Cole
2016-03-02 07:08:08 +01:00
parent 8ddb357e5a
commit bbfc962727
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -201,6 +201,7 @@ class ReportController extends Controller
$accountReport = $this->accountHelper->getAccountReport($start, $end, $accounts); $accountReport = $this->accountHelper->getAccountReport($start, $end, $accounts);
$incomes = $this->helper->getIncomeReport($start, $end, $accounts); $incomes = $this->helper->getIncomeReport($start, $end, $accounts);
$expenses = $this->helper->getExpenseReport($start, $end, $accounts); $expenses = $this->helper->getExpenseReport($start, $end, $accounts);
$tags = $this->helper->tagReport($start, $end, $accounts);
// and some id's, joined: // and some id's, joined:
$accountIds = []; $accountIds = [];
@@ -214,7 +215,7 @@ class ReportController extends Controller
'reports.default.multi-year', 'reports.default.multi-year',
compact( compact(
'budgets', 'accounts', 'categories', 'start', 'end', 'accountIds', 'reportType', 'accountReport', 'incomes', 'expenses', 'budgets', 'accounts', 'categories', 'start', 'end', 'accountIds', 'reportType', 'accountReport', 'incomes', 'expenses',
'incomeTopLength', 'expenseTopLength' 'incomeTopLength', 'expenseTopLength', 'tags'
) )
); );
} }
@@ -253,7 +254,7 @@ class ReportController extends Controller
'reports.default.year', 'reports.default.year',
compact( compact(
'start', 'accountReport', 'incomes', 'reportType', 'accountIds', 'end', 'start', 'accountReport', 'incomes', 'reportType', 'accountIds', 'end',
'expenses', 'incomeTopLength', 'expenseTopLength','tags' 'expenses', 'incomeTopLength', 'expenseTopLength', 'tags'
) )
); );
} }

11
resources/views/reports/default/multi-year.twig
View File

@@ -33,7 +33,7 @@
<div class="row"> <div class="row">
<div class="col-lg-6 col-md-6 col-sm-6"> <div class="col-lg-6 col-md-6 col-sm-6">
{% include 'reports/partials/accounts.twig' %} {% include 'reports/partials/accounts.twig' %}
{% include 'reports/partials/income-vs-expenses.twig' %}
</div> </div>
<div class="col-lg-3 col-md-3 col-sm-3"> <div class="col-lg-3 col-md-3 col-sm-3">
<!-- income --> <!-- income -->
@@ -44,6 +44,15 @@
{% include 'reports/partials/expenses.twig' %} {% include 'reports/partials/expenses.twig' %}
</div> </div>
</div> </div>
<div class="row">
<div class="col-lg-6 col-md-6 col-sm-6">
{% include 'reports/partials/income-vs-expenses.twig' %}
</div>
<div class="col-lg-6 col-md-6 col-sm-6">
{% include 'reports/partials/tags.twig' %}
</div>
</div>
{% for account in accounts %} {% for account in accounts %}
<div class="row" style="display:none;"> <div class="row" style="display:none;">