Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-06-07 18:44:08 +00:00
Code Issues Actions Projects Releases Wiki Activity

Merge branch 'AMLI_fix_budget_calculator' into 'master'

Browse Source 
AMLIi fix budget calculator

See merge request Chill-Projet/chill-bundles!575
This commit is contained in:
LenaertsJ 2023-07-12 08:20:03 +00:00
commit 5a36a8660d
3 changed files with 30 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.changes/unreleased/Fixed-20230712-090514.yaml Normal file
View File

@ -0,0 +1,5 @@
kind: Fixed
body: reimplement the visualization of all calculator results (specific to AMLI)
time: 2023-07-12T09:05:14.416268226+02:00
custom:
Issue: ""

33
src/Bundle/ChillBudgetBundle/Resources/views/Budget/_macros.html.twig
View File

@ -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 %}

2
src/Bundle/ChillBudgetBundle/Resources/views/Person/index.html.twig
View File

@ -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) %}