Finishing evaluation document view and fixing dropdown in show

src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_item.html.twig

@@ -5,7 +5,8 @@
 #  - displayAction: [true|false] default: false
 #  - displayFontSmall: [true|false] default: false
 #}
-<div class="item-bloc{% if displayContent is defined %} {{ displayContent }}{% endif %}{% if itemBlocClass is defined %} {{ itemBlocClass }}{% endif %}">
+<div
+    class="item-bloc{% if displayContent is defined %} {{ displayContent }}{% endif %}{% if itemBlocClass is defined %} {{ itemBlocClass }}{% endif %}">
 
     <div class="item-row">
         <h2 class="badge-title">
@@ -111,8 +112,9 @@
     </div>
 
     {% if displayContent is not defined or displayContent == 'short' %}
-        <div class="item-row column{% if displayFontSmall is defined and displayFontSmall == true %} smallfont{% endif %}">
-            {% include 'ChillPersonBundle:AccompanyingCourseWork:_objectifs_results_evaluations.html.twig' with {
+        <div
+            class="item-row column{% if displayFontSmall is defined and displayFontSmall == true %} smallfont{% endif %}">
+            {% include '@ChillPerson/AccompanyingCourseWork/_objectifs_results_evaluations.html.twig' with {
                 'displayContent': displayContent
             } %}
         </div>
@@ -129,13 +131,14 @@
 
             {% if displayAction is defined and displayAction == true %}
                 <ul class="item-col record_actions">
-
+                    {% if displayNotification is defined and displayNotification == true %}
                         <li>
                             <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>
                         </li>
+                    {% endif %}
                     <li>{{ macro.workflowButton(w) }}</li>
                     <li>
                         <a class="btn btn-show" title="{{ 'Show'|trans }}"
@@ -164,30 +167,32 @@
 </div>
 
 {#
- #   This is for 'long' version of content
- #   Note: this include is wrapped in a flex-table container.
- #   We start by closing the flex-table so we can add more.
- #   At the end we leave the last flex-table open, as it will be closed in the container.
+#   This is for 'long' version of content
+#   Note: this include is wrapped in a flex-table container.
+#   We start by closing the flex-table so we can add more.
+#   At the end we leave the last flex-table open, as it will be closed in the container.
 #}
 {% if displayContent is defined and displayContent == 'long' %}
-    </div>
+</div>
 
-    {% if w.results|length > 0 or w.goals|length > 0 or w.accompanyingPeriodWorkEvaluations|length > 0 %}
+{% if w.results|length > 0 or w.goals|length > 0 or w.accompanyingPeriodWorkEvaluations|length > 0 %}
     <h2 class="chill-blue">{{ 'Dispositifs' }}</h2>
 
     <div class="flex-table">{# new flex-table wrapper #}
-            <div class="item-bloc colored{% if displayContent is defined %} {{ displayContent }}{% endif %}{% if itemBlocClass is defined %} {{ itemBlocClass }}{% endif %}">
+        <div
+            class="item-bloc colored{% if displayContent is defined %} {{ displayContent }}{% endif %}{% if itemBlocClass is defined %} {{ itemBlocClass }}{% endif %}">
             {% include 'ChillPersonBundle:AccompanyingCourseWork:_objectifs_results_evaluations.html.twig' with {
                 'displayContent': displayContent
             } %}
         </div>
     </div>
-    {% endif %}
+{% endif %}
 
-    <h2 class="chill-blue">{{ 'Comments'|trans }}</h2>
+<h2 class="chill-blue">{{ 'Comments'|trans }}</h2>
 
-    <div class="flex-table">
-        <div class="item-bloc no-altern{% if displayContent is defined %} {{ displayContent }}{% endif %}{% if itemBlocClass is defined %} {{ itemBlocClass }}{% endif %}">
+<div class="flex-table">
+    <div
+        class="item-bloc no-altern{% if displayContent is defined %} {{ displayContent }}{% endif %}{% if itemBlocClass is defined %} {{ itemBlocClass }}{% endif %}">
         <h3 class="chill-beige">Public</h3>
         {% if w.note is not empty %}
             <blockquote class="chill-user-quote">
@@ -198,7 +203,8 @@
         {% endif %}
     </div>
     {% if w.privateComment.hasCommentForUser(app.user) %}
-            <div class="item-bloc no-altern{% if displayContent is defined %} {{ displayContent }}{% endif %}{% if itemBlocClass is defined %} {{ itemBlocClass }}{% endif %}">
+        <div
+            class="item-bloc no-altern{% if displayContent is defined %} {{ displayContent }}{% endif %}{% if itemBlocClass is defined %} {{ itemBlocClass }}{% endif %}">
             <h3 class="chill-beige">Privé</h3>
             <blockquote class="chill-user-quote private-quote">
                 {{ w.privateComment.commentForUser(app.user)|chill_markdown_to_html }}
@@ -207,4 +213,4 @@
     {% endif %}
     {# Here flex-table stay open ! read above #}
 
-{% endif %}
+    {% endif %}

src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_objectifs_results_evaluations.html.twig

@@ -118,9 +118,15 @@
                                         </li>
                                     {% endif %}
                                 {% endif %}
+
                             </ul>
+
                         </li>
                     </ul>
+                    {% if recordAction is defined %}
+                        {{ recordAction }}
+                    {% endif %}
+
                     {% if displayContent is defined and displayContent == 'long' %}
 
                         {% if e.comment is not empty %}

src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/index.html.twig

@@ -26,7 +26,8 @@
                         'displayAction': true,
                         'displayContent': 'short',
                         'displayFontSmall': true,
-                        'itemBlocClass': ''
+                        'itemBlocClass': '',
+                        'displayNotification': true
                     } %}
                 {% endfor %}
             </div>

src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/show.html.twig

@@ -43,10 +43,10 @@
                         </button>
                         <ul class="dropdown-menu" aria-labelledby="btnGroupNotifyButtons">
                             <li>
-                                <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>
+                                <a class="dropdown-item" href="{{ chill_path_add_return_path('chill_main_notification_create', {'entityClass': 'Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWork', 'entityId': work.id, 'tos': [accompanyingCourse.user.id]}) }}">{{ 'notification.Notify referrer'|trans }}</a>
                             </li>
                             <li>
-                                <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>
+                                <a class="dropdown-item btn-outline-primary" href="{{ chill_path_add_return_path('chill_main_notification_create', {'entityClass': 'Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWork', 'entityId': work.id}) }}">"{{ 'notification.Notify any'|trans }}"</a>
                             </li>
                         </ul>
                     {% else %}

src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/showEvaluationDocumentInNotification.html.twig

@@ -1,8 +1,17 @@
 {% macro recordAction(document) %}
-    <li>
-        <a href={{ path('chill_person_accompanying_period_work_list', { 'id': accompanyingCourse.id }) }}""
-           class="btn btn-show" title="{{ 'See accompanying period'|trans }}"></a>
-    </li>
+    {% import "@ChillDocStore/Macro/macro_mimeicon.html.twig" as mm %}
+    <div class="item-row">
+
+        <table class="table table-bordered border-dark mt-4 mx-auto">
+            <tr>
+                <td class="text-lg-center text-bg-primary">{{ document.title }}</td>
+                <td class="text-lg-center m-3">{{ mm.mimeIcon(document.storedObject.type) }}</td>
+                <td class="record-actions text-lg-center"><a
+                        href="{{ path('chill_person_accompanying_period_work_show', { 'id': document.accompanyingPeriodWorkEvaluation.accompanyingPeriodWork.id }) }}"
+                        class="btn btn-show" title="{{ 'See the document'|trans }}"></a></td>
+            </tr>
+        </table>
+    </div>
 {% endmacro %}
 {% if document is not null %}
 

src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/showInNotification.html.twig

@@ -1,7 +1,8 @@
 {% macro recordAction(work) %}
     <li>
-        <a href={{ path('chill_person_accompanying_period_work_list', { 'id': accompanyingCourse.id }) }}""
-           class="btn btn-show" title="{{ 'See accompanying period'|trans }}"></a>
+        <a class="btn btn-show" title="{{ 'Show'|trans }}"
+           href="{{ chill_path_add_return_path('chill_person_accompanying_period_work_show', {'id': work.id }) }}"
+        ></a>
     </li>
 {% endmacro %}
 {% if work is not null %}
@@ -12,6 +13,7 @@
                 'displayAction': true,
                 'displayContent': 'short',
                 'displayFontSmall': true,
+                'displayNotification:':true,
                 'w': work
             } %}
         {% else %}