Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-06-13 22:04:23 +00:00
Code Issues Actions Projects Releases Wiki Activity

improvements templates

Browse Source
This commit is contained in:
Julie Lenaerts 2022-03-02 11:44:10 +01:00
parent 0648154ba1
commit 900adc7105
7 changed files with 74 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/Bundle/ChillBudgetBundle/Resources/views/Budget/_budget.html.twig
View File

@ -40,13 +40,21 @@
</div>
{% else %}
<h2 class="subtitle">{{ 'Actual budget'|trans }}</h3>
{% if actualCharges|length > 0 or actualResources|length > 0 %}
{% include 'ChillBudgetBundle:Budget:_current_budget.html.twig' with {
'actualResources': actualResources,
'actualCharges': actualCharges,
'results': results,
'entity': entity
} %}
{% else %}
<div class="flex-table">
<div class="item-bloc">
<p><span class="chill-no-data-statement">{{ "There isn't any element recorded"|trans }}</span></p>
</div>
</div>
{% endif %}
<h2 class="subtitle">{{ 'Past budget'|trans }}</h2>
@ -80,3 +88,16 @@
</div>
</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> #}
{% endif %}

14
src/Bundle/ChillBudgetBundle/Resources/views/Budget/_current_budget.html.twig
View File

@ -1,6 +1,6 @@
{% from 'ChillBudgetBundle:Budget:_macros.html.twig' import table_elements, table_results %}
<h2 class="subtitle">{{ 'Actual budget'|trans }}</h2>
{# <h2 class="subtitle">{{ 'Actual budget'|trans }}</h2> #}
<div class="flex-table">
<h3 class="family-title">{{ 'Actual resources'|trans }}</h3>
@ -17,8 +17,6 @@
</div>
<div class="flex-table">
<h3 class="family-title">{{ 'Actual charges'|trans }}</h3>
{% if actualCharges|length > 0 %}
<div class="item-bloc">
{{ table_elements(actualCharges, 'charge') }}
@ -29,10 +27,12 @@
</div>
{% endif %}
{% if results|length > 0 %}
<h2>{{ 'Budget calculator'|trans }}</h2>
{# {% if results|length > 0 %} #}
<div class="flex-table">
<h3 class="family-title">{{ 'Budget calculator'|trans }}</h2>
<div class="item-bloc">
{{ table_results(results) }}
{{ table_results(actualCharges, actualResources) }}
</div>
{% endif %}
</div>
{# {% endif %} #}
</div>

4
src/Bundle/ChillBudgetBundle/Resources/views/Charge/edit.html.twig
View File

@ -3,15 +3,15 @@
{% set indexPage = 'chill_budget_elements_index' %}
{% set activeRouteKey = '' %}
{% set person = element.person %}
{% set title = 'Edit charge for %name%'|trans({ '%name%' : person.firstName ~ " " ~ person.lastName } ) %}
{% else %}
{% set template = '@ChillPerson/Household/layout.html.twig' %}
{% set indexPage = 'chill_budget_elements_household_index' %}
{% set activeRouteKey = '' %}
{% set household = element.household %}
{% set title = 'Edit charge for household %household%'|trans({ '%household%' : household.id } ) %}
{% endif %}
{% set title = 'Edit charge'|trans %}
{% extends template %}
{% block title title %}

4
src/Bundle/ChillBudgetBundle/Resources/views/Charge/new.html.twig
View File

@ -3,15 +3,15 @@
{% set indexPage = 'chill_budget_elements_index' %}
{% set activeRouteKey = '' %}
{% set person = element.person %}
{% set title = 'New charge for %name%'|trans({ '%name%' : person.firstName ~ " " ~ person.lastName } ) %}
{% else %}
{% set template = '@ChillPerson/Household/layout.html.twig' %}
{% set indexPage = 'chill_budget_elements_household_index' %}
{% set activeRouteKey = '' %}
{% set household = element.household %}
{% set title = 'New charge for household %household%'|trans({ '%household%' : household.id } ) %}
{% endif %}
{% set title = 'New charge'|trans %}
{% extends template %}
{% block title title %}

12
src/Bundle/ChillBudgetBundle/Resources/views/Household/index.html.twig
View File

@ -56,16 +56,8 @@
<ul class="record_actions">
{% if is_granted('CHILL_BUDGET_ELEMENT_SEE', member) %}
<li>
<a class="btn btn-show" title={{ 'See person'|trans }} href="{{ path('chill_person_view', { 'person_id': member.id } ) }}"></a>
</li>
{% endif %}
{% if is_granted('CHILL_BUDGET_ELEMENT_CREATE', member) %}
<li>
<a class="btn btn-create" title={{ 'Create new resource'|trans }} href="{{ path('chill_budget_resource_new', { 'id': member.id} ) }}">{{ 'Resource'|trans }}</a>
</li>
<li>
<a class="btn btn-create" title={{ 'Create new charge'|trans }} href="{{ path('chill_budget_charge_new', { 'id': member.id} ) }}">{{ 'Charge'|trans }}</a>
<li class="btn-budget">
<a class="btn btn-edit" title={{ 'Edit budget'|trans }} href="{{ path('chill_budget_elements_index', { 'id': member.id } ) }}"></a>
</li>
{% endif %}
</ul>

4
src/Bundle/ChillBudgetBundle/Resources/views/Resource/edit.html.twig
View File

@ -3,7 +3,7 @@
{% set indexPage = 'chill_budget_elements_index' %}
{% set activeRouteKey = '' %}
{% set person = element.person %}
{% set title = 'Edit Resource for %name%'|trans({ '%name%' : person.firstName ~ " " ~ person.lastName } ) %}
{% set title = 'Edit resource for %name%'|trans({ '%name%' : person.firstName ~ " " ~ person.lastName } ) %}
{% else %}
{% set template = '@ChillPerson/Household/layout.html.twig' %}
{% set indexPage = 'chill_budget_elements_household_index' %}
@ -12,6 +12,8 @@
{% set title = 'Edit resource for household %household%'|trans({ '%household%' : household.id } ) %}
{% endif %}
{% set title = 'Edit resource'|trans %}
{% extends template %}
{% block title title %}

2
src/Bundle/ChillBudgetBundle/Resources/views/Resource/new.html.twig
View File

@ -12,6 +12,8 @@
{% set title = 'New Resource for household %household%'|trans({ '%household%' : household.id } ) %}
{% endif %}
{% set title = 'New resource'|trans %}
{% extends template %}
{% block title title %}