Merge remote-tracking branch 'origin/master' into upgrade-php82

src/Bundle/ChillActivityBundle/Resources/public/chill/chillactivity.scss

@@ -88,3 +88,11 @@ div.flex-bloc.concerned-groups {
       font-size: 120%;
    }
 }
+
+/// DOCUMENT LIST IN ACTIVITY ITEM
+li.document-list-item {
+    display: flex;
+    width: 100%;
+    justify-content: space-between;
+    margin-bottom: 0.3rem;
+}

src/Bundle/ChillActivityBundle/Resources/views/Activity/_list_item.html.twig

@@ -68,7 +68,7 @@
                     <div class="wl-col title"><h3>{{ 'Referrer'|trans }}</h3></div>
                     <div class="wl-col list">
                         <p class="wl-item">
-                            {{ activity.user|chill_entity_render_box }}
+                            <span class="badge-user">{{ activity.user|chill_entity_render_box }}</span>
                         </p>
                     </div>
                 </div>
@@ -158,13 +158,21 @@
                 </div>
             {% endif %}
 
-            {#  Only if ACL SEE_DETAILS AND/OR only on template SHOW ??
+            {% if is_granted('CHILL_ACTIVITY_SEE_DETAILS', activity) and activity.documents|length > 0 %}
-                durationTime
+                <div class="wl-row">
-                travelTime
+                    <div class="wl-col title">
-                comment
+                        <h3>{{ 'Documents'|trans }}</h3>
-                documents
+                    </div>
-                attendee
+                    <div class="wl-col list">
-            #}
+                        <ul>
+                            {% for d in activity.documents %}
+                                <li class="document-list-item">{{ d.title|chill_print_or_message('document.Any title') }} {{ d|chill_document_button_group(d.title, is_granted('CHILL_ACTIVITY_UPDATE', activity), {small: true}) }}</li>
+                            {% endfor %}
+                        </ul>
+                    </div>
+                </div>
+            {% endif %}
+
         </div>
     </div>
 

src/Bundle/ChillActivityBundle/Resources/views/Activity/listAccompanyingCourse.html.twig

@@ -8,11 +8,13 @@
 {% block js %}
     {{ parent() }}
     {{ encore_entry_script_tags('mod_notification_toggle_read_status') }}
+    {{ encore_entry_script_tags('mod_document_action_buttons_group') }}
 {% endblock %}
 
 {% block css %}
     {{ parent() }}
     {{ encore_entry_link_tags('mod_notification_toggle_read_status') }}
+    {{ encore_entry_link_tags('mod_document_action_buttons_group') }}
 {% endblock %}
 
 {% block content %}

src/Bundle/ChillActivityBundle/Resources/views/Activity/listPerson.html.twig

@@ -23,11 +23,13 @@
 {% block js %}
     {{ parent() }}
     {{ encore_entry_script_tags('mod_notification_toggle_read_status') }}
+    {{ encore_entry_script_tags('mod_document_action_buttons_group') }}
 {% endblock %}
 
 {% block css %}
     {{ parent() }}
     {{ encore_entry_link_tags('mod_notification_toggle_read_status') }}
+    {{ encore_entry_link_tags('mod_document_action_buttons_group') }}
 {% endblock %}
 
 {% block content %}

src/Bundle/ChillActivityBundle/Resources/views/Activity/list_recent.html.twig

@@ -41,7 +41,7 @@
                         {% if activity.user and t.userVisible %}
                             <li>
                                 <span class="item-key">{{ 'Referrer'|trans ~ ': ' }}</span>
-                                <b>{{ activity.user|chill_entity_render_box}}</b>
+                                <span class="badge-user">{{ activity.user|chill_entity_render_box }}</span>
                             </li>
                         {% endif %}
 

src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig

@@ -35,7 +35,9 @@
         <div class="item-row separator">
             <dl class="chill_view_data">
                 <dt class="inline">{{ 'Referrer'|trans|capitalize }}</dt>
-                <dd>{{ entity.user|chill_entity_render_box }}</dd>
+                <dd>
+                    <span class="badge-user">{{ entity.user|chill_entity_render_box }}</span>
+                </dd>
 
                 {%- if entity.scope -%}
                     <dt class="inline">{{ 'Scope'|trans }}</dt>
@@ -168,7 +170,7 @@
                     {% if entity.documents|length > 0 %}
                         <ul>
                             {% for d in entity.documents %}
-                                <li>{{ d.title }} {{ d|chill_document_button_group() }}</li>
+                                <li class="document-list-item">{{ d.title|chill_print_or_message('document.Any title') }} {{ d|chill_document_button_group(d.title, is_granted('CHILL_ACTIVITY_UPDATE', entity), {small: true}) }}</li>
                             {% endfor %}
                         </ul>
                     {% else %}

src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DocumentActionButtonsGroup.vue

@@ -1,5 +1,5 @@
 <template>
-  <div v-if="'ready' === props.storedObject.status" class="dropdown">
+  <div v-if="'ready' === props.storedObject.status" class="btn-group">
     <button :class="Object.assign({'btn': true, 'btn-outline-primary': true, 'dropdown-toggle': true, 'btn-sm': props.small})" type="button" data-bs-toggle="dropdown" aria-expanded="false">
       Actions
     </button>

src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/DownloadButton.vue

@@ -38,13 +38,11 @@ async function download_and_open(event: Event): Promise<void> {
     button.href = window.URL.createObjectURL(raw);
     button.type = props.storedObject.type;
 
-    if (props.filename !== undefined) {
+    button.download = props.filename || 'document';
-      button.download = props.filename || 'document';
 
-      const ext = mime.getExtension(props.storedObject.type);
+    const ext = mime.getExtension(props.storedObject.type);
-      if (null !== ext) {
+    if (null !== ext) {
-        button.download = button.download + '.' + ext;
+      button.download = button.download + '.' + ext;
-      }
     }
   }
 

src/Bundle/ChillDocStoreBundle/translations/messages.fr.yml

@@ -19,6 +19,9 @@ The document is successfully registered: Le document est enregistré
 The document is successfully updated: Le document est mis à jour
 Any description: Aucune description
 
+document:
+    Any title: Aucun titre
+
 # delete
 Delete document ?: Supprimer le document ?
 Are you sure you want to remove this document ?: Êtes-vous sûr·e de vouloir supprimer ce document ?

src/Bundle/ChillMainBundle/Controller/LocationController.php

@@ -28,7 +28,7 @@ class LocationController extends CRUDController
 
     protected function customizeQuery(string $action, Request $request, $query): void
     {
-        $query->where('e.availableForUsers = "TRUE"');
+        $query->where('e.availableForUsers = TRUE');
     }
 
     protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator)

src/Bundle/ChillMainBundle/Resources/views/Workflow/_attachment.html.twig

@@ -72,7 +72,7 @@
                     </div>
                 </div>
                 <div class="item-row column">
-                    <table class="obj-res-eval my-3">
+                    <table class="obj-res-eval smallfont my-3">
                         <thead>
                         <tr><th class="obj"><h4 class="title_label">Objectif - motif - dispositif</h4></th>
                             <th class="res"><h4 class="title_label">Résultats - orientations</h4></th>

src/Bundle/ChillPersonBundle/Resources/public/chill/scss/accompanying_period_work.scss

@@ -20,9 +20,6 @@ div.accompanying-course-work {
                 margin: 0;
             }
         }
