From edd66f6a6cf3622dd82a8535a9f4a6272cc9bb1d Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 12 Jul 2023 09:04:15 +0200
Subject: [PATCH] FIX [budget][templates] reimplement display of all calculator
 results

---
 .../Resources/views/Budget/_macros.html.twig  | 33 ++++++++++++++-----
 .../Resources/views/Person/index.html.twig    |  2 +-
 2 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/src/Bundle/ChillBudgetBundle/Resources/views/Budget/_macros.html.twig b/src/Bundle/ChillBudgetBundle/Resources/views/Budget/_macros.html.twig
index dfa286af4..a1fee19ce 100644
--- a/src/Bundle/ChillBudgetBundle/Resources/views/Budget/_macros.html.twig
+++ b/src/Bundle/ChillBudgetBundle/Resources/views/Budget/_macros.html.twig
@@ -1,11 +1,12 @@
-{% macro table_elements(elements, family) %}
+{% macro table_elements(elements, type) %}
+
 <table class="table table-bordered border-dark budget-table">
     <thead>
         <tr>
-            <th class="{{ family }} el-type">{{ 'Budget element type'|trans }}</th>
-            <th class="{{ family }}">{{ 'Amount'|trans }}</th>
-            <th class="{{ family }}">{{ 'Validity period'|trans }}</th>
-            <th class="{{ family }}">&nbsp;</th>
+            <th class="{{ type }} el-type">{{ 'Budget element type'|trans }}</th>
+            <th class="{{ type }}">{{ 'Amount'|trans }}</th>
+            <th class="{{ type }}">{{ 'Validity period'|trans }}</th>
+            <th class="{{ type }}">&nbsp;</th>
         </tr>
     </thead>
     <tbody>
@@ -38,17 +39,17 @@
                 <ul class="record_actions">
                     {% if is_granted('CHILL_BUDGET_ELEMENT_SEE', f) %}
                         <li>
-                            <a href="{{ path('chill_budget_' ~ family ~ '_view', { 'id': f.id } ) }}" class="btn btn-sm btn-show"></a>
+                            <a href="{{ path('chill_budget_' ~ type ~ '_view', { 'id': f.id } ) }}" class="btn btn-sm btn-show"></a>
                         </li>
                     {% endif %}
                     {% if is_granted('CHILL_BUDGET_ELEMENT_UPDATE', f) %}
                         <li>
-                            <a href="{{ path('chill_budget_' ~ family ~'_edit', { 'id': f.id } ) }}" class="btn btn-sm btn-edit"></a>
+                            <a href="{{ path('chill_budget_' ~ type ~'_edit', { 'id': f.id } ) }}" class="btn btn-sm btn-edit"></a>
                         </li>
                     {% endif %}
                     {% if is_granted('CHILL_BUDGET_ELEMENT_DELETE', f) %}
                         <li>
-                            <a href="{{ path('chill_budget_' ~ family ~ '_delete', { 'id': f.id } ) }}" class="btn btn-sm btn-delete"></a>
+                            <a href="{{ path('chill_budget_' ~ type ~ '_delete', { 'id': f.id } ) }}" class="btn btn-sm btn-delete"></a>
                         </li>
                     {% endif %}
                 </ul>
@@ -69,7 +70,7 @@
 </table>
 {% endmacro %}
 
-{% macro table_results(actualCharges, actualResources) %}
+{% macro table_results(actualCharges, actualResources, results) %}
 
 {% set totalCharges = 0 %}
 {% for c in actualCharges %}
@@ -97,6 +98,20 @@
                 {{ result|format_currency('EUR') }}
             </td>
         </tr>
+        {% for result in results %}
+            <tr>
+                <td>{{ result.label }}</td>
+                <td>
+                    {% if result.type == 'currency' %}
+                        {{ result.result|format_currency('EUR') }}
+                    {% elseif result.type == 'percentage' %}
+                        {{ result.result|round(2, 'ceil') ~ '%' }}
+                    {% else %}
+                        {{ result.result|round(2, 'common') }}
+                    {% endif %}
+                </td>
+            </tr>
+        {% endfor %}
     </tbody>
 </table>
 {% endmacro %}
diff --git a/src/Bundle/ChillBudgetBundle/Resources/views/Person/index.html.twig b/src/Bundle/ChillBudgetBundle/Resources/views/Person/index.html.twig
index 18d04b889..aba564206 100644
--- a/src/Bundle/ChillBudgetBundle/Resources/views/Person/index.html.twig
+++ b/src/Bundle/ChillBudgetBundle/Resources/views/Person/index.html.twig
@@ -25,7 +25,7 @@
 
 <div class="mt-5">
     <h3 class="subtitle">{{ 'Budget calculator'|trans }}</h3>
-    {{ table_results(charges, resources) }}
+    {{ table_results(charges, resources, results) }}
 </div>
 
 {% if is_granted('CHILL_BUDGET_ELEMENT_CREATE', person) %}