From 987815471cb44cff4f8e9ed6405b82ccbdb4a9d3 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Thu, 3 Jun 2021 19:13:58 +0200
Subject: [PATCH] add concerned parties in show activity page (2 contexts)

---
 .../Resources/public/scss/chillactivity.scss  | 24 ++++++++++++
 .../vuejs/Activity/components/PersonBadge.vue |  6 ++-
 .../views/Activity/concernedGroups.html.twig  | 37 +++++++++++++++++++
 .../Resources/views/Activity/edit.html.twig   |  2 +-
 .../Resources/views/Activity/new.html.twig    |  2 +-
 .../Resources/views/Activity/show.html.twig   |  9 +++--
 .../Activity/showAccompanyingCourse.html.twig |  2 +-
 .../views/Activity/showPerson.html.twig       |  2 +-
 .../translations/messages.fr.yml              |  7 ++++
 .../Resources/public/scss/chillmain.scss      |  6 +++
 .../public/sass/person_with_period.scss       |  8 ----
 .../Resources/views/Entity/person.html.twig   |  4 +-
 .../Templating/Entity/PersonRender.php        |  4 +-
 .../views/ThirdParty/_render.html.twig        |  7 ++++
 14 files changed, 99 insertions(+), 21 deletions(-)
 create mode 100644 src/Bundle/ChillActivityBundle/Resources/views/Activity/concernedGroups.html.twig

diff --git a/src/Bundle/ChillActivityBundle/Resources/public/scss/chillactivity.scss b/src/Bundle/ChillActivityBundle/Resources/public/scss/chillactivity.scss
index bef8788f8..b2159cb7a 100644
--- a/src/Bundle/ChillActivityBundle/Resources/public/scss/chillactivity.scss
+++ b/src/Bundle/ChillActivityBundle/Resources/public/scss/chillactivity.scss
@@ -8,3 +8,27 @@
 .activity {
     color: $chill-green;
 }
+
+// exceptions for flex-bloc in concerned-groups
+div.flex-bloc.concerned-groups {
+   margin-top: 1em;
+   div.item-bloc {
+      flex-grow: 0; flex-shrink: 0; flex-basis: 25%; //4 blocs
+      ul.list-content {
+         list-style-type: none;
+         padding-left: 0;
+         li {
+            a {
+               color: white;
+               cursor: pointer;
+               &:hover {
+                  color: #ffffffab;
+               }
+            }
+         }
+      }
+   }
+   &.person div.item-bloc {
+      flex-basis: 33%; //3 blocs
+   }
+}
diff --git a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/PersonBadge.vue b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/PersonBadge.vue
index 03827f4a2..e27feb886 100644
--- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/PersonBadge.vue
+++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/PersonBadge.vue
@@ -1,8 +1,10 @@
 <template>
    <li>
       <span class="badge badge-primary" :title="person.text">
-         {{ textCutted }}
-         <a class="fa fa-times"
+         <span class="chill_denomination">
+            {{ textCutted }}
+         </span>
+         <a class="fa fa-fw fa-times"
             @click.prevent="$emit('remove', person)">
          </a>
       </span>
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/concernedGroups.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/concernedGroups.html.twig
new file mode 100644
index 000000000..ee63aed54
--- /dev/null
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/concernedGroups.html.twig
@@ -0,0 +1,37 @@
+{% if context == 'person' %}
+    {% set blocs = [
+        { 'title': 'Persons associated'|trans, 'items': entity.persons },
+        { 'title': 'ThirdParties'|trans, 'items': entity.thirdParties },
+        { 'title': 'Users concerned'|trans, 'items': entity.users },
+    ] %}
+{% else %}
+    {% set blocs = [
+        { 'title': 'Persons in accompanying course'|trans, 'items': entity.persons },
+        { 'title': 'Third persons'|trans, 'items': entity.persons },
+        { 'title': 'ThirdParties'|trans, 'items': entity.thirdParties },
+        { 'title': 'Users concerned'|trans, 'items': entity.users },
+    ] %}
+{% endif %}
+
+<div class="flex-bloc concerned-groups {{ context }}">
+    {% for bloc in blocs %}
+    <div class="item-bloc">
+        <div class="item-row">
+            <div class="item-col">
+                <h4>{{ bloc.title }}</h4>
+            </div>
+            <div class="item-col">
+                <ul class="list-content">
+                    {% for item in bloc.items %}
+                    <li>
+                        <span class="badge badge-primary">
+                            {{ item|chill_entity_render_box({'only_denomination': true}) }}
+                        </span>
+                    </li>
+                    {% endfor %}
+                </ul>
+            </div>
+        </div>
+    </div>
+    {% endfor %}
+</div>
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/edit.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/edit.html.twig
index d56af676e..64c1db310 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/edit.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/edit.html.twig
@@ -25,7 +25,7 @@
     {{ form_row(edit_form.reasons) }}
 {% endif %}
 
