From 274c6115ccb7452962747f77c4911ce259782fa5 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Fri, 25 Feb 2022 17:01:24 +0100
Subject: [PATCH] index templates fixed for display of past and future budgets

---
 .../Resources/views/Household/index.html.twig | 166 +++++++++---------
 .../Resources/views/Person/index.html.twig    |  96 +++++-----
 2 files changed, 136 insertions(+), 126 deletions(-)

diff --git a/src/Bundle/ChillBudgetBundle/Resources/views/Household/index.html.twig b/src/Bundle/ChillBudgetBundle/Resources/views/Household/index.html.twig
index 6fe00a70f..1b9c91596 100644
--- a/src/Bundle/ChillBudgetBundle/Resources/views/Household/index.html.twig
+++ b/src/Bundle/ChillBudgetBundle/Resources/views/Household/index.html.twig
@@ -214,16 +214,92 @@
         {% endif %}
     </div>
 
-    {% if household.getCurrentMembers|length > 0 %}
-        <style>
-            button[aria-expanded="true"] > span.folded,
-            button[aria-expanded="false"] > span.unfolded { display: none; }
-            button[aria-expanded="false"] > span.folded,
-            button[aria-expanded="true"] > span.unfolded { display: inline; }
-        </style>
-        <h2 class="subtitle">{{ 'Budget household members'|trans }}</h2>
+    {# {% if is_granted('CHILL_BUDGET_ELEMENT_CREATE', household) %}
+    <ul class="record_actions sticky-form-buttons">
+        <li>
+            <a class="btn btn-create" href="{{ path('chill_budget_resource_household_new', { 'id': household.id} ) }}">{{ 'Create new resource'|trans }}</a>
+        </li>
+        <li>
+            <a class="btn btn-create" href="{{ path('chill_budget_charge_household_new', { 'id': household.id} ) }}">{{ 'Create new charge'|trans }}</a>
+        </li>
+    </ul>
+    {% endif %} #}
 
-        {% for hm in household.getCurrentMembers %}
+{% endif %}
+
+{% if pastCharges|length > 0 or pastResources|length > 0 %}
+    <h2 class="subtitle">{{ 'Past budget'|trans }}</h2>
+
+    <div class="flex-table">
+        <h3 class="family-title">{{ 'Past resources'|trans }}</h3>
+
+        {% if pastResources|length > 0 %}
+            <div class="item-bloc">
+                {{ m.table_elements(pastResources, 'resource') }}
+            </div>
+        {% else %}
+            <div class="item-bloc">
+                <span class="chill-no-data-statement">{{ 'No past resources registered'|trans }}</span>
+            <div class="item-bloc">
+        {% endif %}
+    </div>
+
+    <div class="flex-table">
+        <h3 class="family-title">{{ 'Past charges'|trans }}</h3>
+
+        {% if pastCharges|length > 0 %}
+            <div class="item-bloc">
+                {{ m.table_elements(pastCharges, 'charge') }}
+            </div>
+        {% else %}
+            <div class="item-bloc">
+                <span class="chill-no-data-statement">{{ 'No past charges registered'|trans }}</span>
+            </div>
+        {% endif %}
+    </div>
+{% endif %}
+
+{% if futureCharges|length > 0 or futureResources|length > 0 %}
+    <h2 class="subtitle">{{ 'Future budget'|trans }}</h2>
+
+    <div class="flex-table">
+        <h3 class="family-title">{{ 'Future resources'|trans }}</h3>
+
+        {% if futureResources|length > 0 %}
+            <div class="item-bloc">
+                {{ m.table_elements(futureResources, 'resource') }}
+            </div>
+        {% else %}
+            <div class="item-bloc">
+                <span class="chill-no-data-statement">{{ 'No future resources registered'|trans }}</span>
+            </div>
+        {% endif %}
+    </div>
+    <div class="flex-table">
+        <h3 class="family-title">{{ 'Future charges'|trans }}</h3>
+
+        {% if futureCharges|length > 0 %}
+            <div class="item-bloc">
+                {{ m.table_elements(futureCharges, 'charge') }}
+            </div>
+        {% else %}
+            <div class="item-bloc">
+                <span class="chill-no-data-statement">{{ 'No future charges registered'|trans }}</span>
+            </div>
+        {% endif %}
+    </div>
+{% endif %}
+
+{% if household.getCurrentMembers|length > 0 %}
+    <style>
+        button[aria-expanded="true"] > span.folded,
+        button[aria-expanded="false"] > span.unfolded { display: none; }
+        button[aria-expanded="false"] > span.folded,
+        button[aria-expanded="true"] > span.unfolded { display: inline; }
+    </style>
+    <h2 class="subtitle">{{ 'Budget household members'|trans }}</h2>
+
+    {% for hm in household.getCurrentMembers %}
         <div class="accordion" id="nonCurrent">
             <div class="accordion-item">
                 {% set member = hm.person %}
@@ -278,77 +354,7 @@
                 </div>
             </div>
         </div>
-        {% endfor %}
-
-    {% endif %}
-
-    {% if is_granted('CHILL_BUDGET_ELEMENT_CREATE', household) %}
-    <ul class="record_actions sticky-form-buttons">
-        <li>
-            <a class="btn btn-create" href="{{ path('chill_budget_resource_household_new', { 'id': household.id} ) }}">{{ 'Create new resource'|trans }}</a>
-        </li>
-        <li>
-            <a class="btn btn-create" href="{{ path('chill_budget_charge_household_new', { 'id': household.id} ) }}">{{ 'Create new charge'|trans }}</a>
-        </li>
-    </ul>
-    {% endif %}
-
-{% endif %}
-
-{% if pastCharges|length > 0 or pastResources|length > 0 %}
-    <h2 class="subtitle">{{ 'Past budget'|trans }}</h2>
-
-    <h3 class="family-title">{{ 'Past resources'|trans }}</h3>
-
-    {% if pastResources|length > 0 %}
-        <div class="item-bloc">
-            {{ m.table_elements(pastResources, 'resource') }}
-        </div>
-    {% else %}
-        <div class="item-bloc">
-            <span class="chill-no-data-statement">{{ 'No past resources registered'|trans }}</span>
-        <div class="item-bloc">
-    {% endif %}
-
-    <h3 class="family-title">{{ 'Past charges'|trans }}</h3>
-
-    {% if pastCharges|length > 0 %}
-        <div class="item-bloc">
-            {{ m.table_elements(pastCharges, 'charge') }}
-        </div>
-    {% else %}
-        <div class="item-bloc">
-            <span class="chill-no-data-statement">{{ 'No past charges registered'|trans }}</span>
-        </div>
-    {% endif %}
-{% endif %}
-
-{% if futureCharges|length > 0 or futureResources|length > 0 %}
-    <h2 class="subtitle">{{ 'Future budget'|trans }}</h2>
-
-    <h3 class="family-title">{{ 'Future resources'|trans }}</h3>
-
-    {% if futureResources|length > 0 %}
-        <div class="item-bloc">
-            {{ m.table_elements(futureResources, 'resource') }}
-        </div>
-    {% else %}
-        <div class="item-bloc">
-            <span class="chill-no-data-statement">{{ 'No future resources registered'|trans }}</span>
-        </div>
-    {% endif %}
-
-    <h3 class="family-title">{{ 'Future charges'|trans }}</h3>
-
-    {% if futureCharges|length > 0 %}
-        <div class="item-bloc">
-            {{ m.table_elements(futureCharges, 'charge') }}
-        </div>
-    {% else %}
-        <div class="item-bloc">
-            <span class="chill-no-data-statement">{{ 'No future charges registered'|trans }}</span>
-        </div>
-    {% endif %}
+    {% endfor %}
 {% endif %}
 
 {% if (resources|length + charges|length) == 0 or futureCharges|length > 0 or futureResources|length > 0 or pastCharges|length > 0 or pastResources|length > 0 %}
diff --git a/src/Bundle/ChillBudgetBundle/Resources/views/Person/index.html.twig b/src/Bundle/ChillBudgetBundle/Resources/views/Person/index.html.twig
index 377f4383d..621aa9f83 100644
--- a/src/Bundle/ChillBudgetBundle/Resources/views/Person/index.html.twig
+++ b/src/Bundle/ChillBudgetBundle/Resources/views/Person/index.html.twig
@@ -214,7 +214,7 @@
         {% endif %}
     </div>
 
-    {% if is_granted('CHILL_BUDGET_ELEMENT_CREATE', person) %}
+    {# {% if is_granted('CHILL_BUDGET_ELEMENT_CREATE', person) %}
     <ul class="record_actions sticky-form-buttons">
         <li>
             <a class="btn btn-create" href="{{ path('chill_budget_resource_new', { 'id': person.id} ) }}">{{ 'Create new resource'|trans }}</a>
@@ -223,64 +223,68 @@
             <a class="btn btn-create" href="{{ path('chill_budget_charge_new', { 'id': person.id} ) }}">{{ 'Create new charge'|trans }}</a>
         </li>
     </ul>
-    {% endif %}
+    {% endif %} #}
 
 {% endif %}
 
 {% if pastCharges|length > 0 or pastResources|length > 0 %}
     <h2 class="subtitle">{{ 'Past budget'|trans }}</h2>
+    <div class="flex-table">
+        <h3 class="family-title">{{ 'Past resources'|trans }}</h3>
 
-    <h3 class="family-title">{{ 'Past resources'|trans }}</h3>
+        {% if pastResources|length > 0 %}
+            <div class="item-bloc">
+                {{ m.table_elements(pastResources, 'resource') }}
+            </div>
+        {% else %}
+            <div class="item-bloc">
+                <span class="chill-no-data-statement">{{ 'No past resources registered'|trans }}</span>
+            <div class="item-bloc">
+        {% endif %}
+    </div>
+    <div class="flex-table">
+        <h3 class="family-title">{{ 'Past charges'|trans }}</h3>
 
-    {% if pastResources|length > 0 %}
-        <div class="item-bloc">
-            {{ m.table_elements(pastResources, 'resource') }}
-        </div>
-    {% else %}
-        <div class="item-bloc">
-            <span class="chill-no-data-statement">{{ 'No past resources registered'|trans }}</span>
-        <div class="item-bloc">
-    {% endif %}
-
-    <h3 class="family-title">{{ 'Past charges'|trans }}</h3>
-
-    {% if pastCharges|length > 0 %}
-        <div class="item-bloc">
-            {{ m.table_elements(pastCharges, 'charge') }}
-        </div>
-    {% else %}
-        <div class="item-bloc">
-            <span class="chill-no-data-statement">{{ 'No past charges registered'|trans }}</span>
-        </div>
-    {% endif %}
+        {% if pastCharges|length > 0 %}
+            <div class="item-bloc">
+                {{ m.table_elements(pastCharges, 'charge') }}
+            </div>
+        {% else %}
+            <div class="item-bloc">
+                <span class="chill-no-data-statement">{{ 'No past charges registered'|trans }}</span>
+            </div>
+        {% endif %}
+    </div>
 {% endif %}
 
 {% if futureCharges|length > 0 or futureResources|length > 0 %}
     <h2 class="subtitle">{{ 'Future budget'|trans }}</h2>
+    <div class="flex-table">
+        <h3 class="family-title">{{ 'Future resources'|trans }}</h3>
 
-    <h3 class="family-title">{{ 'Future resources'|trans }}</h3>
+        {% if futureResources|length > 0 %}
+            <div class="item-bloc">
+                {{ m.table_elements(futureResources, 'resource') }}
+            </div>
+        {% else %}
+            <div class="item-bloc">
+                <span class="chill-no-data-statement">{{ 'No future resources registered'|trans }}</span>
+            </div>
+        {% endif %}
+    </div>
+    <div class="flex-table">
+        <h3 class="family-title">{{ 'Future charges'|trans }}</h3>
 
-    {% if futureResources|length > 0 %}
-        <div class="item-bloc">
-            {{ m.table_elements(futureResources, 'resource') }}
-        </div>
-    {% else %}
-        <div class="item-bloc">
-            <span class="chill-no-data-statement">{{ 'No future resources registered'|trans }}</span>
-        </div>
-    {% endif %}
-
-    <h3 class="family-title">{{ 'Future charges'|trans }}</h3>
-
-    {% if futureCharges|length > 0 %}
-        <div class="item-bloc">
-            {{ m.table_elements(futureCharges, 'charge') }}
-        </div>
-    {% else %}
-        <div class="item-bloc">
-            <span class="chill-no-data-statement">{{ 'No future charges registered'|trans }}</span>
-        </div>
-    {% endif %}
+        {% if futureCharges|length > 0 %}
+            <div class="item-bloc">
+                {{ m.table_elements(futureCharges, 'charge') }}
+            </div>
+        {% else %}
+            <div class="item-bloc">
+                <span class="chill-no-data-statement">{{ 'No future charges registered'|trans }}</span>
+            </div>
+        {% endif %}
+    </div>
 {% endif %}
 
 {% if (resources|length + charges|length) == 0 or futureCharges|length > 0 or futureResources|length > 0 or pastCharges|length > 0 or pastResources|length > 0 %}