Fix export group by center for persons without a center in CenterAggregator.php

Actions with a closing date in the future should be considered as 'still open'.

.changes/unreleased/Feature-20251210-032045.yaml

@@ -1,6 +0,0 @@
-kind: Feature
-body: 'Add filtering to admin lists: social actions, social issues, goals, results, and evaluations'
-time: 2025-12-10T03:20:45.135973502+01:00
-custom:
-    Issue: "478"
-    SchemaChange: No schema change

.changes/unreleased/Fixed-20251211-214908.yaml

@@ -1,7 +0,0 @@
-kind: Fixed
-body: |
-    Fix migration query after previous fix
-time: 2025-12-11T21:49:08.899926492+01:00
-custom:
-    Issue: "466"
-    SchemaChange: No schema change

.changes/unreleased/Fixed-20251218-102405.yaml

@@ -0,0 +1,6 @@
+kind: Fixed
+body: Fix the condition to display concerned persons in calendar list items.
+time: 2025-12-18T10:24:05.885090777+01:00
+custom:
+    Issue: "480"
+    SchemaChange: No schema change

.changes/unreleased/Fixed-20251218-110722.yaml

@@ -0,0 +1,6 @@
+kind: Fixed
+body: 'Fix ordering of social actions: actions with a closing date in the future should be considered as ''still open''.'
+time: 2025-12-18T11:07:22.699897317+01:00
+custom:
+    Issue: "481"
+    SchemaChange: No schema change

.changes/unreleased/Fixed-20251230-125728.yaml

@@ -0,0 +1,6 @@
+kind: Fixed
+body: Fix export group by center for persons without a center in CenterAggregator.php
+time: 2025-12-30T12:57:28.773521385+01:00
+custom:
+    Issue: "477"
+    SchemaChange: No schema change

.changes/v4.11.0.md

@@ -0,0 +1,9 @@
+## v4.11.0 - 2025-12-17
+### Feature
+* ([#478](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/478)) Add filtering to admin lists: social actions, social issues, goals, results, and evaluations   
+### Fixed
+* ([#466](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/466)) Fix migration query after previous fix
+   
+* Fix translation key/value
+
+Cannot start with % and should be wrapped in "".   

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.11.0 - 2025-12-17
+### Feature
+* ([#478](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/478)) Add filtering to admin lists: social actions, social issues, goals, results, and evaluations   
+### Fixed
+* ([#466](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/466)) Fix migration query after previous fix
+   
+* Fix translation key/value
+
+Cannot start with % and should be wrapped in "".   
+
 ## v4.10.1 - 2025-12-11
 ### Fixed
 * Fix missing translation variable in NewLocation component

src/Bundle/ChillCalendarBundle/Resources/views/Calendar/_list.html.twig

@@ -75,7 +75,7 @@
     </div>
 
     {% if calendar.comment.comment is not empty
-                    or calendar.users|length > 0
+                    or calendar.persons|length > 0
                     or calendar.thirdParties|length > 0
                     or calendar.users|length > 0 %}
                     <div class="item-row details separator">

src/Bundle/ChillJobBundle/src/Resources/translations/messages.nl.yml

@@ -189,14 +189,14 @@ crud:
         title_edit: Rapport "belemmering" bewerken
         title_delete: Belemmering verwijderen
         button_delete: Verwijderen
-        confirm_message_delete: %as_string% verwijderen?
+        confirm_message_delete: "%as_string% verwijderen?"
     cscv:
         title_new: Nieuw CV voor %person%
         title_view: CV voor %person%
         title_edit: CV bewerken
         title_delete: CV verwijderen
         button_delete: Verwijderen
-        confirm_message_delete: %as_string% verwijderen?
+        confirm_message_delete: "%as_string% verwijderen?"
         no_date: Geen datum aangegeven
         no_end_date: einddatum onbekend
         no_start_date: startdatum onbekend
@@ -206,7 +206,7 @@ crud:
         title_edit: Immersie bewerken
         title_delete: Immersie verwijderen
         button_delete: Verwijderen
-        confirm_message_delete: %as_string% verwijderen?
+        confirm_message_delete: "%as_string% verwijderen?"
     projet_prof:
         title_new: Nieuw professioneel project voor %person%
         title_view: Professioneel project voor %person%

src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/CenterAggregator.php

@@ -19,6 +19,7 @@ use Chill\MainBundle\Service\RollingDate\RollingDateConverterInterface;
 use Chill\PersonBundle\Export\Declarations;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 final readonly class CenterAggregator implements AggregatorInterface
 {
@@ -27,6 +28,7 @@ final readonly class CenterAggregator implements AggregatorInterface
     public function __construct(
         private CenterRepositoryInterface $centerRepository,
         private RollingDateConverterInterface $rollingDateConverter,
+        private TranslatorInterface $translator,
     ) {}
 
     public function buildForm(FormBuilderInterface $builder): void
@@ -62,7 +64,7 @@ final readonly class CenterAggregator implements AggregatorInterface
     {
         return function (int|string|null $value) {
             if (null === $value || '' === $value) {
-                return '';
+                return $this->translator->trans('person.export.aggregator.by_center.no_center');
             }
 
             if ('_header' === $value) {
@@ -94,14 +96,17 @@ final readonly class CenterAggregator implements AggregatorInterface
         $atDate = 'pers_center_agg_at_date';
 
         $qb->leftJoin('person.centerHistory', $alias);
-        $qb
+        $qb->andWhere(
-            ->andWhere(
+            $qb->expr()->orX(
+                $qb->expr()->isNull($alias.'.id'),
+                $qb->expr()->andX(
                     $qb->expr()->lte($alias.'.startDate', ':'.$atDate),
-            )->andWhere(
                     $qb->expr()->orX(
                         $qb->expr()->isNull($alias.'.endDate'),
                         $qb->expr()->gt($alias.'.endDate', ':'.$atDate)
                     )
+                )
+            )
         );
         $qb->setParameter($atDate, $this->rollingDateConverter->convert($data['at_date']));
 

src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkRepository.php

@@ -136,11 +136,14 @@ class AccompanyingPeriodWorkRepository implements ObjectRepository
         }
 
         // set limit and offset
-        $sql .= " ORDER BY
+        $sql .= ' ORDER BY
-                     CASE WHEN w.enddate IS NULL THEN '-infinity'::timestamp ELSE 'infinity'::timestamp END ASC,
+                 CASE
+                     WHEN w.enddate IS NULL OR w.enddate > CURRENT_DATE THEN 0
+                     ELSE 1
+                 END ASC,
                  w.startdate DESC,
                  w.enddate DESC,
-                     w.id DESC";
+                 w.id DESC';
 
         $sql .= ' LIMIT :limit OFFSET :offset';
 

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

@@ -103,6 +103,11 @@ Employment status: Situation professionelle
 Administrative status: Situation administrative
 
 person:
+    # trans key according to new conventions
+    export:
+        aggregator:
+            by_center:
+                no_center: Sans territoire
     Identifiers: Identifiants