From d616c205341db9f67f143bfd7af1d9c0d7e99b3b Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Sat, 27 Nov 2021 11:58:17 +0100
Subject: [PATCH] accourse resume page: add all informations needed for
 activities

---
 .../Activity/activity-badge-title.html.twig   | 44 +++++++---
 .../translations/messages.fr.yml              |  1 +
 .../views/AccompanyingCourse/index.html.twig  | 80 +++++++++----------
 ...st_recent_by_accompanying_period.html.twig |  3 +
 4 files changed, 76 insertions(+), 52 deletions(-)

diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/activity-badge-title.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/activity-badge-title.html.twig
index f4a3d4d29..f51854163 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/activity-badge-title.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/activity-badge-title.html.twig
@@ -26,23 +26,45 @@
 
         {{ activity.type.name | localize_translatable_string }}
 
-        <ul class="small_in_title">
-            {% if activity.location and t.locationVisible %}
-            <li>
-                <span class="item-key">{{ 'location'|trans ~ ': ' }}</span>
-                <span>{{ activity.location.locationType.title|localize_translatable_string }}</span>
-                {{ activity.location.name }}
-            </li>
+        {% if activity.emergency %}
+            <span class="badge bg-danger rounded-pill fs-6">{{ 'Emergency'|trans|upper }}</span>
+        {% endif %}
+
+        <ul class="small_in_title mt-3">
+
+            {% if activity.sentReceived is not empty and t.sentReceivedVisible %}
+                <li>
+                    <span class="item-key">{{ 'Sent received'|trans ~ ' : ' }}</span>
+                    <b>{{ activity.sentReceived|capitalize|trans }}</b>
+                </li>
             {% endif %}
+
+            {% if activity.location and t.locationVisible %}
+                <li>
+                    <span class="item-key">{{ 'location'|trans ~ ': ' }}</span>
+                    <b>
+                        <span>{{ activity.location.locationType.title|localize_translatable_string }}</span>
+                        {{ activity.location.name }}
+                    </b>
+                </li>
+            {% endif %}
+
             {% if activity.user and t.userVisible %}
                 <li>
                     <span class="item-key">{{ 'Referrer'|trans ~ ': ' }}</span>
-                    {{ activity.user.usernameCanonical }}
+                    <b>{{ activity.user.usernameCanonical }}</b>
                 </li>
             {% endif %}
+
+            <li class="associated-persons">
+                <span class="item-key">{{ 'Participants'|trans ~ ' : ' }}</span>
+                {% for p in activity.personsAssociated %}
+                    <span class="badge-person">{{ p|chill_entity_render_box }}</span>
+                {% endfor %}
+            </li>
         </ul>
 
-        <ul class="list-content">
+        <ul class="list-content my-3">
             {%- if t.reasonsVisible -%}
                 {%- if activity.reasons is not empty -%}
                     <li class="reasons">
@@ -71,11 +93,9 @@
                 {%- endif -%}
             {% endif %}
         </ul>
-
     </span>
 </h2>
 
