diff --git a/CHANGELOG.md b/CHANGELOG.md index 66b895e9e..f98ef5881 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,12 +18,13 @@ and this project adheres to * change order for accompanying course work list * [Documents]: List view adapted to display more information (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/414) * [person]: style fix in parcours listing per person. (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/432) +* [household]: display address of current household (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/415) * ajoute un ordre dans les localisation (api) * [pick entity]: fix translations in modal (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/419) * [homepage_widget]: fix translation on emergency badge (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/440) * [person]: create person and household added to button dropdown (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/454) * display full address in address.text in normalization. Adapt AddressRenderBox - +* [address]: Correction residential address 'depuis le' (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/459) ## Test releases diff --git a/src/Bundle/ChillMainBundle/Tests/Templating/Entity/AddressRenderTest.php b/src/Bundle/ChillMainBundle/Tests/Templating/Entity/AddressRenderTest.php index fcd7b374a..3f828bfc5 100644 --- a/src/Bundle/ChillMainBundle/Tests/Templating/Entity/AddressRenderTest.php +++ b/src/Bundle/ChillMainBundle/Tests/Templating/Entity/AddressRenderTest.php @@ -48,7 +48,7 @@ final class AddressRenderTest extends KernelTestCase $addr->setBuildingName('Résidence "Les Bleuets"'); - yield [$addr, 'Résidence "Les Bleuets" - Rue ABC, 5 - 012345 Locality - Belgium']; + yield [$addr, 'Résidence "Les Bleuets" — Rue ABC, 5 — 012345 Locality — Belgium']; } public function addressDataProviderBEWithSteps(): Iterator @@ -68,7 +68,7 @@ final class AddressRenderTest extends KernelTestCase $addr->setSteps('4'); - yield [$addr, 'esc 4 - Rue ABC, 5 - 012345 Locality - Belgium']; + yield [$addr, 'esc 4 — Rue ABC, 5 — 012345 Locality — Belgium']; } public function addressDataProviderFRWithBuilding(): Iterator @@ -88,7 +88,7 @@ final class AddressRenderTest extends KernelTestCase $addr->setBuildingName('Résidence "Les Bleuets"'); - yield [$addr, 'Résidence "Les Bleuets" - 5, Rue ABC - 012345 Locality - France']; + yield [$addr, 'Résidence "Les Bleuets" — 5, Rue ABC — 012345 Locality — France']; } public function addressDataProviderFRWithSteps(): Iterator @@ -108,7 +108,7 @@ final class AddressRenderTest extends KernelTestCase $addr->setSteps('4'); - yield [$addr, 'esc 4 - 5, Rue ABC - 012345 Locality - France']; + yield [$addr, 'esc 4 — 5, Rue ABC — 012345 Locality — France']; } public function complexAddressDataProviderBE(): Iterator @@ -132,7 +132,7 @@ final class AddressRenderTest extends KernelTestCase $addr->setCorridor('3'); $addr->setSteps('4'); - yield [$addr, 'Résidence "Les Bleuets" - appart 1 - ét 2 - coul 3 - esc 4 - Rue ABC, 5 - 012345 Locality - Belgium']; + yield [$addr, 'Résidence "Les Bleuets" - appart 1 - ét 2 - coul 3 - esc 4 — Rue ABC, 5 — 012345 Locality — Belgium']; } public function complexAddressDataProviderFR(): Iterator @@ -158,7 +158,7 @@ final class AddressRenderTest extends KernelTestCase $addr->setExtra('A droite de la porte'); $addr->setDistribution('CEDEX'); - yield [$addr, 'appart 1 - ét 2 - coul 3 - esc 4 - Résidence "Les Bleuets" - 5, Rue ABC - A droite de la porte - 012345 Locality CEDEX - France']; + yield [$addr, 'appart 1 - ét 2 - coul 3 - esc 4 — Résidence "Les Bleuets" — 5, Rue ABC — A droite de la porte — 012345 Locality CEDEX — France']; } public function noFullAddressDataProviderBE(): Iterator @@ -175,7 +175,7 @@ final class AddressRenderTest extends KernelTestCase $addr->setPostcode($postCode) ->setIsNoAddress(true); - yield [$addr, '012345 Locality - Belgium']; + yield [$addr, '012345 Locality — Belgium']; } public function simpleAddressDataProviderBE(): Iterator @@ -193,7 +193,7 @@ final class AddressRenderTest extends KernelTestCase ->setStreetNumber('5') ->setPostcode($postCode); - yield [$addr, 'Rue ABC, 5 - 012345 Locality - Belgium']; + yield [$addr, 'Rue ABC, 5 — 012345 Locality — Belgium']; } public function simpleAddressDataProviderFR(): Iterator @@ -211,7 +211,7 @@ final class AddressRenderTest extends KernelTestCase ->setStreetNumber('5') ->setPostcode($postCode); - yield [$addr, '5, Rue ABC - 012345 Locality - France']; + yield [$addr, '5, Rue ABC — 012345 Locality — France']; } /** diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Person/household_history.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Person/household_history.html.twig index d56fa30b1..ed3b3020b 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/Person/household_history.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/household_history.html.twig @@ -32,14 +32,28 @@
+ {% if p.household is same as p.person.getCurrentHousehold %} +
+
+

{{ 'Address'|trans }}

+
+
+

{{ p.household.getCurrentAddress|chill_entity_render_box }}

+
+
+ {% endif %}
-

En tant que

+

{{ 'household.As member'|trans }}

-

{{ p.position.label|localize_translatable_string }} +

+ {{ p.position.label|localize_translatable_string }} {% if p.holder %} - {{ 'household.holder'|trans }} + + + T + {% endif %}

diff --git a/src/Bundle/ChillPersonBundle/Resources/views/ResidentialAddress/list.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/ResidentialAddress/list.html.twig index 0eebf7e5d..69e12f36d 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/ResidentialAddress/list.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/ResidentialAddress/list.html.twig @@ -29,10 +29,10 @@
    - {% if a.endDate is not null %}
  • {{'Since'|trans}} : {{ a.startDate|format_date('long') }}
    • + {% if a.endDate is not null %} +
  • {{'Until'|trans}} : {{ a.endDate|format_date('long') }}
    • {% endif %} -
  • {{'Until'|trans}} : {{ a.endDate|format_date('long') }}
diff --git a/src/Bundle/ChillPersonBundle/translations/messages+intl-icu.fr.yaml b/src/Bundle/ChillPersonBundle/translations/messages+intl-icu.fr.yaml index ecafb367e..aded38b4a 100644 --- a/src/Bundle/ChillPersonBundle/translations/messages+intl-icu.fr.yaml +++ b/src/Bundle/ChillPersonBundle/translations/messages+intl-icu.fr.yaml @@ -98,6 +98,7 @@ household: from: Depuis to: Jusqu'au person history: Ménages + As member: En tant que household_composition: Since: >-