From f22a9799a15a13668fcc4d717b1ade70c33ba29b Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Sun, 3 Apr 2016 14:01:27 +0200
Subject: [PATCH] Hide some fields.

---
 resources/views/popup/list/journals.twig       | 18 +++++++++++++-----
 .../views/popup/report/balance-amount.twig     |  2 ++
 .../popup/report/budget-spent-amount.twig      |  1 +
 .../views/popup/report/category-entry.twig     |  1 +
 .../views/popup/report/expense-entry.twig      |  1 +
 resources/views/popup/report/income-entry.twig |  2 ++
 6 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/resources/views/popup/list/journals.twig b/resources/views/popup/list/journals.twig
index 6f042ddcce..64d425c32a 100644
--- a/resources/views/popup/list/journals.twig
+++ b/resources/views/popup/list/journals.twig
@@ -5,15 +5,19 @@
         <th>{{ trans('list.description') }}</th>
         <th>{{ trans('list.amount') }}</th>
         <th class="hidden-sm hidden-xs">{{ trans('list.date') }}</th>
-        <th class="hidden-xs">{{ trans('list.from') }}</th>
+        {% if not hideSource %}
+            <th class="hidden-xs">{{ trans('list.from') }}</th>
+        {% endif %}
+        {% if not hideDestination %}
         <th class="hidden-xs">{{ trans('list.to') }}</th>
+        {% endif %}
         <!-- Hide budgets? -->
-        {% if not hideBudgets %}
+        {% if not hideBudget %}
             <th class="hidden-xs"><i class="fa fa-tasks fa-fw" title="{{ trans('list.budget') }}"></i></th>
         {% endif %}
 
         <!-- Hide categories? -->
-        {% if not hideCategories %}
+        {% if not hideCategory %}
             <th class="hidden-xs"><i class="fa fa-bar-chart fa-fw" title="{{ trans('list.category') }}"></i></th>
         {% endif %}
     </tr>
@@ -33,6 +37,7 @@
             <td class="hidden-sm hidden-xs">
                 {{ journal.date.formatLocalized(monthAndDayFormat) }}
             </td>
+            {% if not hideSource %}
             <td class="hidden-xs">
                 {% if journal.source_account_type == 'Cash account' %}
                     <span class="text-success">(cash)</span>
@@ -40,6 +45,8 @@
                     <a href="{{ route('accounts.show',journal.source_account_id) }}">{{ journal.source_account_name }}</a>
                 {% endif %}
             </td>
+            {% endif %}
+            {% if not hideDestination %}
             <td class="hidden-xs">
                 {% if journal.destination_account_type == 'Cash account' %}
                     <span class="text-success">(cash)</span>
@@ -47,9 +54,10 @@
                     <a href="{{ route('accounts.show',journal.destination_account_id) }}">{{ journal.destination_account_name }}</a>
                 {% endif %}
             </td>
+            {% endif %}
 
             <!-- Do NOT hide the budget? -->
-            {% if not hideBudgets %}
+            {% if not hideBudget %}
                 <td class="hidden-xs">
                     {% if journal.budgets[0] %}
                         <a href="{{ route('budgets.show',journal.budgets[0].id) }}">{{ journal.budgets[0].name }}</a>
@@ -58,7 +66,7 @@
             {% endif %}
 
             <!-- Do NOT hide the category? -->
-            {% if not hideCategories %}
+            {% if not hideCategory %}
                 <td class="hidden-xs">
                     {% if journal.categories[0] %}
                         <a href="{{ route('categories.show',journal.categories[0].id) }}">{{ journal.categories[0].name }}</a>
diff --git a/resources/views/popup/report/balance-amount.twig b/resources/views/popup/report/balance-amount.twig
index a1a645b41d..ad6c20490a 100644
--- a/resources/views/popup/report/balance-amount.twig
+++ b/resources/views/popup/report/balance-amount.twig
@@ -6,6 +6,8 @@
             <h4 class="modal-title" id="balanceAmountTitle">{{ 'balance_amount'|_ }}</h4>
         </div>
         <div class="modal-body">
+            {% set hideSource = true %}
+            {% set hideBudget = true %}
             {% include 'popup/list/journals.twig' %}
         </div>
         <div class="modal-footer">
diff --git a/resources/views/popup/report/budget-spent-amount.twig b/resources/views/popup/report/budget-spent-amount.twig
index ceb4e7d136..792e28416a 100644
--- a/resources/views/popup/report/budget-spent-amount.twig
+++ b/resources/views/popup/report/budget-spent-amount.twig
@@ -6,6 +6,7 @@
             <h4 class="modal-title" id="budgetSpentAmountLabel">{{ 'budget_spent_amount'|_ }}</h4>
         </div>
         <div class="modal-body">
+            {% set hideBudget = true %}
             {% include 'popup/list/journals.twig' %}
         </div>
         <div class="modal-footer">
diff --git a/resources/views/popup/report/category-entry.twig b/resources/views/popup/report/category-entry.twig
index fb3e808fd1..5062d9df89 100644
--- a/resources/views/popup/report/category-entry.twig
+++ b/resources/views/popup/report/category-entry.twig
@@ -6,6 +6,7 @@
             <h4 class="modal-title" id="expenseEntryTitle">{{ 'category_entry'|_ }}</h4>
         </div>
         <div class="modal-body">
+            {% set hideCategory = true %}
             {% include 'popup/list/journals.twig' %}
         </div>
         <div class="modal-footer">
diff --git a/resources/views/popup/report/expense-entry.twig b/resources/views/popup/report/expense-entry.twig
index 65071a8ff0..26c0c140aa 100644
--- a/resources/views/popup/report/expense-entry.twig
+++ b/resources/views/popup/report/expense-entry.twig
@@ -6,6 +6,7 @@
             <h4 class="modal-title" id="expenseEntryTitle">{{ 'expense_entry'|_ }}</h4>
         </div>
         <div class="modal-body">
+            {% set hideDestination = true %}
             {% include 'popup/list/journals.twig' %}
         </div>
         <div class="modal-footer">
diff --git a/resources/views/popup/report/income-entry.twig b/resources/views/popup/report/income-entry.twig
index de93ce2af4..9e401f6fe2 100644
--- a/resources/views/popup/report/income-entry.twig
+++ b/resources/views/popup/report/income-entry.twig
@@ -6,6 +6,8 @@
             <h4 class="modal-title" id="incomeEntryTitle">{{ 'income_entry'|_ }}</h4>
         </div>
         <div class="modal-body">
+            {% set hideBudget = true %}
+            {% set hideSource = true %}
             {% include 'popup/list/journals.twig' %}
         </div>
         <div class="modal-footer">