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 'issue603_add_closing_motive_course' into 'master'

Browse Source 
person: add closing motive to closed acc course

See merge request Chill-Projet/chill-bundles!435
This commit is contained in:
Julien Fastré 2022-05-27 20:00:58 +00:00
commit dba4cfbb2d
4 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -11,6 +11,7 @@ and this project adheres to
## Unreleased
<!-- write down unreleased development here -->
* [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)

13
src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig
View File

@ -30,6 +30,19 @@
<div class="accompanyingcourse-resume">
<div id="dashboards" class="row g-3" data-masonry='{"percentPosition": true }'>
{% if 'CLOSED' == accompanyingCourse.step %}
<div class="mbloc col col-sm-6 col-lg-4">
<div class="warnings">
<div class="alert alert-danger">
<h2>{{ 'This course is closed'|trans }}</h2>
<p>
{{ 'Closing motive'|trans }} : {{ accompanyingCourse.closingMotive.name|localize_translatable_string }}
</p>
</div>
</div>
</div>
{% endif %}
{% if 'DRAFT' == accompanyingCourse.step %}
<div class="mbloc col col-sm-6 col-lg-4">
<div class="warnings">

15
src/Bundle/ChillPersonBundle/Resources/views/Person/list_with_period.html.twig
View File

@ -149,6 +149,19 @@
{% endif %}
{% endif %}
{% if acp.step == 'CLOSED' and acp.closingMotive is not null %}
<div class="wl-row">
<div class="wl-col title">
<h3 class="closingMotive">{{ 'Closing motive'|trans }}</h3>
</div>
<div class="wl-col list">
<div>
{{ acp.closingMotive.name|localize_translatable_string }}
</div>
</div>
</div>
{% endif %}
<ul class="record_actions record_actions_column">
<li>
<a href="{{ path('chill_person_accompanying_course_index', { 'accompanying_period_id': acp.id }) }}"
@ -256,7 +269,7 @@
aria-labelledby="heading_{{ person.id }}"
data-bs-parent="#nonCurrent">
{% for acp in acpsClosed %}
{{ _self.accompanying_period(acp, person) }}
{{ _self.accompanying_period(acp, person) }}
{% endfor %}
</div>
</div>

1
src/Bundle/ChillPersonBundle/translations/messages.fr.yml
View File

@ -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'