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 'improve-budget-template' into 'master'

Browse Source 
improve Budget template

See merge request Chill-Projet/chill-bundles!514
This commit is contained in:
Julien Fastré 2023-04-25 10:37:42 +00:00
commit 49094ff54a
10 changed files with 81 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/Bundle/ChillBudgetBundle/Resources/public/page/chillbudget.scss
View File

@ -1,39 +1,42 @@
.subtitle { h3.subtitle {
margin-top: 1rem; margin-top: 1rem;
margin-bottom: 1rem; margin-bottom: 1rem;
padding: 1rem; padding: 1rem;
&::before {
font: normal normal normal 20px/1 ForkAwesome;
margin-right: 0.5em;
content: "\f061";
}
} }
.family-title {
$col_charge: #e03851d7;
$col_resource: #6d9e63d8;
h4.family-title {
margin-top: 1.5rem;
margin-bottom: 1rem !important; margin-bottom: 1rem !important;
padding-left: 0.7em;
i {
margin-right: 0.4em;
}
&.charge i { color: $col_charge; }
&.resource i { color: $col_resource; }
} }
.budget-table th { .budget-table th {
th { th {
color: white; color: white;
} }
} }
.budget-table {
th.charge { table.budget-table {
background-color: #e03851d7;
}
}
.budget-table {
th.resource {
background-color: #6d9e63d8;
}
}
.budget-table {
th, td { th, td {
padding: 10px; padding: 10px;
text-align: right; text-align: right;
} }
td.column-wide { th.charge { background-color: $col_charge; }
width: 20%; th.resource { background-color: $col_resource; }
} td.column-fixed {
td.column-small { width: 9.5em;
width: 15%;
&.right {
align-items: right;
}
} }
} }
@ -58,4 +61,4 @@
button[aria-expanded="true"] > span.folded, button[aria-expanded="true"] > span.folded,
button[aria-expanded="false"] > span.unfolded { display: none; } button[aria-expanded="false"] > span.unfolded { display: none; }
button[aria-expanded="false"] > span.folded, button[aria-expanded="false"] > span.folded,
button[aria-expanded="true"] > span.unfolded { display: inline; } button[aria-expanded="true"] > span.unfolded { display: inline; }

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

