From e850f67b0095aeac8601af69fe04074a1442134e Mon Sep 17 00:00:00 2001
From: Lucas Silva <l.silva@students.ephec.be>
Date: Thu, 23 Mar 2023 14:59:32 +0100
Subject: [PATCH] rajout du voter, pour document et action dans la notif ->
 affiche les documents mais aussi le fais de partager dans notification create

---
 .../AccompanyingCourseWork/_item.html.twig    |  2 +-
 .../_objectifs_results_evaluations.html.twig  |  7 +++----
 .../AccompanyingCourseWork/show.html.twig     |  4 ++--
 ...EvaluationDocumentInNotification.html.twig | 20 +++++++++----------
 .../showInNotification.html.twig              |  6 +++---
 5 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_item.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_item.html.twig
index 728554aaf..76c61407d 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_item.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_item.html.twig
@@ -131,7 +131,7 @@
             <ul class="item-col record_actions">
 
                 <li>
-                    <a class="btn btn-notify" title="{{ 'notification.Notify'|trans }}"
+                    <a class="btn btn-notify btn-outline-primary" title="{{ 'notification.Notify'|trans }}"
                        href="{{ chill_path_add_return_path('chill_main_notification_create', {'entityClass': 'Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWork', 'entityId': w.id}) }}">
 
                     </a>
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_objectifs_results_evaluations.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_objectifs_results_evaluations.html.twig
index 029e347b1..4f5d36230 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_objectifs_results_evaluations.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_objectifs_results_evaluations.html.twig
@@ -133,13 +133,12 @@
 
                             <table class="table mt-4 mx-auto">
                                 {% for d in e.documents %}
-                                    {{ dump(d) }}
                                     <tr class="border-0">
                                         <td class="border-0">{{ d.title }}</td>
                                         <td class="border-0">{{ mm.mimeIcon(d.storedObject.type) }}</td>
-                                        <td class="border-0">
-                                            <a class="btn btn-notify btn-sm btn-outline-primary" title="{{ 'notification.Notify'|trans }} " href="{{ chill_path_add_return_path('chill_main_notification_create', {'entityClass': 'Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWorkEvaluationDocument', 'entityId': d.id}) }}"></a>
-                                        </td>
+                                            <td class="border-0">
+                                                <a class="btn btn-notify btn-sm btn-outline-primary" title="{{ 'notification.Notify'|trans }} " href="{{ chill_path_add_return_path('chill_main_notification_create', {'entityClass': 'Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWorkEvaluationDocument', 'entityId': d.id}) }}"></a>
+                                            </td>
                                         <td class="border-0 text-end">{{ d.storedObject|chill_document_button_group(d.title, is_granted('CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_UPDATE', w), {'small': true}) }}</td>
                                     </tr>
                                 {% endfor %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/show.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/show.html.twig
index 016ac10bb..bd83310b7 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/show.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/show.html.twig
@@ -46,11 +46,11 @@
                                 <a class="dropdown-item" title="{{ 'notification.Notify referrer'|trans }}" href="{{ chill_path_add_return_path('chill_main_notification_create', {'entityClass': 'Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWork', 'entityId': work.id, 'tos': [accompanyingCourse.user.id]}) }}"></a>
                             </li>
                             <li>
-                                <a class="dropdown-item" title="{{ 'notification.Notify any'|trans }}" href="{{ chill_path_add_return_path('chill_main_notification_create', {'entityClass': 'Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWork', 'entityId': work.id}) }}"></a>
+                                <a class="dropdown-item btn-outline-primary" title="{{ 'notification.Notify any'|trans }}" href="{{ chill_path_add_return_path('chill_main_notification_create', {'entityClass': 'Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWork', 'entityId': work.id}) }}"></a>
                             </li>
                         </ul>
                     {% else %}
-                        <a class="btn btn-notify" title="{{ 'notification.Notify'|trans }}" href="{{ chill_path_add_return_path('chill_main_notification_create', {'entityClass': 'Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWork', 'entityId': work.id}) }}">
+                        <a class="btn btn-notify btn-outline-primary" title="{{ 'notification.Notify'|trans }}" href="{{ chill_path_add_return_path('chill_main_notification_create', {'entityClass': 'Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWork', 'entityId': work.id}) }}">
                         </a>
 
                     {% endif %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/showEvaluationDocumentInNotification.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/showEvaluationDocumentInNotification.html.twig
index b9fd07a11..83ba7bf91 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/showEvaluationDocumentInNotification.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/showEvaluationDocumentInNotification.html.twig
@@ -6,18 +6,18 @@
 {% endmacro %}
 {% if document is not null %}
     <div class="flex-table">
-        {% if is_granted('CHILL_PERSON_ACCOMPANYING_PERIOD_SEE', document) %}
+        {% if is_granted('CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_EVALUATION_DOCUMENT_SHOW', document) %}
+            {% include 'ChillPersonBundle:AccompanyingCourseWork:_objectifs_results_evaluations.html.twig' with {
+                'w': document.accompanyingPeriodWorkEvaluation.accompanyingPeriodWork,
+                'd': document.storedObject,
+                'displayContent': 'long',
+            } %}
         {% else %}
+            <div class="alert alert-warning border-warning border-1">
+                {{ 'This is the minimal period details'|trans ~ ': ' ~ document.id }}<br>
+                {{ 'You are getting a notification for a period you are not allowed to see'|trans }}
+            </div>
         {% endif %}
-        {{ dump(document) }}
-        {% include 'ChillPersonBundle:AccompanyingCourseWork:_objectifs_results_evaluations.html.twig' with {
-
-            'w': document.accompanyingPeriodWorkEvaluation.accompanyingPeriodWork
-        } %}
-        <div class="alert alert-warning border-warning border-1">
-            {{ 'This is the minimal period details'|trans ~ ': ' ~ document.id }}<br>
-            {{ 'You are getting a notification for a period you are not allowed to see'|trans }}
-        </div>
     </div>
 {% else %}
     <div class="alert alert-warning border-warning border-1">
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/showInNotification.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/showInNotification.html.twig
index 70a1a0980..311692030 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/showInNotification.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/showInNotification.html.twig
@@ -6,9 +6,7 @@
 {% endmacro %}
 {% if work is not null %}
     <div class="flex-table">
-        {% if is_granted('CHILL_PERSON_ACCOMPANYING_PERIOD_SEE', work) %}
-        {% else %}
-        {% endif %}
+        {% if is_granted('CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_SEE', work) %}
             {% include 'ChillPersonBundle:AccompanyingCourseWork:_item.html.twig' with {
                 'itemBlocClass': 'bg-chill-llight-gray',
                 'displayAction': true,
@@ -16,10 +14,12 @@
                 'displayFontSmall': true,
                 'w': work
             } %}
+        {% else %}
             <div class="alert alert-warning border-warning border-1">
                 {{ 'This is the minimal period details'|trans ~ ': ' ~ work.id }}<br>
                 {{ 'You are getting a notification for a period you are not allowed to see'|trans }}
             </div>
+        {% endif %}
     </div>
 {% else %}
     <div class="alert alert-warning border-warning border-1">