Display of budget result

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> #}
 
 

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>

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') }}

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>
 

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>

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%