@ -32,28 +32,21 @@
{% endif %} {% endif %}
{% endfor %} {% endfor %}
<h3 class="subtitle">{{ 'Actual budget'|trans }}</h3> <h3 class="subtitle">{{ 'Actual budget'|trans }}</h3>
{% if actualCharges|length > 0 or actualResources|length > 0 %} {% if actualCharges|length > 0 or actualResources|length > 0 %}
{% include 'ChillBudgetBundle:Budget:_current_budget.html.twig' with { {% include '@ChillBudget/Budget/_current_budget.html.twig' with {
'actualResources': actualResources, 'actualResources': actualResources,
'actualCharges': actualCharges, 'actualCharges': actualCharges,
'results': results, 'results': results,
'entity': entity 'entity': entity
} %} } %}
{% else %} {% else %}
<div class="flex-table"> <p><span class="chill-no-data-statement">{{ "There isn't any element recorded"|trans }}</span></p>
<div class="item-bloc">
<p><span class="chill-no-data-statement">{{ "There isn't any element recorded"|trans }}</span></p>
</div>
</div>
{% endif %} {% endif %}
{% if pastCharges|length > 0 or pastResources|length > 0 %} {% if pastCharges|length > 0 or pastResources|length > 0 %}
<h2 class="subtitle">{{ 'Past budget'|trans }}</h2> <h3 class="subtitle">{{ 'Past budget'|trans }}</h3>
{% include '@ChillBudget/Budget/_past_budget.html.twig' with {
{% include 'ChillBudgetBundle:Budget:_past_budget.html.twig' with {
'pastCharges': pastCharges, 'pastCharges': pastCharges,
'pastResources': pastResources, 'pastResources': pastResources,
'entity': entity 'entity': entity
@ -61,9 +54,8 @@
{% endif %} {% endif %}
{% if futureCharges|length > 0 or futureResources|length > 0 %} {% if futureCharges|length > 0 or futureResources|length > 0 %}
<h2 class="subtitle">{{ 'Future budget'|trans }}</h2> <h3 class="subtitle">{{ 'Future budget'|trans }}</h3>
{% include '@ChillBudget/Budget/_future_budget.html.twig' with {
{% include 'ChillBudgetBundle:Budget:_future_budget.html.twig' with {
'futureResources': futureResources, 'futureResources': futureResources,
'futureCharges': futureCharges, 'futureCharges': futureCharges,
'entity': entity 'entity': entity

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

@ -1,30 +1,17 @@
{% from 'ChillBudgetBundle:Budget:_macros.html.twig' import table_elements, table_results %} {% from '@ChillBudget/Budget/_macros.html.twig' import table_elements, table_results %}
{# <h2 class="subtitle">{{ 'Actual budget'|trans }}</h2> #}
<div class="flex-table">
<h4 class="family-title">{{ 'Actual resources'|trans }}</h4>
<div class="my-4">
<h4 class="family-title resource"><i class="fa fa-fw fa-plus-square"></i>{{ 'Actual resources'|trans }}</h4>
{% if actualResources|length > 0 %} {% if actualResources|length > 0 %}
<div class="item-bloc">
{{ table_elements(actualResources, 'resource') }} {{ table_elements(actualResources, 'resource') }}
</div>
{% else %} {% else %}
<div class="item-bloc">
<span class="chill-no-data-statement">{{ 'No resources registered'|trans }}</span> <span class="chill-no-data-statement">{{ 'No resources registered'|trans }}</span>
</div>
{% endif %} {% endif %}
</div>
<div class="flex-table"> <h4 class="family-title charge"><i class="fa fa-fw fa-minus-square"></i>{{ 'Actual charges'|trans }}</h4>
<h4 class="family-title">{{ 'Actual charges'|trans }}</h4>
{% if actualCharges|length > 0 %} {% if actualCharges|length > 0 %}
<div class="item-bloc">
{{ table_elements(actualCharges, 'charge') }} {{ table_elements(actualCharges, 'charge') }}
</div>
{% else %} {% else %}
<div class="item-bloc">
<span class="chill-no-data-statement">{{ 'No charges registered'|trans }}</span> <span class="chill-no-data-statement">{{ 'No charges registered'|trans }}</span>
</div>
{% endif %} {% endif %}
</div> </div>

27
src/Bundle/ChillBudgetBundle/Resources/views/Budget/_future_budget.html.twig
View File

@ -20,32 +20,23 @@
aria-labelledby="heading_future_{{ entity.id }}" aria-labelledby="heading_future_{{ entity.id }}"
data-bs-parent="#future_{{ entity.id }}"> data-bs-parent="#future_{{ entity.id }}">
<div class="flex-table"> <div class="my-4">
<h3 class="family-title">{{ 'Future resources'|trans }}</h3> <h4 class="family-title resource"><i class="fa fa-fw fa-plus-square"></i>{{ 'Future resources'|trans }}</h4>
{% if futureResources|length > 0 %} {% if futureResources|length > 0 %}
<div class="item-bloc"> {{ table_elements(futureResources, 'resource') }}
{{ table_elements(futureResources, 'resource') }}
</div>
{% else %} {% else %}
<div class="item-bloc"> <span class="chill-no-data-statement">{{ 'No future resources registered'|trans }}</span>
<span class="chill-no-data-statement">{{ 'No future resources registered'|trans }}</span>
</div>
{% endif %} {% endif %}
</div>
<div class="flex-table"> <h4 class="family-title charge"><i class="fa fa-fw fa-minus-square"></i>{{ 'Future charges'|trans }}</h4>
<h3 class="family-title">{{ 'Future charges'|trans }}</h3>
{% if futureCharges|length > 0 %} {% if futureCharges|length > 0 %}
<div class="item-bloc"> {{ table_elements(futureCharges, 'charge') }}
{{ table_elements(futureCharges, 'charge') }}
</div>
{% else %} {% else %}
<div class="item-bloc"> <span class="chill-no-data-statement">{{ 'No future charges registered'|trans }}</span>
<span class="chill-no-data-statement">{{ 'No future charges registered'|trans }}</span>
</div>
{% endif %} {% endif %}
</div> </div>
</div> </div>
</div> </div>
</div> </div>

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

@ -1,5 +1,5 @@
{% macro table_elements(elements, family) %} {% macro table_elements(elements, family) %}
<table class="budget-table"> <table class="table table-bordered border-dark budget-table">
<thead> <thead>
<tr> <tr>
<th class="{{ family }} el-type">{{ 'Budget element type'|trans }}</th> <th class="{{ family }} el-type">{{ 'Budget element type'|trans }}</th>
@ -13,25 +13,22 @@
{% for f in elements %} {% for f in elements %}
{% set total = total + f.amount %} {% set total = total + f.amount %}
<tr> <tr>
<td class="column-wide el-type"> <td class="el-type">
<span class="badge-title"> {% if f.isResource %}
<span class="title_label title_label_{{ family }}"></span> {{ f.resource.name|localize_translatable_string }}
{% if f.isResource %} {% else %}
<span class="title_action">{{ f.resource.name|localize_translatable_string }}<span> {{ f.charge.name|localize_translatable_string }}
{% else %} {% endif %}
<span class="title_action">{{ f.charge.name|localize_translatable_string }}<span>
{% endif %}
</span>
</td> </td>
<td class="column-small">{{ f.amount|format_currency('EUR') }}</td> <td>{{ f.amount|format_currency('EUR') }}</td>
<td class="column-wide"> <td>
{% if f.endDate is not null %} {% if f.endDate is not null %}
{{ f.startDate|format_date('short') ~ ' - ' ~ f.endDate|format_date('short') }} {{ f.startDate|format_date('short') ~ ' - ' ~ f.endDate|format_date('short') }}
{% else %} {% else %}
{{ f.startDate|format_date('short') ~ ' - ...' }} {{ 'depuis le ' ~ f.startDate|format_date('short') }}
{% endif %} {% endif %}
</td> </td>
<td class="column-small"> <td class="column-fixed">
<ul class="record_actions"> <ul class="record_actions">
{% if is_granted('CHILL_BUDGET_ELEMENT_SEE', f) %} {% if is_granted('CHILL_BUDGET_ELEMENT_SEE', f) %}
<li> <li>
@ -80,10 +77,9 @@
{% set result = (totalResources - totalCharges) %} {% set result = (totalResources - totalCharges) %}
<table> <table class="table table-bordered border-dark">
<thead> <thead>
<tr> <tr>
<th>&nbsp;</th>
<th>&nbsp;</th> <th>&nbsp;</th>
<th>{{ 'Budget calculator result'|trans }}</th> <th>{{ 'Budget calculator result'|trans }}</th>
</tr> </tr>
@ -91,7 +87,6 @@
<tbody> <tbody>
<tr> <tr>
<td>{{ 'The balance'|trans }}</td> <td>{{ 'The balance'|trans }}</td>
<td>&nbsp;</td>
<td> <td>
{{ result|format_currency('EUR') }} {{ result|format_currency('EUR') }}
</td> </td>

26
src/Bundle/ChillBudgetBundle/Resources/views/Budget/_past_budget.html.twig
View File

@ -20,34 +20,24 @@
aria-labelledby="heading_past_{{ entity.id }}" aria-labelledby="heading_past_{{ entity.id }}"
data-bs-parent="#past_{{ entity.id }}"> data-bs-parent="#past_{{ entity.id }}">
<div class="flex-table"> <div class="my-4">
<h3 class="family-title">{{ 'Past resources'|trans }}</h3> <h4 class="family-title resource"><i class="fa fa-fw fa-plus-square"></i>{{ 'Past resources'|trans }}</h4>
{% if pastResources|length > 0 %} {% if pastResources|length > 0 %}
<div class="item-bloc"> {{ table_elements(pastResources, 'resource') }}
{{ table_elements(pastResources, 'resource') }}
</div>
{% else %} {% else %}
<div class="item-bloc"> <span class="chill-no-data-statement">{{ 'No past resources registered'|trans }}</span>
<span class="chill-no-data-statement">{{ 'No past resources registered'|trans }}</span>
</div>
{% endif %} {% endif %}
</div>
<div class="flex-table"> <h4 class="family-title charge"><i class="fa fa-fw fa-minus-square"></i>{{ 'Past charges'|trans }}</h4>
<h3 class="family-title">{{ 'Past charges'|trans }}</h3>
{% if pastCharges|length > 0 %} {% if pastCharges|length > 0 %}
<div class="item-bloc"> {{ table_elements(pastCharges, 'charge') }}
{{ table_elements(pastCharges, 'charge') }}
</div>
{% else %} {% else %}
<div class="item-bloc"> <span class="chill-no-data-statement">{{ 'No past charges registered'|trans }}</span>
<span class="chill-no-data-statement">{{ 'No past charges registered'|trans }}</span>
</div>
{% endif %} {% endif %}
</div> </div>
</div> </div>
</div> </div>
</div> </div>

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

@ -24,16 +24,14 @@
} %} } %}
{# {#
<div class="flex-table"> <div class="my-4">
<h3 class="family-title">{{ 'Budget calculator'|trans }}</h3> <h4 class="family-title">{{ 'Budget calculator'|trans }}</h4>
<div class="item-bloc"> {{ table_results(wholeCharges, wholeResources) }}
{{ table_results(wholeCharges, wholeResources) }}
</div>
</div> </div>
#} #}
{% if household.getCurrentMembers|length > 0 %} {% if household.getCurrentMembers|length > 0 %}
<h2 class="subtitle">{{ 'Current budget household members'|trans }}</h2> <h1 class="my-5">{{ 'Budget household members'|trans }}</h1>
{% for hm in household.getCurrentMembers %} {% for hm in household.getCurrentMembers %}
{% set member = hm.person %} {% set member = hm.person %}
@ -57,6 +55,8 @@
aria-labelledby="heading_{{ member.id }}" aria-labelledby="heading_{{ member.id }}"
data-bs-parent="#nonCurrent"> data-bs-parent="#nonCurrent">
<h2 class="mt-4">{{ 'Budget for %name%'|trans({'%name%': member.firstName ~ " " ~ member.lastName }) }}</h2>
{% include 'ChillBudgetBundle:Budget:_budget.html.twig' with { {% include 'ChillBudgetBundle:Budget:_budget.html.twig' with {
'resources': member.getBudgetResources, 'resources': member.getBudgetResources,
'charges': member.getBudgetCharges, 'charges': member.getBudgetCharges,

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

@ -17,17 +17,15 @@
{% block content %} {% block content %}
<h1>{{ title }}</h1> <h1>{{ title }}</h1>
{% include 'ChillBudgetBundle:Budget:_budget.html.twig' with { {% include '@ChillBudget/Budget/_budget.html.twig' with {
'resources': resources, 'resources': resources,
'charges': charges, 'charges': charges,
'person': person 'person': person
} %} } %}
<div class="flex-table"> <div class="mt-5">
<h3 class="family-title">{{ 'Budget calculator'|trans }}</h2> <h3 class="subtitle">{{ 'Budget calculator'|trans }}</h3>
<div class="item-bloc"> {{ table_results(charges, resources) }}
{{ table_results(charges, resources) }}
</div>
</div> </div>
{% if is_granted('CHILL_BUDGET_ELEMENT_CREATE', person) %} {% if is_granted('CHILL_BUDGET_ELEMENT_CREATE', person) %}

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

@ -9,7 +9,7 @@
{% set indexPage = 'chill_budget_elements_household_index' %} {% set indexPage = 'chill_budget_elements_household_index' %}
{% set activeRouteKey = '' %} {% set activeRouteKey = '' %}
{% set household = element.household %} {% set household = element.household %}
{% set confirm_question = 'Are you sure you want to remove the ressource "%type%" associated to household "%household%" ?'|trans({ '%household%' : household.id, '%type%': element.resource.getName | localize_translatable_string} ) %} {% set confirm_question = 'Are you sure you want to remove the resource "%type%" associated to household "%household%" ?'|trans({ '%household%' : household.id, '%type%': element.resource.getName | localize_translatable_string} ) %}
{% endif %} {% endif %}
{% extends template %} {% extends template %}

10
src/Bundle/ChillBudgetBundle/translations/messages.fr.yml
View File

@ -3,23 +3,23 @@ Resource: Ressource
Charge: Charge Charge: Charge
Budget for %name%: Budget de %name% Budget for %name%: Budget de %name%
Budget for household %household%: Budget du ménage Budget for household %household%: Budget du ménage
Current budget household members: Budget actuel des membres du ménage Budget household members: Budget des membres du ménage
Show budget of %name%: Montrer budget de %name% Show budget of %name%: Montrer budget de %name%
See complete budget: Voir budget complet See complete budget: Voir budget complet
Hide budget: Masquer Hide budget: Masquer
Hide budget of %name%: Masquer budget de %name% Hide budget of %name%: Masquer budget de %name%
Resource element type: Nature de la ressource Resource element type: Nature de la ressource
Actual budget: Éléments actuels du budget Actual budget: Éléments actuels
Actual resources: Ressources actuelles Actual resources: Ressources actuelles
Actual resources for %name%: Ressources actuelles de %name% Actual resources for %name%: Ressources actuelles de %name%
Actual charges for %name%: Charges actuelles de %name% Actual charges for %name%: Charges actuelles de %name%
Actual charges: Charges actuelles Actual charges: Charges actuelles
Past budget: Éléments du budget passé Past budget: Éléments passés
Show past budget: Montrer budget passé Show past budget: Montrer budget passé
Show future budget: Montrer budget future Show future budget: Montrer budget future
Past resources: Ressources passées Past resources: Ressources passées
Past charges: Charges passées Past charges: Charges passées
Future budget: Futurs éléments du budget Future budget: Éléments futurs
Future resources: Ressources futures Future resources: Ressources futures
Future charges: Charges futures Future charges: Charges futures
Budget element type: Nature Budget element type: Nature
@ -49,6 +49,8 @@ Remove resource: Supprimer la ressource
Remove charge: Supprimer la charge Remove charge: Supprimer la charge
Are you sure you want to remove the ressource "%type%" associated to "%name%" ?: Êtes-vous sûr·e de vouloir supprimer la ressource de nature "%type%" associée à %name% ? Are you sure you want to remove the ressource "%type%" associated to "%name%" ?: Êtes-vous sûr·e de vouloir supprimer la ressource de nature "%type%" associée à %name% ?
Are you sure you want to remove the charge "%type%" associated to "%name%" ?: Êtes-vous sûr·e de vouloir supprimer la charge de nature "%type%" associée à %name% ? Are you sure you want to remove the charge "%type%" associated to "%name%" ?: Êtes-vous sûr·e de vouloir supprimer la charge de nature "%type%" associée à %name% ?
Are you sure you want to remove the charge "%type%" associated to household "%household%" ?: Êtes-vous sur·e de vouloir supprimer la charge "%type%" associée au ménage ?
Are you sure you want to remove the resource "%type%" associated to household "%household%" ?: Êtes-vous sur·e de vouloir supprimer la ressource "%type%" associée au ménage ?
Resource deleted: Ressource supprimée Resource deleted: Ressource supprimée
Charge deleted: Charge supprimée Charge deleted: Charge supprimée
Charge created: Charge créée Charge created: Charge créée