From 969f0b8aeb7892f35fc6c3a86b3c8c0d8ece0813 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 2 Mar 2022 16:38:55 +0100
Subject: [PATCH] Display of budget result

---
 .../Resources/views/Budget/_budget.html.twig           | 10 ----------
 .../Resources/views/Budget/_current_budget.html.twig   |  9 ---------
 .../Resources/views/Budget/_macros.html.twig           |  2 +-
 .../Resources/views/Household/index.html.twig          |  7 +++++++
 .../Resources/views/Person/index.html.twig             |  9 +++++++++
 .../ChillBudgetBundle/translations/messages.fr.yml     |  1 +
 6 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/src/Bundle/ChillBudgetBundle/Resources/views/Budget/_budget.html.twig b/src/Bundle/ChillBudgetBundle/Resources/views/Budget/_budget.html.twig
index 5013904a1..b1e9cf9f7 100644
--- a/src/Bundle/ChillBudgetBundle/Resources/views/Budget/_budget.html.twig
+++ b/src/Bundle/ChillBudgetBundle/Resources/views/Budget/_budget.html.twig
@@ -92,15 +92,5 @@
         </div>
     {% endif %}
 
-    {# <div class="flex-table">
-        <div class="item-bloc">
-            <div class="item-col">
-                <p><span class="budget-result">result of budget</span></p>
-            </div>
-            <div class="item-col">
-                <p>{{}}</p>
-            </div>
-        </div>
-    </div> #}
 
 
diff --git a/src/Bundle/ChillBudgetBundle/Resources/views/Budget/_current_budget.html.twig b/src/Bundle/ChillBudgetBundle/Resources/views/Budget/_current_budget.html.twig
index 3456b7dc8..2fc07839a 100644
--- a/src/Bundle/ChillBudgetBundle/Resources/views/Budget/_current_budget.html.twig
+++ b/src/Bundle/ChillBudgetBundle/Resources/views/Budget/_current_budget.html.twig
@@ -26,13 +26,4 @@
         <span class="chill-no-data-statement">{{ 'No charges registered'|trans }}</span>
     </div>
     {% endif %}
-
-    {# {% if results|length > 0 %} #}
-        <div class="flex-table">
-            <h3 class="family-title">{{ 'Budget calculator'|trans }}</h2>
-            <div class="item-bloc">
-                {{ table_results(actualCharges, actualResources) }}
-            </div>
-        </div>
-    {# {% endif %} #}
 </div>
\ No newline at end of file
diff --git a/src/Bundle/ChillBudgetBundle/Resources/views/Budget/_macros.html.twig b/src/Bundle/ChillBudgetBundle/Resources/views/Budget/_macros.html.twig
index d06e55ccf..000644985 100644
--- a/src/Bundle/ChillBudgetBundle/Resources/views/Budget/_macros.html.twig
+++ b/src/Bundle/ChillBudgetBundle/Resources/views/Budget/_macros.html.twig
@@ -83,7 +83,7 @@
     </thead>
     <tbody>
         <tr>
-            <td>Result</td>
+            <td>{{ 'The balance'|trans }}</td>
             <td>&nbsp;</td>
             <td>
                 {{ result|format_currency('EUR') }}
diff --git a/src/Bundle/ChillBudgetBundle/Resources/views/Household/index.html.twig b/src/Bundle/ChillBudgetBundle/Resources/views/Household/index.html.twig
index 7349c5fda..9a8216284 100644
--- a/src/Bundle/ChillBudgetBundle/Resources/views/Household/index.html.twig
+++ b/src/Bundle/ChillBudgetBundle/Resources/views/Household/index.html.twig
@@ -23,6 +23,13 @@
     'household': household
 } %}
 
+<div class="flex-table">
+    <h3 class="family-title">{{ 'Budget calculator'|trans }}</h2>
+    <div class="item-bloc">
+        {{ table_results(charges, resources) }}
+    </div>
+</div>
+
 {% if household.getCurrentMembers|length > 0 %}
     <h2 class="subtitle">{{ 'Current budget household members'|trans }}</h2>
 
diff --git a/src/Bundle/ChillBudgetBundle/Resources/views/Person/index.html.twig b/src/Bundle/ChillBudgetBundle/Resources/views/Person/index.html.twig
index a5828f5be..959df3d62 100644
--- a/src/Bundle/ChillBudgetBundle/Resources/views/Person/index.html.twig
+++ b/src/Bundle/ChillBudgetBundle/Resources/views/Person/index.html.twig
@@ -1,5 +1,7 @@
 {% extends "@ChillPerson/Person/layout.html.twig" %}
 
+{% from 'ChillBudgetBundle:Budget:_macros.html.twig' import table_results %}
+
 {% set activeRouteKey = '' %}
 {% set title = 'Budget for %name%'|trans({ '%name%' : person.firstName ~ " " ~ person.lastName } ) %}
 {% block title title %}
@@ -21,6 +23,13 @@
     'person': person
 } %}
 
+<div class="flex-table">
+    <h3 class="family-title">{{ 'Budget calculator'|trans }}</h2>
+    <div class="item-bloc">
+        {{ table_results(charges, resources) }}
+    </div>
+</div>
+
 {% if is_granted('CHILL_BUDGET_ELEMENT_CREATE', person) %}
     <ul class="record_actions sticky-form-buttons">
         <li>
diff --git a/src/Bundle/ChillBudgetBundle/translations/messages.fr.yml b/src/Bundle/ChillBudgetBundle/translations/messages.fr.yml
index 459e185dc..aadfb3fe6 100644
--- a/src/Bundle/ChillBudgetBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillBudgetBundle/translations/messages.fr.yml
@@ -70,6 +70,7 @@ charge.help.not-concerned: Non concerné
 
 Budget calculator: Calculs et indices sur le budget
 Budget calculator result: Résultats
+The balance: Le solde budgétaire
 
 Valid since %startDate% until %endDate%: Valide depuis le %startDate% jusqu'au %endDate%
 Valid since %startDate%: Valide depuis le %startDate%
\ No newline at end of file