-<h2 class="chill-red">Parties concernées</h2>
+<h2 class="chill-red">{{ 'Concerned groups'|trans }}</h2>
 
 {%- if edit_form.persons is defined -%}
     {{ form_widget(edit_form.persons) }}
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/new.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/new.html.twig
index c1f8b55b9..7fa2324fb 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/new.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/new.html.twig
@@ -26,7 +26,7 @@
     {{ form_row(form.reasons) }}
 {% endif %}
 
-<h2 class="chill-red">Parties concernées</h2>
+<h2 class="chill-red">{{ 'Concerned groups'|trans }}</h2>
 
 {%- if form.persons is defined -%}
     {{ form_widget(form.persons) }}
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig
index f0cb5928b..0a4f86bf3 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig
@@ -1,5 +1,4 @@
 <h1 >{{ "Activity"|trans }}</h1>
-
 <dl class="chill_view_data">
     <dt class="inline">{{ 'User'|trans }}</dt>
     <dd>{{ entity.user }}</dd>
@@ -8,8 +7,13 @@
         <dt class="inline">{{ 'Scope'|trans }}</dt>
         <dd><span class="scope">{{ entity.scope.name|localize_translatable_string }}</span></dd>
     {% endif %}
+</dl>
 
-    <h2 class="chill-red">{{ 'Activity data'|trans }}</h2>
+<h2 class="chill-red">{{ 'Concerned groups'|trans }}</h2>
+{% include 'ChillActivityBundle:Activity:concernedGroups.html.twig' with {'context': context } %}
+
+<h2 class="chill-red">{{ 'Activity data'|trans }}</h2>
+<dl class="chill_view_data">
 
     {%- if entity.person is defined -%}
         <dt class="inline">{{ 'Person'|trans }}</dt>
@@ -39,7 +43,6 @@
     {%- else -%}
         <dd>{{ entity.comment|chill_entity_render_box }}</dd>
     {%- endif -%}
-
 </dl>
 
 {% set person_id = null %}
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/showAccompanyingCourse.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/showAccompanyingCourse.html.twig
index a55b318a7..fc046ed7e 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/showAccompanyingCourse.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/showAccompanyingCourse.html.twig
@@ -7,5 +7,5 @@
 {% import 'ChillActivityBundle:ActivityReason:macro.html.twig' as m %}
 
 {% block content -%}
-    {% include 'ChillActivityBundle:Activity:show.html.twig' %}
+    {% include 'ChillActivityBundle:Activity:show.html.twig' with {'context': 'accompanyingCourse'} %}
 {% endblock content %}
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/showPerson.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/showPerson.html.twig
index f7d641b75..b42de7b7e 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/showPerson.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/showPerson.html.twig
@@ -7,5 +7,5 @@
 {% import 'ChillActivityBundle:ActivityReason:macro.html.twig' as m %}
 
 {% block personcontent -%}
-    {% include 'ChillActivityBundle:Activity:show.html.twig' %}
+    {% include 'ChillActivityBundle:Activity:show.html.twig' with {'context': 'person'} %}
 {% endblock personcontent %}
diff --git a/src/Bundle/ChillActivityBundle/translations/messages.fr.yml b/src/Bundle/ChillActivityBundle/translations/messages.fr.yml
index 7c8a6b33d..793cb582a 100644
--- a/src/Bundle/ChillActivityBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillActivityBundle/translations/messages.fr.yml
@@ -61,6 +61,13 @@ Choose a type: Choisir un type
 1 hour 30: 1 heure 30
 1 hour 45: 1 heure 45
 2 hours: 2 heures
