gh-mirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-12-21 18:51:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

New budget table for multi year report.

Browse Source 
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
This commit is contained in:
James Cole
2016-11-02 04:55:44 +01:00
parent 33c0c1bea6
commit 124ecb1372
4 changed files with 170 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,8 +21,6 @@ use FireflyIII\Models\AccountType;
use FireflyIII\Models\Transaction;
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Repositories\Account\AccountTaskerInterface;
use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
use Illuminate\Support\Collection;
use Preferences;
use Session;
@@ -244,6 +242,11 @@ class ReportController extends Controller
*/
private function defaultMultiYear(string $reportType, Carbon $start, Carbon $end, Collection $accounts)
{
// need all budgets
// need all years.
$years = $this->helper->listOfYears($start, $end);
$budgetMultiYear = $this->helper->getBudgetMultiYear($start, $end, $accounts);
// and some id's, joined:
$accountIds = [];
@@ -256,7 +259,8 @@ class ReportController extends Controller
return view(
'reports.default.multi-year',
compact(
'accounts', 'start', 'end', 'accountIds', 'reportType'
'accounts', 'start', 'end', 'accountIds', 'reportType',
'years', 'budgetMultiYear'
)
);
}