From 26373e5d238031e1af840ab2e9b4034a2227df0a Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Mon, 28 Feb 2022 09:47:47 +0100
Subject: [PATCH] template adjustments for household members

---
 .../Resources/views/Household/index.html.twig | 63 +++++++++++--------
 .../translations/messages.fr.yml              |  4 +-
 2 files changed, 41 insertions(+), 26 deletions(-)

diff --git a/src/Bundle/ChillBudgetBundle/Resources/views/Household/index.html.twig b/src/Bundle/ChillBudgetBundle/Resources/views/Household/index.html.twig
index 81de3be99..a6f17b1b8 100644
--- a/src/Bundle/ChillBudgetBundle/Resources/views/Household/index.html.twig
+++ b/src/Bundle/ChillBudgetBundle/Resources/views/Household/index.html.twig
@@ -337,7 +337,7 @@
 {% endif %}
 
 {% if household.getCurrentMembers|length > 0 %}
-    <h2 class="subtitle">{{ 'Budget household members'|trans }}</h2>
+    <h2 class="subtitle">{{ 'Current budget household members'|trans }}</h2>
 
     {% for hm in household.getCurrentMembers %}
         {% set member = hm.person %}
@@ -361,34 +361,47 @@
                     aria-labelledby="heading_{{ member.id }}"
                     data-bs-parent="#nonCurrent">
 
-                    <div class="flex-table">
-                        <h3 class="family-title">{{ 'Actual resources for %name%'|trans({ '%name%' : member.firstName ~ " " ~ member.lastName }) }}</h3>
-                        {% if member.getBudgetResources|length > 0 %}
-                            {% set memberResources = member.getBudgetResources %}
-                            <div class="item-bloc">
-                                {{ m.table_elements(memberResources, 'resource') }}
-                            </div>
-                        {% else %}
-                            <div class="item-bloc">
-                                <span class="chill-no-data-statement">{{ 'No resources registered'|trans }}</span>
-                            </div>
-                        {% endif %}
-                    </div>
+                    {% if member.getBudgetResources|length > 0 or member.getBudgetCharges|length > 0 %}
+                        <div class="flex-table">
+                            <h3 class="family-title">{{ 'Actual resources for %name%'|trans({ '%name%' : member.firstName ~ " " ~ member.lastName }) }}</h3>
+                            {% if member.getBudgetResources|length > 0 %}
+                                {% set memberResources = member.getBudgetResources %}
+                                <div class="item-bloc">
+                                    {{ m.table_elements(memberResources, 'resource') }}
+                                </div>
+                            {% else %}
+                                <div class="item-bloc">
+                                    <span class="chill-no-data-statement">{{ 'No resources registered'|trans }}</span>
+                                </div>
+                            {% endif %}
+                        </div>
 
-                    <div class="flex-table">
-                        <h3 class="family-title">{{ 'Actual charges for %name%'|trans({ '%name%' : member.firstName ~ " " ~ member.lastName }) }}</h3>
+                        <div class="flex-table">
+                            <h3 class="family-title">{{ 'Actual charges for %name%'|trans({ '%name%' : member.firstName ~ " " ~ member.lastName }) }}</h3>
 
-                        {% if member.getBudgetCharges|length > 0 %}
-                            {% set memberCharges = member.getBudgetCharges %}
+                            {% if member.getBudgetCharges|length > 0 %}
+                                {% set memberCharges = member.getBudgetCharges %}
+                                <div class="item-bloc">
+                                    {{ m.table_elements(memberCharges, 'charge') }}
+                                </div>
+                            {% else %}
+                                <div class="item-bloc">
+                                    <span class="chill-no-data-statement">{{ 'No charges registered'|trans }}</span>
+                                </div>
+                            {% endif %}
+                        </div>
+                    {% else %}
+                        <div class="flex-table">
                             <div class="item-bloc">
-                                {{ m.table_elements(memberCharges, 'charge') }}
+                                <span class="chill-no-data-statement">{{ 'No current budget element registered'|trans }}</span>
                             </div>
-                        {% else %}
-                            <div class="item-bloc">
-                                <span class="chill-no-data-statement">{{ 'No charges registered'|trans }}</span>
-                            </div>
-                        {% endif %}
-                    </div>
+                        </div>
+                    {% endif %}
+                    <ul class="record_actions">
+                        <li>
+                            <a class="btn btn-show" href="{{ path('chill_budget_elements_index', { 'id': member.id } ) }}">{{ 'See complete budget'|trans }}</a>
+                        </li>
+                    </ul>
                 </div>
             </div>
         </div>
diff --git a/src/Bundle/ChillBudgetBundle/translations/messages.fr.yml b/src/Bundle/ChillBudgetBundle/translations/messages.fr.yml
index 93a08d296..20ba57437 100644
--- a/src/Bundle/ChillBudgetBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillBudgetBundle/translations/messages.fr.yml
@@ -1,8 +1,9 @@
 Budget: Budget
 Budget for %name%: Budget de %name%
 Budget for household %household%: Budget de ménage %household%
-Budget household members: Budgets des membres du ménage
+Current budget household members: Budgets actuelles des membres du ménage
 Show budget of %name%: Montrer budget de %name%
+See complete budget: Voir budget complet
 Hide budget: Masquer
 Resource element type: Nature de la ressource
 Actual budget: Budget actuel
@@ -33,6 +34,7 @@ No past resources registered: Aucune ressource passée
 No past charges registered: Aucune charge passée
 No future resources registered: Aucune ressource future enregistrée
 No future charges registered: Aucune ressource future enregistrée
+No current budget element registered: Pas des éléments de budget actuelles enregistrés
 
 New Resource for %name%: Nouvelle ressource pour %name%
 New Charge for %name%: Nouvelle charge pour %name%