From b24de76d77f56f8e5b5c04d5056692b6641bb979 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 20 Apr 2022 15:16:26 +0200
Subject: [PATCH] display agents traitants

---
 CHANGELOG.md                                  |  2 +-
 .../AccompanyingCourseWork/_item.html.twig    | 32 +++++++++----------
 ...st_recent_by_accompanying_period.html.twig |  9 ++++++
 .../translations/messages.fr.yml              |  2 +-
 4 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 459f95005..44915aa63 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,7 +16,7 @@ and this project adheres to
 * [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
-
+* [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
 
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_item.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_item.html.twig
index 8ff8a0617..3d4f46425 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_item.html.twig
+++ b/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">
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/list_recent_by_accompanying_period.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/list_recent_by_accompanying_period.html.twig
index 7f2fb0177..4621cb97a 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/list_recent_by_accompanying_period.html.twig
+++ b/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 %}
diff --git a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
index c6baf9513..535985d23 100644
--- a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
+++ b/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