+Concerned groups: Parties concernées
+Persons in accompanying course: Usagers du parcours
+Third persons: Tiers non-pro.
+Persons associated: Usagers
+ThirdParties: Tiers professionnels
+Users concerned: T(M)S
+
 
 #timeline
 '%user% has done an %activity_type%': '%user% a effectué une activité de type "%activity_type%"'
diff --git a/src/Bundle/ChillMainBundle/Resources/public/scss/chillmain.scss b/src/Bundle/ChillMainBundle/Resources/public/scss/chillmain.scss
index 1d8c09bf2..77aafbc3d 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/scss/chillmain.scss
+++ b/src/Bundle/ChillMainBundle/Resources/public/scss/chillmain.scss
@@ -41,6 +41,12 @@ table {
    }
 }
 
+// règle la typo des étiquettes de dénomination rendues avec renderBox
+.chill_denomination {
+   font-size: 1.3em;
+   font-weight: 700;
+}
+
 /*
  *  ACCOMPANYING_COURSE
  *  Header custom for Accompanying Course
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/sass/person_with_period.scss b/src/Bundle/ChillPersonBundle/Resources/public/sass/person_with_period.scss
index 6f52d2cae..298f9ed71 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/sass/person_with_period.scss
+++ b/src/Bundle/ChillPersonBundle/Resources/public/sass/person_with_period.scss
@@ -40,11 +40,3 @@ div.list-with-period {
       }
    }
 }
-
-.chill-entity__person {
-   .chill-entity__person__first-name,
-   .chill-entity__person__last-name {
-      font-size: 1.3em;
-      font-weight: 700;
-   }
-}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Entity/person.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Entity/person.html.twig
index afcd2799c..4aefa82bb 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Entity/person.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Entity/person.html.twig
@@ -1,8 +1,8 @@
 <span class="chill-entity chill-entity__person">
   {%- if addLink and is_granted('CHILL_PERSON_SEE', person) -%}
     {%- set showLink = true -%}<a href="{{ chill_path_add_return_path('chill_person_view', { 'person_id': person.id }) }}">{%- endif -%}
-    <span class="chill-entity__person__first-name">{{ person.firstName }}</span>
-    <span class="chill-entity__person__last-name">{{ person.lastName }}</span>
+    <span class="chill_denomination">{{ person.firstName }}</span>
+    <span class="chill_denomination">{{ person.lastName }}</span>
     {%- if addAltNames -%}
       {%- for n in person.altNames -%}
         {%- if loop.first -%}({% else %} {%- endif -%}
diff --git a/src/Bundle/ChillPersonBundle/Templating/Entity/PersonRender.php b/src/Bundle/ChillPersonBundle/Templating/Entity/PersonRender.php
index d1f554492..f8c9785f5 100644
--- a/src/Bundle/ChillPersonBundle/Templating/Entity/PersonRender.php
+++ b/src/Bundle/ChillPersonBundle/Templating/Entity/PersonRender.php
@@ -51,8 +51,8 @@ class PersonRender extends AbstractChillEntityRender
     {
         return 
             $this->getDefaultOpeningBox('person').
-            '<span class="chill-entity__person__first-name">'.$person->getFirstName().'</span>'.
-            ' <span class="chill-entity__person__last-name">'.$person->getLastName().'</span>'.
+            '<span class="chill_denomination">'.$person->getFirstName().'</span>'.
+            ' <span class="chill_denomination">'.$person->getLastName().'</span>'.
             $this->addAltNames($person, true).
             $this->getDefaultClosingBox()
             ;
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/_render.html.twig b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/_render.html.twig
index 9ed68bfb6..626b556ee 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/_render.html.twig
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/_render.html.twig
@@ -1,4 +1,10 @@
 {# template to render a person #}
+{%- if options['only_denomination'] == true -%}
+<div class="chill_denomination">
+    {{ contact.name }}
+</div>
+
+{%- else -%}
 <div class="chill_contact">
 
     <div class="chill_contact_name">
@@ -43,3 +49,4 @@
         </div>
     {% endif %}
 </div>
+{%- endif -%}