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 remote-tracking branch 'origin/master' into issue440_mesparcours_brouillon

Browse Source
This commit is contained in:
Julien Fastré 2022-02-11 15:11:20 +01:00
commit 981c94906d
5 changed files with 29 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -18,6 +18,7 @@ and this project adheres to
* change order for accompanying course work list * change order for accompanying course work list
* [parcours]: Mes parcours brouillon added to user menu (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/440) * [parcours]: Mes parcours brouillon added to user menu (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/440)
* [person]: style fix in parcours listing per person. (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/432) * [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) * 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) * [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) * [homepage_widget]: fix translation on emergency badge (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/440)

18
src/Bundle/ChillMainBundle/Tests/Templating/Entity/AddressRenderTest.php
View File

@ -48,7 +48,7 @@ final class AddressRenderTest extends KernelTestCase
$addr->setBuildingName('Résidence "Les Bleuets"'); $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 public function addressDataProviderBEWithSteps(): Iterator
@ -68,7 +68,7 @@ final class AddressRenderTest extends KernelTestCase
$addr->setSteps('4'); $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 public function addressDataProviderFRWithBuilding(): Iterator
@ -88,7 +88,7 @@ final class AddressRenderTest extends KernelTestCase
$addr->setBuildingName('Résidence "Les Bleuets"'); $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 public function addressDataProviderFRWithSteps(): Iterator
@ -108,7 +108,7 @@ final class AddressRenderTest extends KernelTestCase
$addr->setSteps('4'); $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 public function complexAddressDataProviderBE(): Iterator
@ -132,7 +132,7 @@ final class AddressRenderTest extends KernelTestCase
$addr->setCorridor('3'); $addr->setCorridor('3');
$addr->setSteps('4'); $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 public function complexAddressDataProviderFR(): Iterator
@ -158,7 +158,7 @@ final class AddressRenderTest extends KernelTestCase
$addr->setExtra('A droite de la porte'); $addr->setExtra('A droite de la porte');
$addr->setDistribution('CEDEX'); $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 public function noFullAddressDataProviderBE(): Iterator
@ -175,7 +175,7 @@ final class AddressRenderTest extends KernelTestCase
$addr->setPostcode($postCode) $addr->setPostcode($postCode)
->setIsNoAddress(true); ->setIsNoAddress(true);
yield [$addr, '012345 Locality - Belgium']; yield [$addr, '012345 Locality — Belgium'];
} }
public function simpleAddressDataProviderBE(): Iterator public function simpleAddressDataProviderBE(): Iterator
@ -193,7 +193,7 @@ final class AddressRenderTest extends KernelTestCase
->setStreetNumber('5') ->setStreetNumber('5')
->setPostcode($postCode); ->setPostcode($postCode);
yield [$addr, 'Rue ABC, 5 - 012345 Locality - Belgium']; yield [$addr, 'Rue ABC, 5 — 012345 Locality — Belgium'];
} }
public function simpleAddressDataProviderFR(): Iterator public function simpleAddressDataProviderFR(): Iterator
@ -211,7 +211,7 @@ final class AddressRenderTest extends KernelTestCase
->setStreetNumber('5') ->setStreetNumber('5')
->setPostcode($postCode); ->setPostcode($postCode);
yield [$addr, '5, Rue ABC - 012345 Locality - France']; yield [$addr, '5, Rue ABC — 012345 Locality — France'];
} }
/** /**

2
src/Bundle/ChillPersonBundle/Controller/PersonController.php
View File

@ -225,7 +225,7 @@ final class PersonController extends AbstractController
])->add('createPeriod', SubmitType::class, [ ])->add('createPeriod', SubmitType::class, [
'label' => 'Add the person and create an accompanying period', 'label' => 'Add the person and create an accompanying period',
])->add('createHousehold', SubmitType::class, [ ])->add('createHousehold', SubmitType::class, [
'label' => 'Add the person and create a household' 'label' => 'Add the person and create a household',
]); ]);
$form->handleRequest($request); $form->handleRequest($request);

20
src/Bundle/ChillPersonBundle/Resources/views/Person/household_history.html.twig
View File

@ -32,14 +32,28 @@
</div> </div>
<div class="item-row separator"> <div class="item-row separator">
<div class="wrap-list"> <div class="wrap-list">
{% if p.household is same as p.person.getCurrentHousehold %}
<div class="wl-row">
<div class="wl-col title">
<h3>{{ 'Address'|trans }}</h3>
</div>
<div class="wl-col list">
<p class="item">{{ p.household.getCurrentAddress|chill_entity_render_box }}</p>
</div>
</div>
{% endif %}
<div class="wl-row"> <div class="wl-row">
<div class="wl-col title"> <div class="wl-col title">
<h3>En tant que</h3> <h3>{{ 'household.As member'|trans }}</h3>
</div> </div>
<div class="wl-col list"> <div class="wl-col list">
<p class="item">{{ p.position.label|localize_translatable_string }} <p class="item">
{{ p.position.label|localize_translatable_string }}
{% if p.holder %} {% if p.holder %}
<span class="holder">{{ 'household.holder'|trans }}</span> <span class="fa-stack fa-holder" title="{{ 'houshold.holder'|trans|e('html_attr') }}">
<i class="fa fa-circle fa-stack-1x text-success"></i>
<i class="fa fa-stack-1x">T</i>
</span>
{% endif %} {% endif %}
</p> </p>
</div> </div>

1
src/Bundle/ChillPersonBundle/translations/messages+intl-icu.fr.yaml
View File

@ -98,6 +98,7 @@ household:
from: Depuis from: Depuis
to: Jusqu'au to: Jusqu'au
person history: Ménages person history: Ménages
As member: En tant que
household_composition: household_composition:
Since: >- Since: >-