-        td {
-            font-size: 85%;
-        }
         td.obj,
         td.res {
             width: 50%;
@@ -37,6 +34,10 @@ div.accompanying-course-work {
         }
     }
 
+    .smallfont table.obj-res-eval {
+        font-size: 85%;
+    }
+
     ul {
         &.goal_title,
         &.result_list,

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

@@ -3,6 +3,7 @@
 #  - itemBlocClass: [uniq|colored|extended]
 #  - displayContent: [short|long] default: short
 #  - 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 %}">
 
@@ -83,7 +84,7 @@
                     {%- if w.referrers|length > 0 -%}
                         {% for u in w.referrers %}
                             <span class="wl-item">
-                                {{ u|chill_entity_render_box }}
+                                <span class="badge-user">{{ u|chill_entity_render_box }}</span>
                                 {% if not loop.last %}, {% endif %}
                             </span>
                         {% endfor %}
@@ -110,7 +111,7 @@
     </div>
 
     {% if displayContent is not defined or displayContent == 'short' %}
-        <div class="item-row column">
+        <div class="item-row column{% if displayFontSmall is defined and displayFontSmall == true %} smallfont{% endif %}">
             {% include 'ChillPersonBundle:AccompanyingCourseWork:_objectifs_results_evaluations.html.twig' with {
                 'displayContent': displayContent
             } %}

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

@@ -130,27 +130,20 @@
                         {% import "@ChillDocStore/Macro/macro.html.twig" as m %}
                         {% import "@ChillDocStore/Macro/macro_mimeicon.html.twig" as mm %}
 
-                        <div class="download mb-4 container">
+                        {% if e.documents|length > 0 %}
-                            {% if e.documents|length > 0 %}
+                            <table class="table mt-4 mx-auto">
-
                                 {% for d in e.documents %}
-                                    <div class="row">
+                                    <tr class="border-0">
-                                        <div class="col text-start">
+                                        <td class="border-0">{{ d.title }}</td>
-                                            {{ d.title }}
+                                        <td class="border-0">{{ mm.mimeIcon(d.storedObject.type) }}</td>
-                                        </div>
+                                        <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>
-                                        <div class="col-md-auto text-center">
+                                    </tr>
-                                            {{ mm.mimeIcon(d.storedObject.type) }}
-                                        </div>
-                                        <div class="col col-lg-4 text-end">
-                                            {{ d.storedObject|chill_document_button_group(d.title, is_granted('CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_UPDATE', w), {'small': true}) }}
-                                        </div>
-                                    </div>
                                 {% endfor %}
+                            </table>
+                        {% else %}
+                            <span class="chill-no-data-statement">{{ 'No document found'|trans }}</span>
+                        {% endif %}
                         
-                            {% else %}
-                                <span class="chill-no-data-statement">{{ 'No document found'|trans }}</span>
-                            {% endif %}
-                        </div>
 
                     {% endif %}
                 </td>

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

@@ -25,6 +25,7 @@
                     {% include '@ChillPerson/AccompanyingCourseWork/_item.html.twig' with {
                         'displayAction': true,
                         'displayContent': 'short',
+                        'displayFontSmall': true,
                         'itemBlocClass': ''
                     } %}
                 {% endfor %}

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

@@ -33,8 +33,10 @@
                         <span class="item-key">{{ 'Referrers'|trans ~ ' : ' }}</span>
                         {% for u in w.referrers %}
                             <span class="badge-user">{{ u|chill_entity_render_box }}</span>
-                            {% if not loop.last %}, {% endif %}
                         {% endfor %}
+                        {% if w.referrers|length == 0 %}
+                            <span class="chill-no-data-statement">{{ 'Not given'|trans }}</span>
+                        {% endif %}
                     </li>
                     {% endif %}
                     <li class="associated-persons">

src/Bundle/ChillPersonBundle/Resources/views/Person/list_with_period.html.twig

@@ -69,7 +69,7 @@
                         </div>
                         <div class="wl-col list">
                             <div class="user">
-                                {{ acp.user|chill_entity_render_box }}
+                                <span class="badge-user">{{ acp.user|chill_entity_render_box }}</span>
                             </div>
                         </div>
                     </div>

src/Bundle/ChillPersonBundle/Resources/views/Workflow/_evaluation.html.twig

@@ -21,7 +21,7 @@
             </h2>
         </div>
         <div class="item-row column">
-            <table class="obj-res-eval my-3" style="font-size: 110% !important;">
+            <table class="obj-res-eval my-3">
                 <thead>
                     <tr>
                         <th class="eval">

src/Bundle/ChillPersonBundle/Resources/views/Workflow/_evaluation_document.html.twig

@@ -49,7 +49,7 @@
                 </div>
             </div>
             <div class="item-row column">
-                <table class="obj-res-eval my-3" style="font-size: 110% !important;">
+                <table class="obj-res-eval my-3">
                     <thead>
                         <tr>
                             <th class="eval">