From 4592be3a8de014751f03f17b22d72c41282829b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Tue, 14 Jun 2022 16:34:41 +0200
Subject: [PATCH 1/2] improve syntax for the js fix

---
 .../Resources/public/vuejs/_components/OnTheFly/Person.vue    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue
index 799bc3caf..4f8909233 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue
@@ -333,10 +333,10 @@ export default {
       addQueryItem(field, queryItem) {
          switch (field) {
             case 'lastName':
-               this.person.lastName ? this.person.lastName += ` ${queryItem}` : this.person.lastName = queryItem;
+               this.person.lastName = this.person.lastName ? this.person.lastName += ` ${queryItem}` : queryItem;
                break;
             case 'firstName':
-               this.person.firstName ? this.person.firstName += ` ${queryItem}` : this.person.firstName = queryItem;
+               this.person.firstName = this.person.firstName ? this.person.firstName += ` ${queryItem}` : queryItem;
                break;
          }
       },

From f339cf56d67239e7cb01cd2bb02d7277bc7f82b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Tue, 14 Jun 2022 21:24:28 +0200
Subject: [PATCH 2/2] notify the referrer from an activity page or list

---
 .../Resources/views/Activity/list.html.twig   | 30 +++++++++++++++----
 .../Resources/views/Activity/show.html.twig   | 27 +++++++++++++++--
 2 files changed, 48 insertions(+), 9 deletions(-)

diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/list.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/list.html.twig
index f8b68eabd..79c946f17 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/list.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/list.html.twig
@@ -2,12 +2,30 @@
     {% if is_granted('CHILL_ACTIVITY_SEE_DETAILS', activity) %}
         {% if no_action is not defined or no_action == false %}
             <li>
-                <a class="btn btn-misc" href="{{ chill_path_add_return_path('chill_main_notification_create', {
-                    'entityClass': 'Chill\\ActivityBundle\\Entity\\Activity',
-                    'entityId': activity.id
-                }) }}">
-                    <i class="fa fa-paper-plane fa-fw"></i>
-                    {{ 'notification.Notify'|trans }}</a>
+                {% set showGroup = activity.accompanyingPeriod is not null and activity.accompanyingPeriod.hasUser and activity.accompanyingPeriod.user is not same as(app.user)  %}
+                <div class="{% if showGroup %}btn-group{% endif %}" {% if showGroup %}role="group"{% endif %}>
+                    {% if showGroup %}
+                        <button id="btnGroupNotifyButtons" type="button" class="btn btn-notify dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false">
+                            {{ 'notification.Notify'|trans }}
+                        </button>
+                        <ul class="dropdown-menu" aria-labelledby="btnGroupNotifyButtons">
+                            <li>
+                                <a class="dropdown-item" href="{{ chill_path_add_return_path('chill_main_notification_create', {'entityClass': 'Chill\\ActivityBundle\\Entity\\Activity', 'entityId': activity.id, 'tos': [activity.accompanyingPeriod.user.id]}) }}">
+                                    {{ 'notification.Notify referrer'|trans }}
+                                </a>
+                            </li>
+                            <li>
+                                <a class="dropdown-item" href="{{ chill_path_add_return_path('chill_main_notification_create', {'entityClass': 'Chill\\ActivityBundle\\Entity\\Activity', 'entityId': activity.id}) }}">
+                                    {{ 'notification.Notify any'|trans }}
+                                </a>
+                            </li>
+                        </ul>
+                    {% else %}
+                        <a class="btn btn-notify" href="{{ chill_path_add_return_path('chill_main_notification_create', {'entityClass': 'Chill\\ActivityBundle\\Entity\\Activity', 'entityId': activity.id}) }}">
+                            {{ 'notification.Notify'|trans }}
+                        </a>
+                    {% endif %}
+                </div>
             </li>
         {% endif %}
         {% if context == 'person' and activity.accompanyingPeriod is not empty %}
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig
index bf4c5c7b6..49e71bfad 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig
@@ -217,9 +217,30 @@
         </a>
     </li>
     <li>
-        <a class="btn btn-notify" href="{{ chill_path_add_return_path('chill_main_notification_create', {'entityClass': 'Chill\\ActivityBundle\\Entity\\Activity', 'entityId': entity.id}) }}">
-            {{ 'notification.Notify'|trans }}
-        </a>
+        {% set showGroup = entity.accompanyingPeriod is not null and entity.accompanyingPeriod.hasUser and entity.accompanyingPeriod.user is not same as(app.user)  %}
+        <div class="{% if showGroup %}btn-group{% endif %}" {% if showGroup %}role="group"{% endif %}>
+            {% if showGroup %}
+                <button id="btnGroupNotifyButtons" type="button" class="btn btn-notify dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false">
+                    {{ 'notification.Notify'|trans }}
+                </button>
+                <ul class="dropdown-menu" aria-labelledby="btnGroupNotifyButtons">
+                    <li>
+                        <a class="dropdown-item" href="{{ chill_path_add_return_path('chill_main_notification_create', {'entityClass': 'Chill\\ActivityBundle\\Entity\\Activity', 'entityId': entity.id, 'tos': [entity.accompanyingPeriod.user.id]}) }}">
+                            {{ 'notification.Notify referrer'|trans }}
+                        </a>
+                    </li>
+                    <li>
+                        <a class="dropdown-item" href="{{ chill_path_add_return_path('chill_main_notification_create', {'entityClass': 'Chill\\ActivityBundle\\Entity\\Activity', 'entityId': entity.id}) }}">
+                            {{ 'notification.Notify any'|trans }}
+                        </a>
+                    </li>
+                </ul>
+            {% else %}
+                <a class="btn btn-notify" href="{{ chill_path_add_return_path('chill_main_notification_create', {'entityClass': 'Chill\\ActivityBundle\\Entity\\Activity', 'entityId': entity.id}) }}">
+                    {{ 'notification.Notify'|trans }}
+                </a>
+            {% endif %}
+        </div>
     </li>
     {% if is_granted('CHILL_ACTIVITY_UPDATE', entity) %}
         <li>