diff --git a/src/Bundle/ChillBudgetBundle/Resources/public/page/chillbudget.scss b/src/Bundle/ChillBudgetBundle/Resources/public/page/chillbudget.scss
index 82230d13b..cca1b1a4a 100644
--- a/src/Bundle/ChillBudgetBundle/Resources/public/page/chillbudget.scss
+++ b/src/Bundle/ChillBudgetBundle/Resources/public/page/chillbudget.scss
@@ -1,4 +1,4 @@
-.subtitle {
+h3.subtitle {
margin-top: 1rem;
margin-bottom: 1rem;
padding: 1rem;
@@ -8,22 +8,34 @@
content: "\f061";
}
}
-.family-title {
+
+$col_charge: #e03851d7;
+$col_resource: #6d9e63d8;
+
+h4.family-title {
+ margin-top: 1.5rem;
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 {
th {
color: white;
}
}
+
.budget-table {
th.charge {
- background-color: #e03851d7;
+ background-color: $col_charge;
}
}
.budget-table {
th.resource {
- background-color: #6d9e63d8;
+ background-color: $col_resource;
}
}
.budget-table {
diff --git a/src/Bundle/ChillBudgetBundle/Resources/views/Budget/_budget.html.twig b/src/Bundle/ChillBudgetBundle/Resources/views/Budget/_budget.html.twig
index 8a3fa6de2..e75b83ee8 100644
--- a/src/Bundle/ChillBudgetBundle/Resources/views/Budget/_budget.html.twig
+++ b/src/Bundle/ChillBudgetBundle/Resources/views/Budget/_budget.html.twig
@@ -32,7 +32,7 @@
{% endif %}
{% endfor %}
-
-
{{ 'Actual resources'|trans }}
+
+
{{ 'Actual resources'|trans }}
{% if actualResources|length > 0 %}
{{ table_elements(actualResources, 'resource') }}
{% else %}
{{ 'No resources registered'|trans }}
{% endif %}
-
-
-
{{ 'Actual charges'|trans }}
+
{{ 'Actual charges'|trans }}
{% if actualCharges|length > 0 %}
{{ table_elements(actualCharges, 'charge') }}
{% else %}
diff --git a/src/Bundle/ChillBudgetBundle/Resources/views/Budget/_future_budget.html.twig b/src/Bundle/ChillBudgetBundle/Resources/views/Budget/_future_budget.html.twig
index 1547d8749..62f4e3e96 100644
--- a/src/Bundle/ChillBudgetBundle/Resources/views/Budget/_future_budget.html.twig
+++ b/src/Bundle/ChillBudgetBundle/Resources/views/Budget/_future_budget.html.twig
@@ -20,32 +20,23 @@
aria-labelledby="heading_future_{{ entity.id }}"
data-bs-parent="#future_{{ entity.id }}">
-
-
{{ 'Future resources'|trans }}
+
+
{{ 'Future resources'|trans }}
{% if futureResources|length > 0 %}
-
- {{ table_elements(futureResources, 'resource') }}
-
+ {{ table_elements(futureResources, 'resource') }}
{% else %}
-
- {{ 'No future resources registered'|trans }}
-
+
{{ 'No future resources registered'|trans }}
{% endif %}
-
-
-
{{ 'Future charges'|trans }}
+
+
{{ 'Future charges'|trans }}
{% if futureCharges|length > 0 %}
-
- {{ table_elements(futureCharges, 'charge') }}
-
+ {{ table_elements(futureCharges, 'charge') }}
{% else %}
-
- {{ 'No future charges registered'|trans }}
-
+
{{ 'No future charges registered'|trans }}
{% endif %}
-
\ No newline at end of file
+
diff --git a/src/Bundle/ChillBudgetBundle/Resources/views/Budget/_past_budget.html.twig b/src/Bundle/ChillBudgetBundle/Resources/views/Budget/_past_budget.html.twig
index 14573048e..ad0a12755 100644
--- a/src/Bundle/ChillBudgetBundle/Resources/views/Budget/_past_budget.html.twig
+++ b/src/Bundle/ChillBudgetBundle/Resources/views/Budget/_past_budget.html.twig
@@ -20,34 +20,24 @@
aria-labelledby="heading_past_{{ entity.id }}"
data-bs-parent="#past_{{ entity.id }}">
-
-
{{ 'Past resources'|trans }}
+
+
{{ 'Past resources'|trans }}
{% if pastResources|length > 0 %}
-
- {{ table_elements(pastResources, 'resource') }}
-
+ {{ table_elements(pastResources, 'resource') }}
{% else %}
-
- {{ 'No past resources registered'|trans }}
-
+
{{ 'No past resources registered'|trans }}
{% endif %}
-
-
-
{{ 'Past charges'|trans }}
+
{{ 'Past charges'|trans }}
{% if pastCharges|length > 0 %}
-
- {{ table_elements(pastCharges, 'charge') }}
-
+ {{ table_elements(pastCharges, 'charge') }}
{% else %}
-
- {{ 'No past charges registered'|trans }}
-
+
{{ 'No past charges registered'|trans }}
{% endif %}
-
\ No newline at end of file
+
diff --git a/src/Bundle/ChillBudgetBundle/Resources/views/Household/index.html.twig b/src/Bundle/ChillBudgetBundle/Resources/views/Household/index.html.twig
index 310220df1..1df92b297 100644
--- a/src/Bundle/ChillBudgetBundle/Resources/views/Household/index.html.twig
+++ b/src/Bundle/ChillBudgetBundle/Resources/views/Household/index.html.twig
@@ -24,16 +24,14 @@
} %}
{#
-
-
{{ 'Budget calculator'|trans }}
-
- {{ table_results(wholeCharges, wholeResources) }}
-
+
+
{{ 'Budget calculator'|trans }}
+ {{ table_results(wholeCharges, wholeResources) }}
#}
{% if household.getCurrentMembers|length > 0 %}
-
{{ 'Budget household members'|trans }}
+
{{ 'Budget household members'|trans }}
{% for hm in household.getCurrentMembers %}
{% set member = hm.person %}
@@ -57,6 +55,8 @@
aria-labelledby="heading_{{ member.id }}"
data-bs-parent="#nonCurrent">
+
{{ 'Budget for %name%'|trans({'%name%': member.firstName ~ " " ~ member.lastName }) }}
+
{% include 'ChillBudgetBundle:Budget:_budget.html.twig' with {
'resources': member.getBudgetResources,
'charges': member.getBudgetCharges,
diff --git a/src/Bundle/ChillBudgetBundle/Resources/views/Person/index.html.twig b/src/Bundle/ChillBudgetBundle/Resources/views/Person/index.html.twig
index c365b9b84..18d04b889 100644
--- a/src/Bundle/ChillBudgetBundle/Resources/views/Person/index.html.twig
+++ b/src/Bundle/ChillBudgetBundle/Resources/views/Person/index.html.twig
@@ -24,7 +24,7 @@
} %}
-
{{ 'Budget calculator'|trans }}
+ {{ 'Budget calculator'|trans }}
{{ table_results(charges, resources) }}
diff --git a/src/Bundle/ChillBudgetBundle/translations/messages.fr.yml b/src/Bundle/ChillBudgetBundle/translations/messages.fr.yml
index 5d71f4228..73add43ed 100644
--- a/src/Bundle/ChillBudgetBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillBudgetBundle/translations/messages.fr.yml
@@ -9,17 +9,17 @@ See complete budget: Voir budget complet
Hide budget: Masquer
Hide budget of %name%: Masquer budget de %name%
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 for %name%: Ressources actuelles de %name%
Actual charges for %name%: Charges actuelles de %name%
Actual charges: Charges actuelles
-Past budget: Éléments du budget passé
+Past budget: Éléments passés
Show past budget: Montrer budget passé
Show future budget: Montrer budget future
Past resources: Ressources passées
Past charges: Charges passées
-Future budget: Futurs éléments du budget
+Future budget: Éléments futurs
Future resources: Ressources futures
Future charges: Charges futures
Budget element type: Nature