From aede03d8b2b05a07b40f2fd0a97e4368cb1aaef0 Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 15 May 2015 20:43:50 +0200 Subject: [PATCH] Some more layout changes. --- app/Http/Controllers/ReportController.php | 17 ++++++- resources/twig/reports/index.twig | 54 ++++++++++++++++------- 2 files changed, 53 insertions(+), 18 deletions(-) diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php index c5007309aa..c1457882af 100644 --- a/app/Http/Controllers/ReportController.php +++ b/app/Http/Controllers/ReportController.php @@ -6,6 +6,7 @@ use FireflyIII\Helpers\Report\ReportQueryInterface; use FireflyIII\Models\Account; use FireflyIII\Models\Preference; use FireflyIII\Models\TransactionJournal; +use FireflyIII\Repositories\Account\AccountRepositoryInterface; use Session; use Steam; use View; @@ -42,14 +43,26 @@ class ReportController extends Controller * @internal param ReportHelperInterface $helper * */ - public function index() + public function index(AccountRepositoryInterface $repository) { $start = Session::get('first'); $months = $this->helper->listOfMonths($start); $title = 'Reports'; $mainTitleIcon = 'fa-line-chart'; - return view('reports.index', compact('months', 'title', 'mainTitleIcon')); + // does the user have shared accounts? + $accounts = $repository->getAccounts(['Default account', 'Asset account']); + $hasShared = false; + + /** @var Account $account */ + foreach ($accounts as $account) { + if ($account->getMeta('accountRole') == 'sharedAsset') { + $hasShared = true; + } + } + + + return view('reports.index', compact('months', 'title', 'mainTitleIcon', 'hasShared')); } /** diff --git a/resources/twig/reports/index.twig b/resources/twig/reports/index.twig index 5f93a1e0c7..7f7f0319b2 100644 --- a/resources/twig/reports/index.twig +++ b/resources/twig/reports/index.twig @@ -1,27 +1,49 @@ {% extends "./layout/default.twig" %} {% block content %} {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName) }} -
-
-
-
- - Reports -
-
+
+
+
+
+ + Reports for your own accounts +
+
- {% for year, entries in months %} -

{{ year }}

- - {% endfor %} +
+
+
+
+ +
+
+
+
+ + Reports for your own accounts and shared accounts +
+
+ + {% for year, entries in months %} +

{{ year }}

+ + {% endfor %} +
-
{% endblock %} {% block scripts %}