Merge branch 'master' into 456-doc-generation-active-status

.changes/unreleased/Feature-20251112-103224.yaml

@@ -1,6 +0,0 @@
-kind: Feature
-body: Make a calendar item on the 'mes rendez-vous' page clickable. Clicking will navigate to the edit page of the calendar item.
-time: 2025-11-12T10:32:24.916576945+01:00
-custom:
-    Issue: "461"
-    SchemaChange: No schema change

.changes/unreleased/Fixed-20251112-170025.yaml

@@ -1,6 +0,0 @@
-kind: Fixed
-body: Display calendar items for which an invite was accepted on the mes rendez-vous page
-time: 2025-11-12T17:00:25.58946528+01:00
-custom:
-    Issue: "463"
-    SchemaChange: No schema change

.changes/unreleased/Fixed-20251113-120125.yaml

@@ -1,7 +0,0 @@
-kind: Fixed
-body: |
-    Improve accessibility on login page
-time: 2025-11-13T12:01:25.488478771+01:00
-custom:
-    Issue: ""
-    SchemaChange: No schema change

.changes/unreleased/Fixed-20251119-133324.yaml

@@ -0,0 +1,6 @@
+kind: Fixed
+body: Insert name of file as the document title when uploading
+time: 2025-11-19T13:33:24.778116633+01:00
+custom:
+    Issue: ""
+    SchemaChange: No schema change

.changes/unreleased/Fixed-20251119-134802.yaml

@@ -0,0 +1,6 @@
+kind: Fixed
+body: Add missing path paramater 'id' for editing multiple participations
+time: 2025-11-19T13:48:02.078949572+01:00
+custom:
+    Issue: ""
+    SchemaChange: No schema change

.changes/unreleased/UX-20251030-153126.yaml

@@ -1,6 +0,0 @@
-kind: UX
-body: Remove the label if there is only one scope and no scope picking field is displayed.
-time: 2025-10-30T15:31:26.807444365+01:00
-custom:
-    Issue: "449"
-    SchemaChange: No schema change

.changes/unreleased/UX-20251103-161910.yaml

@@ -0,0 +1,6 @@
+kind: UX
+body: Display whether doc generation template is active or not in admin and order templates alphabetically
+time: 2025-11-03T16:19:10.051947925+01:00
+custom:
+    Issue: "456"
+    SchemaChange: No schema change

.changes/v4.8.0.md

@@ -0,0 +1,9 @@
+## v4.8.0 - 2025-11-17
+### Feature
+* ([#461](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/461)) Make a calendar item on the 'mes rendez-vous' page clickable. Clicking will navigate to the edit page of the calendar item.   
+### Fixed
+* ([#463](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/463)) Display calendar items for which an invite was accepted on the mes rendez-vous page   
+* Improve accessibility on login page
+   
+### UX
+* ([#449](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/449)) Remove the label if there is only one scope and no scope picking field is displayed.   

CHANGELOG.md

@@ -6,6 +6,16 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html),
 and is generated by [Changie](https://github.com/miniscruff/changie).
 
 
+## v4.8.0 - 2025-11-17
+### Feature
+* ([#461](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/461)) Make a calendar item on the 'mes rendez-vous' page clickable. Clicking will navigate to the edit page of the calendar item.   
+### Fixed
+* ([#463](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/463)) Display calendar items for which an invite was accepted on the mes rendez-vous page   
+* Improve accessibility on login page
+   
+### UX
+* ([#449](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/449)) Remove the label if there is only one scope and no scope picking field is displayed.   
+
 ## v4.7.0 - 2025-11-10
 ### Feature
 * ([#385](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/385)) Create invitation list in user menu   

src/Bundle/ChillDocGeneratorBundle/Controller/AdminDocGeneratorTemplateController.php

@@ -87,7 +87,7 @@ class AdminDocGeneratorTemplateController extends CRUDController
      */
     protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator)
     {
-        return $query->addSelect('JSON_EXTRACT(e.name, :lang) AS HIDDEN name_lang')
+        return $query->addSelect('REPLACE(JSON_EXTRACT(e.name, :lang), \' \', \'~\') AS HIDDEN name_lang')
             ->setParameter('lang', $request->getLocale())
             ->addOrderBy('name_lang', 'ASC');
     }

src/Bundle/ChillDocGeneratorBundle/Resources/views/DocGeneratorTemplate/index.html.twig

@@ -25,12 +25,24 @@
                             <div class="item-bloc">
                                 <div class="item-row">
                                     <div class="item-col" style="flex-basis:100%;">
-                                        <h2>{{ entity.name|localize_translatable_string }}</h2>
+                                        <h2>{{ entity.name|localize_translatable_string }} </h2>
+                                        <p style="margin-left: 1rem;"><span class="badge bg-chill-gray">
+                                            {% if entity.active %}
+                                                {{ 'admin.active'|trans }}
+                                            {% else %}
+                                                {{ 'admin.not active'|trans }}
+                                            {% endif %}
+                                        </span></p>
                                     </div>
                                 </div>
                                 <div class="item-row">
                                     <p><span class="badge bg-chill-green-dark">{{ contextManager.getContextByKey(entity.context).name|trans }}</span></p>
                                 </div>
+{#                                <div class="item-row">#}
+{#                                    <div class="item-col" style="flex-basis:100%;">#}
+{##}
+{#                                    </div>#}
+{#                                </div>#}
                                 <div class="item-row">
                                     <div class="item-col"></div>
                                     <ul class="record_actions item-col flex-shrink-1">

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

@@ -49,3 +49,7 @@ crud:
 
 
 Template file: Fichier modèle
+
+admin:
+    active: Actif
+    not active: Non-actif

src/Bundle/ChillEventBundle/Resources/views/Participation/edit-multiple.html.twig

@@ -50,7 +50,7 @@
 
     <ul class="record_actions">
         <li>
-            <a href="{{ path('chill_event__event_show', { 'event_id' : event.id } ) }}" class="btn btn-cancel">
+            <a href="{{ path('chill_event__event_show', { 'id' : event.id } ) }}" class="btn btn-cancel">
                 {{ 'Back to the event'|trans }}
             </a>
         </li>

src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue

@@ -293,11 +293,11 @@ function onInputDocumentTitle(event) {
     });
 }
 
-function addDocument({ stored_object, stored_object_version }) {
+function addDocument({ stored_object, stored_object_version, file_name }) {
     let document = {
         type: "accompanying_period_work_evaluation_document",
         storedObject: stored_object,
-        title: "Nouveau document",
+        title: file_name,
     };
     store.commit("addDocument", {
         key: props.evaluation.key,