Merge branch 'issue568_agents_traitants' into 'master'

Display agents traitants

See merge request Chill-Projet/chill-bundles!411

CHANGELOG.md

@@ -12,6 +12,7 @@ and this project adheres to
 
 <!-- write down unreleased development here -->
 * [Datepickers] datepickers fixed when using keyboard to enter date (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/545)
+* [social_action] Display 'agents traitants' in parcours resumé and social action list (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/568)
 
 ## Test releases
 
@@ -31,9 +32,12 @@ and this project adheres to
 * [Activity form] invert 'incoming' and 'receiving' in Activity form
 * [Activity form] keep the same order for 'attendee' field in new and edit form
 * [list with period] use "sameas" test operator to introduce requestor in list
+* [notification email on course designation] allow raw string in email content generation
+* [Accompanying period work] list evaluations associated to a work by startDate, and then by id, from the most recent to older
 
 
 ### 2021-04-13
+
 * [person] household address: add a form for editing the validFrom date (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/541)
 * [person] householdmemberseditor: fix composition type bug in select form (vuejs) (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/543)
 * [docgen] add more persons choices in docgen for course: amongst requestor (if person), resources of course (if person), and PersonResource (if person);

src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_item.html.twig

@@ -25,22 +25,6 @@
     <div class="item-row separator">
         <div class="wrap-list">
 
-            {% if w.createdBy %}
-                <div class="wl-row">
-                    <div class="wl-col title">
-                        <h3>{{ 'Referrers'|trans }}</h3>
-                    </div>
-                    <div class="wl-col list">
-                        <p class="wl-item">
-                            {% for u in w.referrers %}
-                                {{ u|chill_entity_render_box }}
-                                {% if not loop.last %}, {% endif %}
-                            {% endfor %}
-                        </p>
-                    </div>
-                </div>
-            {% endif %}
-
             {%- if w.persons -%}
                 <div class="wl-row">
                     <div class="wl-col title">
@@ -78,6 +62,22 @@
                 </div>
             {% endif %}
 
+            {%- if w.referrers -%}
+                <div class="wl-row">
+                    <div class="wl-col title">
+                        <h3>{{ 'Referrers'|trans }}</h3>
+                    </div>
+                    <div class="wl-col list">
+                        {% for u in w.referrers %}
+                            <span class="wl-item">
+                                {{ u|chill_entity_render_box }}
+                                {% if not loop.last %}, {% endif %}
+                            </span>
+                        {% endfor %}
+                    </div>
+                </div>
+            {% endif %}
+
             {%- if w.socialAction.issue -%}
                 <div class="wl-row">
                     <div class="wl-col title">

src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/list_recent_by_accompanying_period.html.twig

@@ -28,6 +28,15 @@
                         <span class="badge-thirdparty">{{ w.handlingThierParty|chill_entity_render_box }}</span>
                     </li>
                     {% endif %}
+                    {% if w.referrers %}
+                    <li>
+                        <span class="item-key">{{ 'Referrers'|trans ~ ' : ' }}</span>
+                        {% for u in w.referrers %}
+                            <span class="badge-user">{{ u|chill_entity_render_box }}</span>
+                            {% if not loop.last %}, {% endif %}
+                        {% endfor %}
+                    </li>
+                    {% endif %}
                     <li class="associated-persons">
                         <span class="item-key">{{ 'Participants'|trans ~ ' : ' }}</span>
                         {% for p in w.persons %}

src/Bundle/ChillPersonBundle/translations/messages.fr.yml

@@ -214,7 +214,7 @@ No requestor: Pas de demandeur
 No resources: "Pas d'interlocuteurs privilégiés"
 Persons associated: Usagers concernés
 Referrer: Référent
-Referrers: Référents
+Referrers: Agents traitants
 Some peoples does not belong to any household currently. Add them to an household soon: Certaines personnes n'appartiennent à aucun ménage actuellement. Renseignez leur ménage dès que possible.
 Add to household now: Ajouter à un ménage
 Any resource for this accompanying course: Aucun interlocuteur privilégié pour ce parcours