diff --git a/CHANGELOG.md b/CHANGELOG.md index c5c459cda..fa4fcd96d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ and this project adheres to ## Unreleased +* [person] add closing motive to closed acc course (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/603) * [person] household filiation: fetch person info when unfolding person (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/586) * [admin] repair edit of social action in the admin (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/601) * [admin]: add select2 to Goal form type entity fields (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/702) diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig index 7a4f18b1d..8e0a46efc 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig @@ -30,6 +30,19 @@
+ {% if 'CLOSED' == accompanyingCourse.step %} +
+
+
+

{{ 'This course is closed'|trans }}

+

+ {{ 'Closing motive'|trans }} : {{ accompanyingCourse.closingMotive.name|localize_translatable_string }} +

+
+
+
+ {% endif %} + {% if 'DRAFT' == accompanyingCourse.step %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Person/list_with_period.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Person/list_with_period.html.twig index 9c7486fc2..c407b6c57 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/Person/list_with_period.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/list_with_period.html.twig @@ -149,6 +149,19 @@ {% endif %} {% endif %} + {% if acp.step == 'CLOSED' and acp.closingMotive is not null %} +
+
+

{{ 'Closing motive'|trans }}

+
+
+
+ {{ acp.closingMotive.name|localize_translatable_string }} +
+
+
+ {% endif %} +
diff --git a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml index 37cc950a3..6d59976c9 100644 --- a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml +++ b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml @@ -171,6 +171,7 @@ Update accompanying period: Mettre à jour une période d'accompagnement 'Period not opened': "La période d'accompagnement n'a pas été ouverte" "Period not opened : form is invalid": "La période n'a pas été ouverte: le formulaire est invalide." 'Closing motive': 'Motif de clôture' +This course is closed: Ce parcours est clôturé Close accompanying course: Clôturer le parcours Re-open accompanying course: Ré-ouvrir le parcours 'Person details': 'Détails de la personne'