From f76f7a164104b376389311d7db790a0ac953dca5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Tue, 4 Jan 2022 17:40:47 +0100
Subject: [PATCH] notification: handle activities

---
 .../Resources/views/Activity/list.html.twig   | 14 +++++++++++++-
 .../Activity/listAccompanyingCourse.html.twig | 11 +++++++++++
 .../views/Activity/listPerson.html.twig       | 10 ++++++++++
 .../Resources/views/Activity/show.html.twig   | 19 +++++++++++--------
 .../Activity/showAccompanyingCourse.html.twig | 10 ++++++++++
 .../views/Activity/showPerson.html.twig       | 10 ++++++++++
 .../views/AccompanyingCourse/index.html.twig  |  1 -
 7 files changed, 65 insertions(+), 10 deletions(-)

diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/list.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/list.html.twig
index 3f49e67cc..5c5e135b3 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/list.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/list.html.twig
@@ -141,7 +141,7 @@
                                     </div>
                                 </div>
                             {% endif %}
-                            
+
                             {#  Only if ACL SEE_DETAILS AND/OR only on template SHOW ??
                                 durationTime
                                 travelTime
@@ -152,8 +152,20 @@
                         </div>
                     </div>
 
+                    {% set notifications =  chill_list_notifications('Chill\\ActivityBundle\\Entity\\Activity', activity.id) %}
+                    {% if notifications is not empty %}
+                        <div class="item-row separator">
+                           {{ notifications|raw }}
+                        </div>
+                    {% endif %}
+
                     <div class="item-row separator">
                         <ul class="record_actions">
+                            {% if no_action is not defined or no_action == false %}
+                                <li>
+                                    <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>
+                                </li>
+                            {% endif %}
                             {% if context == 'person' and activity.accompanyingPeriod is not empty %}
                                 {#
                                     Disable person_id in following links, for redirect to accompanyingCourse context
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/listAccompanyingCourse.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/listAccompanyingCourse.html.twig
index 431a06ba6..a666f183d 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/listAccompanyingCourse.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/listAccompanyingCourse.html.twig
@@ -4,6 +4,17 @@
 
 {% block title %}{{ 'Activity list' |trans }}{% endblock title %}
 
+
+{% block js %}
+    {{ parent() }}
+    {{ encore_entry_script_tags('mod_notification_toggle_read_status') }}
+{% endblock %}
+
+{% block css %}
+    {{ parent() }}
+    {{ encore_entry_link_tags('mod_notification_toggle_read_status') }}
+{% endblock %}
+
 {% block content %}
 
     {% set person_id = null %}
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/listPerson.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/listPerson.html.twig
index 158bd0e1b..ac4266f8c 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/listPerson.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/listPerson.html.twig
@@ -20,6 +20,16 @@
 
 {% block title %}{{ 'Activity list' |trans }}{% endblock title %}
 
+{% block js %}
+    {{ parent() }}
+    {{ encore_entry_script_tags('mod_notification_toggle_read_status') }}
+{% endblock %}
+
+{% block css %}
+    {{ parent() }}
+    {{ encore_entry_link_tags('mod_notification_toggle_read_status') }}
+{% endblock %}
+
 {% block personcontent %}
 
     {% set person_id = null %}
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig
index cb5b135b3..9fba77a7b 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig
@@ -3,9 +3,15 @@
 
 <h1>{{ "Activity"|trans }}</h1>
 
+{% set notifications =  chill_list_notifications('Chill\\ActivityBundle\\Entity\\Activity', entity.id) %}
+{% if notifications is not empty %}
+    {{ notifications|raw }}
+{% endif %}
+
 <div class="flex-table">
     <div class="item-bloc">
 
+
         <div class="item-row">
             <div class="wrap-list">
                 <div class="wl-row">
@@ -197,9 +203,12 @@
             {{ 'Back to the list'|trans }}
         </a>
     </li>
-    {% if is_granted('CHILL_ACTIVITY_UPDATE', entity) %}
     <li>
-        <a class="btn btn-update" href="{{ path('chill_activity_activity_edit', { 'id': entity.id, 'person_id': person_id, 'accompanying_period_id': accompanying_course_id }) }}">
+        <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>
+    </li>
+    {% if is_granted('CHILL_ACTIVITY_UPDATE', entity) %}
+        <li>
+            <a class="btn btn-update" href="{{ path('chill_activity_activity_edit', { 'id': entity.id, 'person_id': person_id, 'accompanying_period_id': accompanying_course_id }) }}">
             {{ 'Edit'|trans }}
         </a>
     </li>
@@ -212,9 +221,3 @@
     </li>
     {% endif %}
 </ul>
-<script>
-    import ShowPane from "../../../../ChillMainBundle/Resources/public/vuejs/Address/components/ShowPane";
-    export default {
-        components: {ShowPane}
-    }
-</script>
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/showAccompanyingCourse.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/showAccompanyingCourse.html.twig
index b74b315a3..bf3728280 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/showAccompanyingCourse.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/showAccompanyingCourse.html.twig
@@ -4,6 +4,16 @@
 
 {% block title 'Show the activity'|trans %}
 
+{% block js %}
+    {{ parent() }}
+    {{ encore_entry_script_tags('mod_notification_toggle_read_status') }}
+{% endblock %}
+
+{% block css %}
+    {{ parent() }}
+    {{ encore_entry_link_tags('mod_notification_toggle_read_status') }}
+{% endblock %}
+
 {% import 'ChillActivityBundle:ActivityReason:macro.html.twig' as m %}
 
 {% block content -%}
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/showPerson.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/showPerson.html.twig
index 5e92f8fa2..c90b069ed 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/showPerson.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/showPerson.html.twig
@@ -4,6 +4,16 @@
 
 {% block title 'Show the activity'|trans %}
 
+{% block js %}
+    {{ parent() }}
+    {{ encore_entry_script_tags('mod_notification_toggle_read_status') }}
+{% endblock %}
+
+{% block css %}
+    {{ parent() }}
+    {{ encore_entry_link_tags('mod_notification_toggle_read_status') }}
+{% endblock %}
+
 {% import 'ChillActivityBundle:ActivityReason:macro.html.twig' as m %}
 
 {% block personcontent -%}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig
index 821b80b12..11445270a 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig
@@ -22,7 +22,6 @@
 {% block css %}
     {{ parent() }}
     {{ encore_entry_link_tags('mod_notification_toggle_read_status') }}
-
 {% endblock %}
 
 {% block content %}