From bbfc9627273783c1018573a2179c3d23c6150c50 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Wed, 2 Mar 2016 07:08:08 +0100
Subject: [PATCH] Include tags in multi year report [skip ci]

---
 app/Http/Controllers/ReportController.php       |  5 +++--
 resources/views/reports/default/multi-year.twig | 11 ++++++++++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php
index e11b562b3f..d9cbc3796e 100644
--- a/app/Http/Controllers/ReportController.php
+++ b/app/Http/Controllers/ReportController.php
@@ -201,6 +201,7 @@ class ReportController extends Controller
         $accountReport = $this->accountHelper->getAccountReport($start, $end, $accounts);
         $incomes       = $this->helper->getIncomeReport($start, $end, $accounts);
         $expenses      = $this->helper->getExpenseReport($start, $end, $accounts);
+        $tags          = $this->helper->tagReport($start, $end, $accounts);
 
         // and some id's, joined:
         $accountIds = [];
@@ -214,7 +215,7 @@ class ReportController extends Controller
             'reports.default.multi-year',
             compact(
                 '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',
             compact(
                 'start', 'accountReport', 'incomes', 'reportType', 'accountIds', 'end',
-                'expenses', 'incomeTopLength', 'expenseTopLength','tags'
+                'expenses', 'incomeTopLength', 'expenseTopLength', 'tags'
             )
         );
     }
diff --git a/resources/views/reports/default/multi-year.twig b/resources/views/reports/default/multi-year.twig
index c44eabd91c..1019861620 100644
--- a/resources/views/reports/default/multi-year.twig
+++ b/resources/views/reports/default/multi-year.twig
@@ -33,7 +33,7 @@
     <div class="row">
         <div class="col-lg-6 col-md-6 col-sm-6">
             {% include 'reports/partials/accounts.twig' %}
-            {% include 'reports/partials/income-vs-expenses.twig' %}
+
         </div>
         <div class="col-lg-3 col-md-3 col-sm-3">
             <!-- income -->
@@ -44,6 +44,15 @@
             {% include 'reports/partials/expenses.twig' %}
         </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 %}
         <div class="row" style="display:none;">