From 4f1c373704675660ac07a3ef5eb47d6f1f7335a1 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Mon, 22 Nov 2021 17:51:45 +0100
Subject: [PATCH 1/2] resume page: add persons and others infos

---
 .../views/Activity/list_recent.html.twig      |  6 +++-
 .../views/AccompanyingCourse/index.html.twig  | 36 +++++++++++++++++--
 ...st_recent_by_accompanying_period.html.twig |  7 +++-
 .../translations/messages.fr.yml              |  1 +
 4 files changed, 45 insertions(+), 5 deletions(-)

diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/list_recent.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/list_recent.html.twig
index 567c0b132..9b8f00e96 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/list_recent.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/list_recent.html.twig
@@ -2,7 +2,11 @@
     {% for activity in activities | slice(0,5) %}
         {% set t = activity.type %}
 
-        <a href="{{ path('chill_activity_activity_show', { 'id': activity.id, 'person_id': person_id, 'accompanying_period_id': accompanying_course_id }) }}"></a>
+        {#
+        <a href="{{ path('chill_activity_activity_show', { 'id': activity.id, 'person_id': person_id, 'accompanying_period_id': accompanying_course_id }) }}"
+           class="btn btn-sm btn-show" title="{{ 'voir' }}">
+        </a>
+        #}
 
         {% include '@ChillActivity/Activity/activity-badge-title.html.twig' %}
 
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig
index a36b50afe..462e805cb 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig
@@ -52,13 +52,43 @@
         {% if accompanyingCourse.locationStatus != 'none' %}
             {{ accompanyingCourse.location|chill_entity_render_box }}
         {% endif %}
+
+        <!--
+        <div class="mt-5">
+            <h4>Origine de la demande</h4>
+            <p>bim bam boum</p>
+        </div>
+        <div class="mt-3">
+            <h4>Services</h4>
+            <ul>
+                <li>one</li>
+                <li>two</li>
+            </ul>
+        </div>
+        -->
+
     </div>
 
-    {% if accompanyingCourse.resources is not empty
-        and (accompanyingCourse.requestorThirdParty is not null
+    {% if accompanyingCourse.participations is not empty
+        or accompanyingCourse.resources is not empty
+        or (accompanyingCourse.requestorThirdParty is not null
         or accompanyingCourse.requestorPerson is not null)
     %}
-    <div class="col-md-6 resources mb-5">
+    <div class="col-md-6 persons mb-5">
+        <div class="mb-3">
+            {% if accompanyingCourse.participations is not empty %}
+                <h4 class="item-key">{{ 'Persons associated'|trans }}</h4>
+                {% for r in accompanyingCourse.participations %}
+                    {% if r.person is not null %}
+                        {{ _self.insert_onthefly('person', r.person) }}
+                    {% elseif r.thirdParty is not null %}
+                        {{ _self.insert_onthefly('thirdparty', r.thirdParty) }}
+                    {% endif %}
+                {% endfor %}
+            {% else %}
+                <span class="chill-no-data-statement visually-hidden">{{ 'No participations'|trans }}</span>
+            {% endif %}
+        </div>
         <div class="mb-3">
             {% if accompanyingCourse.requestorPerson is not null %}
                 <h4 class="item-key">{{ 'Requestor'|trans }}</h4>
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 ec782615a..449564137 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
@@ -1,6 +1,11 @@
   <div class="accompanying_course_work-list">
     {% for w in works | slice(0,5) %}
-        <a href="{{ chill_path_add_return_path('chill_person_accompanying_period_work_edit', { 'id': w.id }) }}"></a>
+
+        {#
+        <a href="{{ chill_path_add_return_path('chill_person_accompanying_period_work_edit', { 'id': w.id }) }}"
+           class="btn btn-sm btn-show" title="{{ 'voir' }}">
+        </a>
+        #}
 
         <h2 class="badge-title">
             <span class="title_label">
diff --git a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
index 5db109692..a4f045dc7 100644
--- a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
@@ -208,6 +208,7 @@ See this period: Voir cette période
 Requestor: Demandeur
 No requestor: Pas de demandeur
 No resources: "Pas d'interlocuteurs privilégiés"
+Persons associated: Usagers concernés
 Referrer: Référent
 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 appartenance à un ménage dès que possible.
 Add to household now: Ajouter à un ménage

From aecd0e33a369a1ddae8520b4406a548b3fd1547d Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Wed, 24 Nov 2021 14:45:24 +0100
Subject: [PATCH 2/2] resume page: try alternatives with row/cols placement

---
 .../Resources/views/AccompanyingCourse/index.html.twig | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig
index 462e805cb..41a4d1150 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig
@@ -21,14 +21,14 @@
 <div class="accompanyingcourse-resume row">
 
     {% if 'DRAFT' == accompanyingCourse.step %}
-        <div class="col-md-6 warnings mb-5">
+        <div class="warnings mb-5">
             {% include '@ChillPerson/AccompanyingCourse/_still_draft.html.twig' %}
         </div>
     {% endif %}
 
     {% if 'DRAFT' != accompanyingCourse.step %}
         {% if withoutHousehold|length > 0 %}
-            <div class="col-md-6 warnings mb-5">
+            <div class="warnings mb-5">
                 {% include '@ChillPerson/AccompanyingCourse/_join_household.html.twig' %}
             </div>
         {% endif %}
@@ -36,12 +36,12 @@
 
     {% if accompanyingCourse.locationStatus == 'address'
        or accompanyingCourse.locationStatus == 'none' %}
-        <div class="col-md-6 warnings mb-5">
+        <div class="warnings mb-5">
             {% include '@ChillPerson/AccompanyingCourse/_warning_address.html.twig' %}
         </div>
     {% endif %}
 
-    <div class="col-md-6 location mb-5">
+    <div class="col-md-5 location mb-5">
         {% if accompanyingCourse.locationStatus == 'person' %}
             <h2>{{ 'This course is located by'|trans }}</h2>
             <h4>{{ accompanyingCourse.personLocation|chill_entity_render_string }}</h4>
@@ -74,7 +74,7 @@
         or (accompanyingCourse.requestorThirdParty is not null
         or accompanyingCourse.requestorPerson is not null)
     %}
-    <div class="col-md-6 persons mb-5">
+    <div class="col-md-7 persons mb-5">
         <div class="mb-3">
             {% if accompanyingCourse.participations is not empty %}
                 <h4 class="item-key">{{ 'Persons associated'|trans }}</h4>