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) %}
+
- {{ 'Budget element type'|trans }} |
- {{ 'Amount'|trans }} |
- {{ 'Validity period'|trans }} |
- |
+ {{ 'Budget element type'|trans }} |
+ {{ 'Amount'|trans }} |
+ {{ 'Validity period'|trans }} |
+ |
@@ -38,17 +39,17 @@
{% if is_granted('CHILL_BUDGET_ELEMENT_SEE', f) %}
-
-
+
{% endif %}
{% if is_granted('CHILL_BUDGET_ELEMENT_UPDATE', f) %}
-
-
+
{% endif %}
{% if is_granted('CHILL_BUDGET_ELEMENT_DELETE', f) %}
-
-
+
{% endif %}
@@ -69,7 +70,7 @@
{% 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') }}
+ {% for result in results %}
+
+ {{ result.label }} |
+
+ {% 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 %}
+ |
+
+ {% endfor %}
{% 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 @@
{{ 'Budget calculator'|trans }}
- {{ table_results(charges, resources) }}
+ {{ table_results(charges, resources, results) }}
{% if is_granted('CHILL_BUDGET_ELEMENT_CREATE', person) %}