-{#
 {% if context == 'person' and activity.accompanyingPeriod is not empty %}
     <div class="mt-3">
         <a class="btn btn-sm btn-outline-primary"
@@ -87,4 +107,4 @@
         </a>
     </div>
 {% endif %}
-#}
+
diff --git a/src/Bundle/ChillMainBundle/translations/messages.fr.yml b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
index 210227fbe..8736a8b65 100644
--- a/src/Bundle/ChillMainBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
@@ -215,6 +215,7 @@ Configure location and location type: Configuration des localisations
 
 # circles / scopes
 Choose the circle: Choisir le cercle
+Scopes: Services
 
 #export
 
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig
index 41a4d1150..dd4b99558 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig
@@ -41,41 +41,52 @@
         </div>
     {% endif %}
 
-    <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>
-        {%  elseif accompanyingCourse.locationStatus == 'address' %}
-            <h4>{{ 'This course has a temporarily location'|trans }}</h4>
-        {% endif %}
+    <div class="col-md-5 mb-5">
+        <div class="location mb-3">
+            {% if accompanyingCourse.locationStatus == 'person' %}
+                <h2>{{ 'This course is located by'|trans }}</h2>
+                <h4>{{ accompanyingCourse.personLocation|chill_entity_render_string }}</h4>
+            {%  elseif accompanyingCourse.locationStatus == 'address' %}
+                <h4>{{ 'This course has a temporarily location'|trans }}</h4>
+            {% endif %}
 
-        {% 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>
+            {% if accompanyingCourse.locationStatus != 'none' %}
+                {{ accompanyingCourse.location|chill_entity_render_box }}
+            {% endif %}
         </div>
-        <div class="mt-3">
-            <h4>Services</h4>
-            <ul>
-                <li>one</li>
-                <li>two</li>
-            </ul>
-        </div>
-        -->
-
     </div>
 
-    {% if accompanyingCourse.participations is not empty
-        or accompanyingCourse.resources is not empty
+    {% if accompanyingCourse.scopes is not empty
         or (accompanyingCourse.requestorThirdParty is not null
         or accompanyingCourse.requestorPerson is not null)
+        or accompanyingCourse.participations is not empty
+        or accompanyingCourse.resources is not empty
     %}
-    <div class="col-md-7 persons mb-5">
-        <div class="mb-3">
+    <div class="col-md-7 mb-5">
+        <div class="scopes mb-3">
+            {% if accompanyingCourse.scopes is not empty %}
+                <h4 class="item-key">{{ 'Scopes'|trans }}</h4>
+                <p>
+                    {% for s in accompanyingCourse.scopes  %}
+                        <span>{{ s.name|localize_translatable_string|capitalize }}</span>{% if not loop.last %}, {% endif %}
+                    {% endfor %}
+                </p>
+            {% else %}
+                <span class="chill-no-data-statement visually-hidden">{{ 'No scopes'|trans }}</span>
+            {% endif %}
+        </div>
+        <div class="requestor mb-3">
+            {% if accompanyingCourse.requestorPerson is not null %}
+                <h4 class="item-key">{{ 'Requestor'|trans }}</h4>
+                {{ _self.insert_onthefly('person', accompanyingCourse.requestorPerson) }}
+            {% elseif accompanyingCourse.requestorThirdParty is not null %}
+                <h4 class="item-key">{{ 'Requestor'|trans }}</h4>
+                {{ _self.insert_onthefly('thirdparty', accompanyingCourse.requestorThirdParty) }}
+            {% else %}
+                <span class="chill-no-data-statement visually-hidden">{{ 'No requestor'|trans }}</span>
+            {% endif %}
+        </div>
+        <div class="persons mb-3">
             {% if accompanyingCourse.participations is not empty %}
                 <h4 class="item-key">{{ 'Persons associated'|trans }}</h4>
                 {% for r in accompanyingCourse.participations %}
@@ -89,18 +100,7 @@
                 <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>
-                {{ _self.insert_onthefly('person', accompanyingCourse.requestorPerson) }}
-            {% elseif accompanyingCourse.requestorThirdParty is not null %}
-                <h4 class="item-key">{{ 'Requestor'|trans }}</h4>
-                {{ _self.insert_onthefly('thirdparty', accompanyingCourse.requestorThirdParty) }}
-            {% else %}
-                <span class="chill-no-data-statement visually-hidden">{{ 'No requestor'|trans }}</span>
-            {% endif %}
-        </div>
-        <div>
+        <div class="resources mb-3">
             {% if accompanyingCourse.resources is not empty %}
                 <h4 class="item-key">{{ 'Resources'|trans }}</h4>
                 {% for r in accompanyingCourse.resources %}
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 cb4620004..f33718910 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
@@ -23,6 +23,7 @@
                     </li>
                     {% endif %}
                 </ul>
+
                 <ul class="small_in_title">
                     {% if w.handlingThierParty %}
                     <li>
@@ -37,11 +38,13 @@
                         {% endfor %}
                     </li>
                 </ul>
+
                 <ul class="list-content my-3">
                     <li class="social-issues">
                         {{ w.socialAction.issue|chill_entity_render_box }}
                     </li>
                 </ul>
+
                 <ul class="small_in_title evaluations mb-3">
                     {% for e in w.accompanyingPeriodWorkEvaluations %}
                         <li>