Merge remote-tracking branch 'origin/master' into rector/rules-up-to-php80

Conflicts:
	src/Bundle/ChillActivityBundle/Controller/ActivityController.php
	src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/DateAggregator.php
	src/Bundle/ChillActivityBundle/Menu/PersonMenuBuilder.php
	src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepository.php
	src/Bundle/ChillActivityBundle/Service/DocGenerator/ActivityContext.php
	src/Bundle/ChillCalendarBundle/Command/MapAndSubscribeUserCalendarCommand.php
	src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/MSGraphUserRepository.php
	src/Bundle/ChillDocStoreBundle/Controller/DocumentAccompanyingCourseController.php
	src/Bundle/ChillDocStoreBundle/Controller/DocumentPersonController.php
	src/Bundle/ChillDocStoreBundle/Repository/PersonDocumentACLAwareRepository.php
	src/Bundle/ChillEventBundle/Search/EventSearch.php
	src/Bundle/ChillMainBundle/Controller/ExportController.php
	src/Bundle/ChillMainBundle/Controller/PermissionsGroupController.php
	src/Bundle/ChillMainBundle/Cron/CronManager.php
	src/Bundle/ChillMainBundle/Entity/CronJobExecution.php
	src/Bundle/ChillMainBundle/Export/ExportManager.php
	src/Bundle/ChillMainBundle/Form/Type/Export/PickCenterType.php
	src/Bundle/ChillMainBundle/Form/Type/Listing/FilterOrderType.php
	src/Bundle/ChillMainBundle/Repository/NotificationRepository.php
	src/Bundle/ChillMainBundle/Templating/Listing/FilterOrderHelper.php
	src/Bundle/ChillMainBundle/Templating/Listing/FilterOrderHelperBuilder.php
	src/Bundle/ChillMainBundle/Templating/Listing/FilterOrderHelperFactory.php
	src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseWorkController.php
	src/Bundle/ChillPersonBundle/Controller/SocialWorkSocialActionApiController.php
	src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/AgeAggregator.php
	src/Bundle/ChillPersonBundle/Export/Export/ListAccompanyingPeriod.php
	src/Bundle/ChillPersonBundle/Export/Export/ListHouseholdInPeriod.php
	src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodACLAwareRepository.php
	src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodVoter.php
	src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodContext.php
	src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkEvaluationContext.php
	src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContext.php
	src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadReports.php
	src/Bundle/ChillTaskBundle/Controller/SingleTaskController.php

src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/AdministrativeLocationAggregator.php

@@ -49,6 +49,10 @@ class AdministrativeLocationAggregator implements AggregatorInterface
     {
         // no form
     }
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
 
     public function getLabels($key, array $values, $data)
     {

src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ByActionNumberAggregator.php

@@ -39,6 +39,10 @@ class ByActionNumberAggregator implements AggregatorInterface
     {
         // No form needed
     }
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
 
     public function getLabels($key, array $values, $data)
     {

src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ClosingMotiveAggregator.php

@@ -44,6 +44,10 @@ class ClosingMotiveAggregator implements AggregatorInterface
     {
         // no form
     }
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
 
     public function getLabels($key, array $values, $data)
     {

src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ConfidentialAggregator.php

@@ -44,6 +44,10 @@ class ConfidentialAggregator implements AggregatorInterface
     {
         // no form
     }
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
 
     public function getLabels($key, array $values, $data)
     {

src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/CreatorJobAggregator.php

@@ -49,6 +49,10 @@ class CreatorJobAggregator implements AggregatorInterface
     {
         // No form needed
     }
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
 
     public function getLabels($key, array $values, $data)
     {

src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/DurationAggregator.php

@@ -68,6 +68,10 @@ final class DurationAggregator implements AggregatorInterface
             'expanded' => true,
         ]);
     }
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
 
     public function getLabels($key, array $values, $data)
     {

src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/EmergencyAggregator.php

@@ -44,6 +44,10 @@ class EmergencyAggregator implements AggregatorInterface
     {
         // no form
     }
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
 
     public function getLabels($key, array $values, $data)
     {

src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/EvaluationAggregator.php

@@ -53,6 +53,10 @@ final class EvaluationAggregator implements AggregatorInterface
     {
         // no form
     }
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
 
     public function getLabels($key, array $values, $data)
     {

src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/GeographicalUnitStatAggregator.php

@@ -86,7 +86,7 @@ final class GeographicalUnitStatAggregator implements AggregatorInterface
             'acp_geog_units'
         );
 
-        $qb->andWhere($qb->expr()->eq('acp_geog_units.layer', ':acp_geog_unit_layer'));
+        $qb->andWhere($qb->expr()->in('acp_geog_units.layer', ':acp_geog_unit_layer'));
 
         $qb->setParameter('acp_geog_unit_layer', $data['level']);
 
@@ -109,7 +109,6 @@ final class GeographicalUnitStatAggregator implements AggregatorInterface
             ->add('date_calc', PickRollingDateType::class, [
                 'label' => 'Compute geographical location at date',
                 'required' => true,
-                'data' => new RollingDate(RollingDate::T_TODAY),
             ])
             ->add('level', EntityType::class, [
                 'label' => 'Geographical layer',
@@ -117,8 +116,14 @@ final class GeographicalUnitStatAggregator implements AggregatorInterface
                 'class' => GeographicalUnitLayer::class,
                 'choices' => $this->geographicalUnitLayerRepository->findAllHavingUnits(),
                 'choice_label' => fn (GeographicalUnitLayer $item) => $this->translatableStringHelper->localize($item->getName()),
+                'multiple' => true,
+                'expanded' => true,
             ]);
     }
+    public function getFormDefaultData(): array
+    {
+        return ['date_calc' => new RollingDate(RollingDate::T_TODAY)];
+    }
 
     public function getLabels($key, array $values, $data)
     {

src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/IntensityAggregator.php

@@ -44,6 +44,10 @@ class IntensityAggregator implements AggregatorInterface
     {
         // no form
     }
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
 
     public function getLabels($key, array $values, $data)
     {

src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/JobWorkingOnCourseAggregator.php

@@ -0,0 +1,100 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators;
+
+use Chill\MainBundle\Export\AggregatorInterface;
+use Chill\MainBundle\Repository\UserJobRepositoryInterface;
+use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
+use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodInfo;
+use Chill\PersonBundle\Export\Declarations;
+use Doctrine\ORM\Query\Expr\Join;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\FormBuilderInterface;
+
+final readonly class JobWorkingOnCourseAggregator implements AggregatorInterface
+{
+    private const COLUMN_NAME = 'user_working_on_course_job_id';
+
+    public function __construct(
+        private UserJobRepositoryInterface $userJobRepository,
+        private TranslatableStringHelperInterface $translatableStringHelper,
+    ) {
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        // nothing to add here
+    }
+
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
+
+    public function getLabels($key, array $values, $data): \Closure
+    {
+        return function (int|string|null $jobId) {
+            if (null === $jobId || '' === $jobId) {
+                return '';
+            }
+
+            if ('_header' === $jobId) {
+                return 'export.aggregator.course.by_job_working.job';
+            }
+
+            if (null === $job = $this->userJobRepository->find((int) $jobId)) {
+                return '';
+            }
+
+            return $this->translatableStringHelper->localize($job->getLabel());
+        };
+    }
+
+    public function getQueryKeys($data)
+    {
+        return [self::COLUMN_NAME];
+    }
+
+    public function getTitle()
+    {
+        return 'export.aggregator.course.by_job_working.title';
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        if (!in_array('acpinfo', $qb->getAllAliases(), true)) {
+            $qb->leftJoin(
+                AccompanyingPeriodInfo::class,
+                'acpinfo',
+                Join::WITH,
+                'acp.id = IDENTITY(acpinfo.accompanyingPeriod)'
+            );
+        }
+
+        if (!in_array('acpinfo_user', $qb->getAllAliases(), true)) {
+            $qb->leftJoin('acpinfo.user', 'acpinfo_user');
+        }
+
+        $qb->addSelect('IDENTITY(acpinfo_user.userJob) AS ' . self::COLUMN_NAME);
+        $qb->addGroupBy(self::COLUMN_NAME);
+    }
+
+    public function applyOn()
+    {
+        return Declarations::ACP_TYPE;
+    }
+}

src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/OriginAggregator.php

@@ -56,6 +56,10 @@ final class OriginAggregator implements AggregatorInterface
     {
         // no form
     }
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
 
     public function getLabels($key, array $values, $data)
     {

src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ReferrerAggregator.php

@@ -69,11 +69,14 @@ final class ReferrerAggregator implements AggregatorInterface
     {
         $builder
             ->add('date_calc', PickRollingDateType::class, [
-                'data' => new RollingDate(RollingDate::T_TODAY),
                 'label' => 'export.aggregator.course.by_referrer.Computation date for referrer',
                 'required' => true,
             ]);
     }
+    public function getFormDefaultData(): array
+    {
+        return ['date_calc' => new RollingDate(RollingDate::T_TODAY)];
+    }
 
     public function getLabels($key, array $values, $data)
     {

src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ReferrerScopeAggregator.php

@@ -76,11 +76,14 @@ class ReferrerScopeAggregator implements AggregatorInterface
     public function buildForm(FormBuilderInterface $builder)
     {
         $builder->add('date_calc', PickRollingDateType::class, [
-            'data' => new RollingDate(RollingDate::T_TODAY),
             'label' => 'export.aggregator.course.by_user_scope.Computation date for referrer',
             'required' => true,
         ]);
     }
+    public function getFormDefaultData(): array
+    {
+        return ['date_calc' => new RollingDate(RollingDate::T_TODAY)];
+    }
 
     public function getLabels($key, array $values, $data)
     {

src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/RequestorAggregator.php

@@ -65,6 +65,10 @@ final class RequestorAggregator implements AggregatorInterface
     {
         // no form
     }
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
 
     public function getLabels($key, array $values, $data)
     {

src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ScopeAggregator.php

@@ -49,6 +49,10 @@ final class ScopeAggregator implements AggregatorInterface
     {
         // no form
     }
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
 
     public function getLabels($key, array $values, $data)
     {

src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ScopeWorkingOnCourseAggregator.php

@@ -0,0 +1,101 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators;
+
+use Chill\MainBundle\Export\AggregatorInterface;
+use Chill\MainBundle\Repository\ScopeRepositoryInterface;
+use Chill\MainBundle\Repository\UserJobRepositoryInterface;
+use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
+use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodInfo;
+use Chill\PersonBundle\Export\Declarations;
+use Doctrine\ORM\Query\Expr\Join;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\FormBuilderInterface;
+
+final readonly class ScopeWorkingOnCourseAggregator implements AggregatorInterface
+{
+    private const COLUMN_NAME = 'user_working_on_course_scope_id';
+
+    public function __construct(
+        private ScopeRepositoryInterface $scopeRepository,
+        private TranslatableStringHelperInterface $translatableStringHelper,
+    ) {
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        // nothing to add here
+    }
+
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
+
+    public function getLabels($key, array $values, $data): \Closure
+    {
+        return function (int|string|null $scopeId) {
+            if (null === $scopeId || '' === $scopeId) {
+                return '';
+            }
+
+            if ('_header' === $scopeId) {
+                return 'export.aggregator.course.by_scope_working.scope';
+            }
+
+            if (null === $scope = $this->scopeRepository->find((int) $scopeId)) {
+                return '';
+            }
+
+            return $this->translatableStringHelper->localize($scope->getName());
+        };
+    }
+
+    public function getQueryKeys($data)
+    {
+        return [self::COLUMN_NAME];
+    }
+
+    public function getTitle()
+    {
+        return 'export.aggregator.course.by_scope_working.title';
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        if (!in_array('acpinfo', $qb->getAllAliases(), true)) {
+            $qb->leftJoin(
+                AccompanyingPeriodInfo::class,
+                'acpinfo',
+                Join::WITH,
+                'acp.id = IDENTITY(acpinfo.accompanyingPeriod)'
+            );
+        }
+
+        if (!in_array('acpinfo_user', $qb->getAllAliases(), true)) {
+            $qb->leftJoin('acpinfo.user', 'acpinfo_user');
+        }
+
+        $qb->addSelect('IDENTITY(acpinfo_user.mainScope) AS ' . self::COLUMN_NAME);
+        $qb->addGroupBy(self::COLUMN_NAME);
+    }
+
+    public function applyOn()
+    {
+        return Declarations::ACP_TYPE;
+    }
+}

src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/SocialActionAggregator.php

@@ -50,6 +50,10 @@ final class SocialActionAggregator implements AggregatorInterface
     {
         // no form
     }
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
 
     public function getLabels($key, array $values, $data)
     {

src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/SocialIssueAggregator.php

@@ -50,6 +50,10 @@ final class SocialIssueAggregator implements AggregatorInterface
     {
         // no form
     }
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
 
     public function getLabels($key, array $values, $data)
     {

src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/StepAggregator.php

@@ -68,9 +68,11 @@ final class StepAggregator implements AggregatorInterface
 
     public function buildForm(FormBuilderInterface $builder)
     {
-        $builder->add('on_date', PickRollingDateType::class, [
-            'data' => new RollingDate(RollingDate::T_TODAY),
-        ]);
+        $builder->add('on_date', PickRollingDateType::class, []);
+    }
+    public function getFormDefaultData(): array
+    {
+        return ['on_date' => new RollingDate(RollingDate::T_TODAY)];
     }
 
     public function getLabels($key, array $values, $data)
@@ -78,13 +80,19 @@ final class StepAggregator implements AggregatorInterface
         return function ($value): string {
             switch ($value) {
                 case AccompanyingPeriod::STEP_DRAFT:
-                    return $this->translator->trans('Draft');
+                    return $this->translator->trans('course.draft');
 
                 case AccompanyingPeriod::STEP_CONFIRMED:
-                    return $this->translator->trans('Confirmed');
+                    return $this->translator->trans('course.confirmed');
 
                 case AccompanyingPeriod::STEP_CLOSED:
-                    return $this->translator->trans('Closed');
+                    return $this->translator->trans('course.closed');
+
+                case AccompanyingPeriod::STEP_CONFIRMED_INACTIVE_SHORT:
+                    return $this->translator->trans('course.inactive_short');
+
+                case AccompanyingPeriod::STEP_CONFIRMED_INACTIVE_LONG:
+                    return $this->translator->trans('course.inactive_long');
 
                 case '_header':
                     return 'Step';

src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/UserJobAggregator.php

@@ -49,6 +49,10 @@ final class UserJobAggregator implements AggregatorInterface
     {
         // no form
     }
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
 
     public function getLabels($key, array $values, $data)
     {

src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/UserWorkingOnCourseAggregator.php

@@ -0,0 +1,100 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators;
+
+use Chill\MainBundle\Export\AggregatorInterface;
+use Chill\MainBundle\Repository\UserRepositoryInterface;
+use Chill\MainBundle\Templating\Entity\UserRender;
+use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodInfo;
+use Chill\PersonBundle\Export\Declarations;
+use Doctrine\ORM\Query\Expr\Join;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\FormBuilderInterface;
+
+final readonly class UserWorkingOnCourseAggregator implements AggregatorInterface
+{
+    private const COLUMN_NAME = 'user_working_on_course_user_id';
+
+    public function __construct(
+        private UserRender $userRender,
+        private UserRepositoryInterface $userRepository,
+    ) {
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        // nothing to add here
+    }
+
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
+
+    public function getLabels($key, array $values, $data): \Closure
+    {
+        return function (int|string|null $userId) {
+            if (null === $userId || '' === $userId) {
+                return '';
+            }
+
+            if ('_header' === $userId) {
+                return 'export.aggregator.course.by_user_working.user';
+            }
+
+            if (null === $user = $this->userRepository->find((int) $userId)) {
+                return '';
+            }
+
+            return $this->userRender->renderString($user, []);
+        };
+    }
+
+    public function getQueryKeys($data)
+    {
+        return [self::COLUMN_NAME];
+    }
+
+    public function getTitle()
+    {
+        return 'export.aggregator.course.by_user_working.title';
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        if (!in_array('acpinfo', $qb->getAllAliases(), true)) {
+            $qb->leftJoin(
+                AccompanyingPeriodInfo::class,
+                'acpinfo',
+                Join::WITH,
+                'acp.id = IDENTITY(acpinfo.accompanyingPeriod)'
+            );
+        }
+
+        if (!in_array('acpinfo_user', $qb->getAllAliases(), true)) {
+            $qb->leftJoin('acpinfo.user', 'acpinfo_user');
+        }
+
+        $qb->addSelect('acpinfo_user.id AS ' . self::COLUMN_NAME);
+        $qb->addGroupBy('acpinfo_user.id');
+    }
+
+    public function applyOn()
+    {
+        return Declarations::ACP_TYPE;
+    }
+}

src/Bundle/ChillPersonBundle/Export/Aggregator/EvaluationAggregators/ByEndDateAggregator.php

@@ -62,9 +62,12 @@ class ByEndDateAggregator implements AggregatorInterface
             'multiple' => false,
             'expanded' => true,
             'empty_data' => self::DEFAULT_CHOICE,
-            'data' => self::DEFAULT_CHOICE,
         ]);
     }
+    public function getFormDefaultData(): array
+    {
+        return ['frequency' => self::DEFAULT_CHOICE];
+    }
 
     public function getLabels($key, array $values, $data)
     {

src/Bundle/ChillPersonBundle/Export/Aggregator/EvaluationAggregators/ByMaxDateAggregator.php

@@ -62,9 +62,12 @@ class ByMaxDateAggregator implements AggregatorInterface
             'multiple' => false,
             'expanded' => true,
             'empty_data' => self::DEFAULT_CHOICE,
-            'data' => self::DEFAULT_CHOICE,
         ]);
     }
+    public function getFormDefaultData(): array
+    {
+        return ['frequency' => self::DEFAULT_CHOICE];
+    }
 
     public function getLabels($key, array $values, $data)
     {

src/Bundle/ChillPersonBundle/Export/Aggregator/EvaluationAggregators/ByStartDateAggregator.php

@@ -62,9 +62,12 @@ class ByStartDateAggregator implements AggregatorInterface
             'multiple' => false,
             'expanded' => true,
             'empty_data' => self::DEFAULT_CHOICE,
-            'data' => self::DEFAULT_CHOICE,
         ]);
     }
+    public function getFormDefaultData(): array
+    {
+        return ['frequency' => self::DEFAULT_CHOICE];
+    }
 
     public function getLabels($key, array $values, $data)
     {

src/Bundle/ChillPersonBundle/Export/Aggregator/EvaluationAggregators/EvaluationTypeAggregator.php

@@ -44,6 +44,10 @@ class EvaluationTypeAggregator implements AggregatorInterface
     {
         // no form
     }
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
 
     public function getLabels($key, array $values, $data)
     {

src/Bundle/ChillPersonBundle/Export/Aggregator/EvaluationAggregators/HavingEndDateAggregator.php

@@ -45,6 +45,10 @@ class HavingEndDateAggregator implements AggregatorInterface
     {
         // No form needed
     }
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
 
     public function getLabels($key, array $values, $data)
     {

src/Bundle/ChillPersonBundle/Export/Aggregator/HouseholdAggregators/ChildrenNumberAggregator.php

@@ -64,9 +64,11 @@ class ChildrenNumberAggregator implements AggregatorInterface
 
     public function buildForm(FormBuilderInterface $builder)
     {
-        $builder->add('on_date', PickRollingDateType::class, [
-            'data' => new RollingDate(RollingDate::T_TODAY),
-        ]);
+        $builder->add('on_date', PickRollingDateType::class, []);
+    }
+    public function getFormDefaultData(): array
+    {
+        return ['on_date' => new RollingDate(RollingDate::T_TODAY)];
     }
 
     public function getLabels($key, array $values, $data)

src/Bundle/ChillPersonBundle/Export/Aggregator/HouseholdAggregators/CompositionAggregator.php

@@ -65,9 +65,11 @@ class CompositionAggregator implements AggregatorInterface
 
     public function buildForm(FormBuilderInterface $builder)
     {
-        $builder->add('on_date', PickRollingDateType::class, [
-            'data' => new RollingDate(RollingDate::T_TODAY),
-        ]);
+        $builder->add('on_date', PickRollingDateType::class, []);
+    }
+    public function getFormDefaultData(): array
+    {
+        return ['on_date' => new RollingDate(RollingDate::T_TODAY)];
     }
 
     public function getLabels($key, array $values, $data)

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

@@ -13,17 +13,18 @@ namespace Chill\PersonBundle\Export\Aggregator\PersonAggregators;
 
 use Chill\MainBundle\Export\AggregatorInterface;
 use Chill\MainBundle\Export\ExportElementValidatedInterface;
-use DateTime;
+use Chill\MainBundle\Form\Type\PickRollingDateType;
+use Chill\MainBundle\Service\RollingDate\RollingDate;
+use Chill\MainBundle\Service\RollingDate\RollingDateConverterInterface;
 use Doctrine\ORM\QueryBuilder;
-use Symfony\Component\Form\Extension\Core\Type\DateType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
-use Symfony\Contracts\Translation\TranslatorInterface;
 
-final class AgeAggregator implements AggregatorInterface, ExportElementValidatedInterface
+final readonly class AgeAggregator implements AggregatorInterface, ExportElementValidatedInterface
 {
-    public function __construct(private TranslatorInterface $translator)
-    {
+    public function __construct(
+        private RollingDateConverterInterface $rollingDateConverter,
+    ) {
     }
 
     public function addRole(): ?string
@@ -34,7 +35,7 @@ final class AgeAggregator implements AggregatorInterface, ExportElementValidated
     public function alterQuery(QueryBuilder $qb, $data)
     {
         $qb->addSelect('DATE_DIFF(:date_age_calculation, person.birthdate)/365 as person_age');
-        $qb->setParameter('date_age_calculation', $data['date_age_calculation']);
+        $qb->setParameter('date_age_calculation', $this->rollingDateConverter->convert($data['date_age_calculation']));
         $qb->addGroupBy('person_age');
     }
 
@@ -45,14 +46,14 @@ final class AgeAggregator implements AggregatorInterface, ExportElementValidated
 
     public function buildForm(FormBuilderInterface $builder)
     {
-        $builder->add('date_age_calculation', DateType::class, [
+        $builder->add('date_age_calculation', PickRollingDateType::class, [
             'label' => 'Calculate age in relation to this date',
-            'data' => new DateTime(),
-            'attr' => ['class' => 'datepicker'],
-            'widget' => 'single_text',
-            'format' => 'dd-MM-yyyy',
         ]);
     }
+    public function getFormDefaultData(): array
+    {
+        return ['date_age_calculation' => new RollingDate(RollingDate::T_TODAY)];
+    }
 
     public function getLabels($key, array $values, $data)
     {
@@ -61,11 +62,7 @@ final class AgeAggregator implements AggregatorInterface, ExportElementValidated
                 return 'Age';
             }
 
-            if (null === $value) {
-                return $this->translator->trans('without data');
-            }
-
-            return $value;
+            return $value ?? '';
         };
     }
 

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

@@ -82,9 +82,12 @@ class ByHouseholdCompositionAggregator implements AggregatorInterface
     {
         $builder->add('date_calc', PickRollingDateType::class, [
             'label' => 'export.aggregator.person.by_household_composition.Calc date',
-            'data' => new RollingDate(RollingDate::T_TODAY),
         ]);
     }
+    public function getFormDefaultData(): array
+    {
+        return ['date_calc' => new RollingDate(RollingDate::T_TODAY)];
+    }
 
     public function getLabels($key, array $values, $data)
     {

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

@@ -0,0 +1,103 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\PersonBundle\Export\Aggregator\PersonAggregators;
+
+use Chill\MainBundle\Export\AggregatorInterface;
+use Chill\MainBundle\Form\Type\PickRollingDateType;
+use Chill\MainBundle\Repository\CenterRepositoryInterface;
+use Chill\MainBundle\Service\RollingDate\RollingDate;
+use Chill\MainBundle\Service\RollingDate\RollingDateConverterInterface;
+use Chill\PersonBundle\Export\Declarations;
+use Closure;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\FormBuilderInterface;
+
+final readonly class CenterAggregator implements AggregatorInterface
+{
+    private const COLUMN_NAME = 'person_center_aggregator';
+
+    public function __construct(
+        private CenterRepositoryInterface $centerRepository,
+        private RollingDateConverterInterface $rollingDateConverter,
+    ) {
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        $builder->add('at_date', PickRollingDateType::class, [
+            'label' => 'export.aggregator.person.by_center.at_date',
+        ]);
+    }
+
+    public function getFormDefaultData(): array
+    {
+        return [
+            'at_date' => new RollingDate(RollingDate::T_TODAY)
+        ];
+    }
+
+    public function getLabels($key, array $values, $data): Closure
+    {
+        return function (int|string|null $value) {
+            if (null === $value || '' === $value) {
+                return '';
+            }
+
+            if ('_header' === $value) {
+                return 'export.aggregator.person.by_center.center';
+            }
+
+            return (string) $this->centerRepository->find((int) $value)?->getName();
+        };
+    }
+
+    public function getQueryKeys($data)
+    {
+        return [self::COLUMN_NAME];
+    }
+
+    public function getTitle()
+    {
+        return 'export.aggregator.person.by_center.title';
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        $alias = 'pers_center_agg';
+        $atDate = 'pers_center_agg_at_date';
+
+        $qb->leftJoin('person.centerHistory', $alias);
+        $qb
+            ->andWhere(
+                $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']));
+
+        $qb->addSelect("IDENTITY({$alias}.center) AS " . self::COLUMN_NAME);
+        $qb->addGroupBy(self::COLUMN_NAME);
+    }
+
+    public function applyOn()
+    {
+        return Declarations::PERSON_TYPE;
+    }
+}

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

@@ -96,6 +96,10 @@ final class CountryOfBirthAggregator implements AggregatorInterface, ExportEleme
             'multiple' => false,
         ]);
     }
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
 
     public function getLabels($key, array $values, $data)
     {

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

@@ -45,6 +45,10 @@ final class GenderAggregator implements AggregatorInterface
     public function buildForm(FormBuilderInterface $builder)
     {
     }
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
 
     public function getLabels($key, array $values, $data)
     {

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

@@ -81,7 +81,6 @@ class GeographicalUnitAggregator implements AggregatorInterface
             ->add('date_calc', PickRollingDateType::class, [
                 'label' => 'Address valid at this date',
                 'required' => true,
-                'data' => new RollingDate(RollingDate::T_TODAY),
             ])
             ->add('level', EntityType::class, [
                 'label' => 'Geographical layer',
@@ -89,8 +88,14 @@ class GeographicalUnitAggregator implements AggregatorInterface
                 'class' => GeographicalUnitLayer::class,
                 'choices' => $this->geographicalUnitLayerRepository->findAllHavingUnits(),
                 'choice_label' => fn (GeographicalUnitLayer $item) => $this->translatableStringHelper->localize($item->getName()),
+                'multiple' => true,
+                'expanded' => true,
             ]);
     }
+    public function getFormDefaultData(): array
+    {
+        return ['date_calc' => new RollingDate(RollingDate::T_TODAY)];
+    }
 
     public static function getDefaultAlias(): string
     {

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

@@ -74,9 +74,12 @@ final class HouseholdPositionAggregator implements AggregatorInterface, ExportEl
     {
         $builder->add('date_position', PickRollingDateType::class, [
             'label' => 'Household position in relation to this date',
-            'data' => new RollingDate(RollingDate::T_TODAY),
         ]);
     }
+    public function getFormDefaultData(): array
+    {
+        return ['date_position' => new RollingDate(RollingDate::T_TODAY)];
+    }
 
     public function getLabels($key, array $values, $data)
     {

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

@@ -50,6 +50,11 @@ final class MaritalStatusAggregator implements AggregatorInterface
         // no form
     }
 
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
+
     public function getLabels($key, array $values, $data)
     {
         return function ($value): string {

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

@@ -91,6 +91,13 @@ final class NationalityAggregator implements AggregatorInterface, ExportElementV
         ]);
     }
 
+    public function getFormDefaultData(): array
+    {
+        return [
+            'group_by_level' => 'country',
+        ];
+    }
+
     public function getLabels($key, array $values, $data)
     {
         $labels = [];

src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/ActionTypeAggregator.php

@@ -59,6 +59,10 @@ final class ActionTypeAggregator implements AggregatorInterface
     {
         // no form
     }
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
 
     public function getLabels($key, array $values, $data)
     {

src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/CurrentActionAggregator.php

@@ -48,6 +48,10 @@ class CurrentActionAggregator implements AggregatorInterface
     {
         // No form needed
     }
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
 
     public function getLabels($key, array $values, $data)
     {

src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/GoalAggregator.php

@@ -49,6 +49,10 @@ final class GoalAggregator implements AggregatorInterface
     {
         // no form
     }
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
 
     public function getLabels($key, array $values, $data)
     {

src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/GoalResultAggregator.php

@@ -56,6 +56,10 @@ class GoalResultAggregator implements AggregatorInterface
     {
         // no form
     }
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
 
     public function getLabels($key, array $values, $data)
     {

src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/JobAggregator.php

@@ -49,6 +49,10 @@ final class JobAggregator implements AggregatorInterface
     {
         // no form
     }
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
 
     public function getLabels($key, array $values, $data)
     {

src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/ReferrerAggregator.php

@@ -49,6 +49,10 @@ final class ReferrerAggregator implements AggregatorInterface
     {
         // no form
     }
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
 
     public function getLabels($key, array $values, $data)
     {

src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/ResultAggregator.php

@@ -49,6 +49,10 @@ final class ResultAggregator implements AggregatorInterface
     {
         // no form
     }
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
 
     public function getLabels($key, array $values, $data)
     {

src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/ScopeAggregator.php

@@ -49,6 +49,10 @@ final class ScopeAggregator implements AggregatorInterface
     {
         // no form
     }
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
 
     public function getLabels($key, array $values, $data)
     {

src/Bundle/ChillPersonBundle/Export/Export/CountAccompanyingCourse.php

@@ -39,6 +39,10 @@ class CountAccompanyingCourse implements ExportInterface, GroupedExportInterface
     {
         // Nothing to add here
     }
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
 
     public function getAllowedFormattersTypes(): array
     {
@@ -97,7 +101,6 @@ class CountAccompanyingCourse implements ExportInterface, GroupedExportInterface
             ->andWhere('acp.step != :count_acp_step')
             ->leftJoin('acp.participations', 'acppart')
             ->leftJoin('acppart.person', 'person')
-            ->andWhere('acppart.startDate != acppart.endDate OR acppart.endDate IS NULL')
             ->andWhere(
                 $qb->expr()->exists(
                     'SELECT 1 FROM ' . PersonCenterHistory::class . ' acl_count_person_history WHERE acl_count_person_history.person = person

src/Bundle/ChillPersonBundle/Export/Export/CountAccompanyingPeriodWork.php

@@ -34,6 +34,10 @@ class CountAccompanyingPeriodWork implements ExportInterface, GroupedExportInter
     {
         // No form necessary?
     }
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
 
     public function getAllowedFormattersTypes(): array
     {
@@ -93,7 +97,6 @@ class CountAccompanyingPeriodWork implements ExportInterface, GroupedExportInter
             ->join('acpw.accompanyingPeriod', 'acp')
             ->join('acp.participations', 'acppart')
             ->join('acppart.person', 'person')
-            ->andWhere('acppart.startDate != acppart.endDate OR acppart.endDate IS NULL')
             ->andWhere(
                 $qb->expr()->exists(
                     'SELECT 1 FROM ' . PersonCenterHistory::class . ' acl_count_person_history WHERE acl_count_person_history.person = person

src/Bundle/ChillPersonBundle/Export/Export/CountEvaluation.php

@@ -33,6 +33,10 @@ class CountEvaluation implements ExportInterface, GroupedExportInterface
     {
         // TODO: Implement buildForm() method.
     }
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
 
     public function getAllowedFormattersTypes(): array
     {
@@ -93,7 +97,6 @@ class CountEvaluation implements ExportInterface, GroupedExportInterface
             ->join('acpw.accompanyingPeriod', 'acp')
             ->join('acp.participations', 'acppart')
             ->join('acppart.person', 'person')
-            ->andWhere('acppart.startDate != acppart.endDate OR acppart.endDate IS NULL')
             ->andWhere(
                 $qb->expr()->exists(
                     'SELECT 1 FROM ' . PersonCenterHistory::class . ' acl_count_person_history WHERE acl_count_person_history.person = person

src/Bundle/ChillPersonBundle/Export/Export/CountHousehold.php

@@ -38,11 +38,14 @@ class CountHousehold implements ExportInterface, GroupedExportInterface
     {
         $builder
             ->add('calc_date', PickRollingDateType::class, [
-                'data' => new RollingDate(RollingDate::T_TODAY),
                 'label' => self::TR_PREFIX . 'Date of calculation of household members',
                 'required' => false,
             ]);
     }
+    public function getFormDefaultData(): array
+    {
+        return ['calc_date' => new RollingDate(RollingDate::T_TODAY)];
+    }
 
     public function getAllowedFormattersTypes(): array
     {

src/Bundle/ChillPersonBundle/Export/Export/CountPerson.php

@@ -34,6 +34,11 @@ class CountPerson implements ExportInterface, GroupedExportInterface
         // No form necessary
     }
 
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
+
     public function getAllowedFormattersTypes()
     {
         return [FormatterInterface::TYPE_TABULAR];
@@ -111,9 +116,9 @@ class CountPerson implements ExportInterface, GroupedExportInterface
     public function supportsModifiers()
     {
         return [
-            Declarations::PERSON_TYPE,
-            Declarations::PERSON_IMPLIED_IN,
-            //Declarations::ACP_TYPE
+            'abcde',
+            //Declarations::PERSON_TYPE,
+            //Declarations::PERSON_IMPLIED_IN,
         ];
     }
 }

src/Bundle/ChillPersonBundle/Export/Export/CountPersonWithAccompanyingCourse.php

@@ -39,6 +39,10 @@ class CountPersonWithAccompanyingCourse implements ExportInterface, GroupedExpor
     {
         // TODO: Implement buildForm() method.
     }
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
 
     public function getAllowedFormattersTypes(): array
     {

src/Bundle/ChillPersonBundle/Export/Export/ListAccompanyingPeriod.php

@@ -20,6 +20,7 @@ use Chill\MainBundle\Export\Helper\ExportAddressHelper;
 use Chill\MainBundle\Export\Helper\UserHelper;
 use Chill\MainBundle\Export\ListInterface;
 use Chill\MainBundle\Form\Type\PickRollingDateType;
+use Chill\MainBundle\Service\RollingDate\RollingDate;
 use Chill\MainBundle\Service\RollingDate\RollingDateConverterInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
@@ -28,6 +29,7 @@ use Chill\PersonBundle\Entity\Household\PersonHouseholdAddress;
 use Chill\PersonBundle\Entity\Person\PersonCenterHistory;
 use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
 use Chill\PersonBundle\Export\Declarations;
+use Chill\PersonBundle\Export\Helper\ListAccompanyingPeriodHelper;
 use Chill\PersonBundle\Repository\PersonRepository;
 use Chill\PersonBundle\Repository\SocialWork\SocialIssueRepository;
 use Chill\PersonBundle\Security\Authorization\PersonVoter;
@@ -41,45 +43,16 @@ use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Query\Expr\Join;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
 use function strlen;
 
-class ListAccompanyingPeriod implements ListInterface, GroupedExportInterface
+final readonly class ListAccompanyingPeriod implements ListInterface, GroupedExportInterface
 {
-    private const FIELDS = [
-        'id',
-        'step',
-        'stepSince',
-        'openingDate',
-        'closingDate',
-        'referrer',
-        'referrerSince',
-        'administrativeLocation',
-        'locationIsPerson',
-        'locationIsTemp',
-        'locationPersonName',
-        'locationPersonId',
-        'origin',
-        'closingMotive',
-        'confidential',
-        'emergency',
-        'intensity',
-        'job',
-        'isRequestorPerson',
-        'isRequestorThirdParty',
-        'requestorPerson',
-        'requestorPersonId',
-        'requestorThirdParty',
-        'requestorThirdPartyId',
-        'scopes',
-        'socialIssues',
-        'createdAt',
-        'createdBy',
-        'updatedAt',
-        'updatedBy',
-    ];
-
-    public function __construct(private ExportAddressHelper $addressHelper, private DateTimeHelper $dateTimeHelper, private EntityManagerInterface $entityManager, private PersonRenderInterface $personRender, private PersonRepository $personRepository, private ThirdPartyRepository $thirdPartyRepository, private ThirdPartyRender $thirdPartyRender, private SocialIssueRepository $socialIssueRepository, private SocialIssueRender $socialIssueRender, private TranslatableStringHelperInterface $translatableStringHelper, private RollingDateConverterInterface $rollingDateConverter, private UserHelper $userHelper)
-    {
+    public function __construct(
+        private EntityManagerInterface $entityManager,
+        private RollingDateConverterInterface $rollingDateConverter,
+        private ListAccompanyingPeriodHelper $listAccompanyingPeriodHelper,
+    ) {
     }
 
     public function buildForm(FormBuilderInterface $builder)
@@ -91,6 +64,12 @@ class ListAccompanyingPeriod implements ListInterface, GroupedExportInterface
                 'required' => true,
             ]);
     }
+    public function getFormDefaultData(): array
+    {
+        return [
+            'calc_date' => new RollingDate(RollingDate::T_TODAY)
+        ];
+    }
 
     public function getAllowedFormattersTypes()
     {
@@ -109,99 +88,12 @@ class ListAccompanyingPeriod implements ListInterface, GroupedExportInterface
 
     public function getLabels($key, array $values, $data)
     {
-        if (str_starts_with($key, 'address_fields')) {
-            return $this->addressHelper->getLabel($key, $values, $data, 'address_fields');
-        }
-
-        return match ($key) {
-            'stepSince', 'openingDate', 'closingDate', 'referrerSince', 'createdAt', 'updatedAt' => $this->dateTimeHelper->getLabel('export.list.acp.' . $key),
-            'origin', 'closingMotive', 'job' => function ($value) use ($key) {
-                if ('_header' === $value) {
-                    return 'export.list.acp.' . $key;
-                }
-
-                if (null === $value) {
-                    return '';
-                }
-
-                return $this->translatableStringHelper->localize(json_decode($value, true, 512, JSON_THROW_ON_ERROR));
-            },
-            'locationPersonName', 'requestorPerson' => function ($value) use ($key) {
-                if ('_header' === $value) {
-                    return 'export.list.acp.' . $key;
-                }
-
-                if (null === $value || null === $person = $this->personRepository->find($value)) {
-                    return '';
-                }
-
-                return $this->personRender->renderString($person, []);
-            },
-            'requestorThirdParty' => function ($value) use ($key) {
-                if ('_header' === $value) {
-                    return 'export.list.acp.' . $key;
-                }
-
-                if (null === $value || null === $thirdparty = $this->thirdPartyRepository->find($value)) {
-                    return '';
-                }
-
-                return $this->thirdPartyRender->renderString($thirdparty, []);
-            },
-            'scopes' => function ($value) use ($key) {
-                if ('_header' === $value) {
-                    return 'export.list.acp.' . $key;
-                }
-
-                if (null === $value) {
-                    return '';
-                }
-
-                return implode(
-                    '|',
-                    array_map(
-                        fn ($s) => $this->translatableStringHelper->localize($s),
-                        json_decode($value, true, 512, JSON_THROW_ON_ERROR)
-                    )
-                );
-            },
-            'socialIssues' => function ($value) use ($key) {
-                if ('_header' === $value) {
-                    return 'export.list.acp.' . $key;
-                }
-
-                if (null === $value) {
-                    return '';
-                }
-
-                return implode(
-                    '|',
-                    array_map(
-                        fn ($s) => $this->socialIssueRender->renderString($this->socialIssueRepository->find($s), []),
-                        json_decode($value, true, 512, JSON_THROW_ON_ERROR)
-                    )
-                );
-            },
-            default => static function ($value) use ($key) {
-                if ('_header' === $value) {
-                    return 'export.list.acp.' . $key;
-                }
-
-                if (null === $value) {
-                    return '';
-                }
-
-                return $value;
-            },
-        };
+        return $this->listAccompanyingPeriodHelper->getLabels($key, $values, $data);
     }
 
     public function getQueryKeys($data)
     {
-        return array_merge(
-            self::FIELDS,
-            $this->addressHelper->getKeys(ExportAddressHelper::F_ALL, 'address_fields')
-        );
+        return $this->listAccompanyingPeriodHelper->getQueryKeys($data);
     }
 
     public function getResult($query, $data)
@@ -239,7 +131,12 @@ class ListAccompanyingPeriod implements ListInterface, GroupedExportInterface
             ->setParameter('list_acp_step', AccompanyingPeriod::STEP_DRAFT)
             ->setParameter('authorized_centers', $centers);
 
-        $this->addSelectClauses($qb, $this->rollingDateConverter->convert($data['calc_date']));
+        $this->listAccompanyingPeriodHelper->addSelectClauses($qb, $this->rollingDateConverter->convert($data['calc_date']));
+
+        $qb
+            ->addOrderBy('acp.openingDate')
+            ->addOrderBy('acp.closingDate')
+            ->addOrderBy('acp.id');
 
         return $qb;
     }
@@ -255,95 +152,4 @@ class ListAccompanyingPeriod implements ListInterface, GroupedExportInterface
             Declarations::ACP_TYPE,
         ];
     }
-
-    private function addSelectClauses(QueryBuilder $qb, DateTimeImmutable $calcDate): void
-    {
-        // add the regular fields
-        foreach (['id', 'openingDate', 'closingDate', 'confidential', 'emergency', 'intensity', 'createdAt', 'updatedAt'] as $field) {
-            $qb->addSelect(sprintf('acp.%s AS %s', $field, $field));
-        }
-
-        // add the field which are simple association
-        foreach (['origin' => 'label', 'closingMotive' => 'name', 'job' => 'label', 'createdBy' => 'label', 'updatedBy' => 'label', 'administrativeLocation' => 'name'] as $entity => $field) {
-            $qb
-                ->leftJoin(sprintf('acp.%s', $entity), "{$entity}_t")
-                ->addSelect(sprintf('%s_t.%s AS %s', $entity, $field, $entity));
-        }
-
-        // step at date
-        $qb
-            ->addSelect('stepHistory.step AS step')
-            ->addSelect('stepHistory.startDate AS stepSince')
-            ->leftJoin('acp.stepHistories', 'stepHistory')
-            ->andWhere(
-                $qb->expr()->andX(
-                    $qb->expr()->lte('stepHistory.startDate', ':calcDate'),
-                    $qb->expr()->orX($qb->expr()->isNull('stepHistory.endDate'), $qb->expr()->gt('stepHistory.endDate', ':calcDate'))
-                )
-            );
-
-        // referree at date
-        $qb
-            ->addSelect('referrer_t.label AS referrer')
-            ->addSelect('userHistory.startDate AS referrerSince')
-            ->leftJoin('acp.userHistories', 'userHistory')
-            ->leftJoin('userHistory.user', 'referrer_t')
-            ->andWhere(
-                $qb->expr()->orX(
-                    $qb->expr()->isNull('userHistory'),
-                    $qb->expr()->andX(
-                        $qb->expr()->lte('userHistory.startDate', ':calcDate'),
-                        $qb->expr()->orX($qb->expr()->isNull('userHistory.endDate'), $qb->expr()->gt('userHistory.endDate', ':calcDate'))
-                    )
-                )
-            );
-
-        // location of the acp
-        $qb
-            ->addSelect('CASE WHEN locationHistory.personLocation IS NOT NULL THEN 1 ELSE 0 END AS locationIsPerson')
-            ->addSelect('CASE WHEN locationHistory.personLocation IS NOT NULL THEN 0 ELSE 1 END AS locationIsTemp')
-            ->addSelect('IDENTITY(locationHistory.personLocation) AS locationPersonName')
-            ->addSelect('IDENTITY(locationHistory.personLocation) AS locationPersonId')
-            ->leftJoin('acp.locationHistories', 'locationHistory')
-            ->andWhere(
-                $qb->expr()->orX(
-                    $qb->expr()->isNull('locationHistory'),
-                    $qb->expr()->andX(
-                        $qb->expr()->lte('locationHistory.startDate', ':calcDate'),
-                        $qb->expr()->orX($qb->expr()->isNull('locationHistory.endDate'), $qb->expr()->gt('locationHistory.endDate', ':calcDate'))
-                    )
-                )
-            )
-            ->leftJoin(PersonHouseholdAddress::class, 'personAddress', Join::WITH, 'locationHistory.personLocation = personAddress.person')
-            ->andWhere(
-                $qb->expr()->orX(
-                    $qb->expr()->isNull('personAddress'),
-                    $qb->expr()->andX(
-                        $qb->expr()->lte('personAddress.validFrom', ':calcDate'),
-                        $qb->expr()->orX($qb->expr()->isNull('personAddress.validTo'), $qb->expr()->gt('personAddress.validTo', ':calcDate'))
-                    )
-                )
-            )
-            ->leftJoin(Address::class, 'acp_address', Join::WITH, 'COALESCE(IDENTITY(locationHistory.addressLocation), IDENTITY(personAddress.address)) = acp_address.id');
-
-        $this->addressHelper->addSelectClauses(ExportAddressHelper::F_ALL, $qb, 'acp_address', 'address_fields');
-
-        // requestor
-        $qb
-            ->addSelect('CASE WHEN acp.requestorPerson IS NULL THEN 1 ELSE 0 END AS isRequestorPerson')
-            ->addSelect('CASE WHEN acp.requestorPerson IS NULL THEN 0 ELSE 1 END AS isRequestorThirdParty')
-            ->addSelect('IDENTITY(acp.requestorPerson) AS requestorPersonId')
-            ->addSelect('IDENTITY(acp.requestorThirdParty) AS requestorThirdPartyId')
-            ->addSelect('IDENTITY(acp.requestorPerson) AS requestorPerson')
-            ->addSelect('IDENTITY(acp.requestorThirdParty) AS requestorThirdParty');
-
-        $qb
-            // scopes
-            ->addSelect('(SELECT AGGREGATE(scope.name) FROM ' . Scope::class . ' scope WHERE scope MEMBER OF acp.scopes) AS scopes')
-            // social issues
-            ->addSelect('(SELECT AGGREGATE(socialIssue.id) FROM ' . SocialIssue::class . ' socialIssue WHERE socialIssue MEMBER OF acp.socialIssues) AS socialIssues');
-
-        // add parameter
-        $qb->setParameter('calcDate', $calcDate);
-    }
 }

src/Bundle/ChillPersonBundle/Export/Export/ListAccompanyingPeriodWork.php

@@ -87,9 +87,12 @@ class ListAccompanyingPeriodWork implements ListInterface, GroupedExportInterfac
                 'label' => 'export.list.acpw.Date of calculation for associated elements',
                 'help' => 'export.list.acpw.help_description',
                 'required' => true,
-                'data' => new RollingDate(RollingDate::T_TODAY),
             ]);
     }
+    public function getFormDefaultData(): array
+    {
+        return ['calc_date' => new RollingDate(RollingDate::T_TODAY)];
+    }
 
     public function getAllowedFormattersTypes()
     {

src/Bundle/ChillPersonBundle/Export/Export/ListEvaluation.php

@@ -79,9 +79,12 @@ class ListEvaluation implements ListInterface, GroupedExportInterface
                 'label' => 'export.list.eval.Date of calculation for associated elements',
                 'help' => 'export.list.eval.help_description',
                 'required' => true,
-                'data' => new RollingDate(RollingDate::T_TODAY),
             ]);
     }
+    public function getFormDefaultData(): array
+    {
+        return ['calc_date' => new RollingDate(RollingDate::T_TODAY)];
+    }
 
     public function getAllowedFormattersTypes()
     {

src/Bundle/ChillPersonBundle/Export/Export/ListHouseholdInPeriod.php

@@ -45,8 +45,28 @@ class ListHouseholdInPeriod implements ListInterface, GroupedExportInterface
         'compositionType',
     ];
 
-    public function __construct(private ExportAddressHelper $addressHelper, private AggregateStringHelper $aggregateStringHelper, private EntityManagerInterface $entityManager, private RollingDateConverterInterface $rollingDateConverter, private TranslatableStringExportLabelHelper $translatableStringHelper)
-    {
+    private ExportAddressHelper $addressHelper;
+
+    private AggregateStringHelper $aggregateStringHelper;
+
+    private EntityManagerInterface $entityManager;
+
+    private RollingDateConverterInterface $rollingDateConverter;
+
+    private TranslatableStringExportLabelHelper $translatableStringHelper;
+
+    public function __construct(
+        ExportAddressHelper $addressHelper,
+        AggregateStringHelper $aggregateStringHelper,
+        EntityManagerInterface $entityManager,
+        RollingDateConverterInterface $rollingDateConverter,
+        TranslatableStringExportLabelHelper $translatableStringHelper
+    ) {
+        $this->addressHelper = $addressHelper;
+        $this->aggregateStringHelper = $aggregateStringHelper;
+        $this->entityManager = $entityManager;
+        $this->rollingDateConverter = $rollingDateConverter;
+        $this->translatableStringHelper = $translatableStringHelper;
     }
 
     public function buildForm(FormBuilderInterface $builder)
@@ -55,10 +75,13 @@ class ListHouseholdInPeriod implements ListInterface, GroupedExportInterface
             ->add('calc_date', PickRollingDateType::class, [
                 'label' => 'export.list.household.Date of calculation for associated elements',
                 'help' => 'export.list.household.help_description',
-                'data' => new RollingDate(RollingDate::T_TODAY),
                 'required' => true,
             ]);
     }
+    public function getFormDefaultData(): array
+    {
+        return ['calc_date' => new RollingDate(RollingDate::T_TODAY)];
+    }
 
     public function getAllowedFormattersTypes()
     {
@@ -77,21 +100,27 @@ class ListHouseholdInPeriod implements ListInterface, GroupedExportInterface
 
     public function getLabels($key, array $values, $data)
     {
-        if (str_starts_with($key, 'address_fields')) {
+        if (substr($key, 0, strlen('address_fields')) === 'address_fields') {
             return $this->addressHelper->getLabel($key, $values, $data, 'address_fields');
         }
 
-        return match ($key) {
-            'membersId', 'membersName' => $this->aggregateStringHelper->getLabelMulti($key, $values, 'export.list.household.' . $key),
-            'compositionType' => $this->translatableStringHelper->getLabel($key, $values, 'export.list.household.' . $key),
-            default => static function ($value) use ($key) {
-                if ('_header' === $value) {
-                    return 'export.list.household.' . $key;
-                }
+        switch ($key) {
+            case 'membersId':
+            case 'membersName':
+                return $this->aggregateStringHelper->getLabelMulti($key, $values, 'export.list.household.' . $key);
 
-                return (string) $value;
-            },
-        };
+            case 'compositionType':
+                return $this->translatableStringHelper->getLabel($key, $values, 'export.list.household.' . $key);
+
+            default:
+                return static function ($value) use ($key) {
+                    if ('_header' === $value) {
+                        return 'export.list.household.' . $key;
+                    }
+
+                    return (string) $value;
+                };
+        }
     }
 
     public function getQueryKeys($data): array

src/Bundle/ChillPersonBundle/Export/Export/ListPerson.php

@@ -87,17 +87,27 @@ class ListPerson implements ExportElementValidatedInterface, ListInterface, Grou
                     }
                 },
             ])],
-            'data' => array_values($choices),
         ]);
 
         // add a date  field for addresses
         $builder->add('address_date', ChillDateType::class, [
             'label' => 'Data valid at this date',
             'help' => 'Data regarding center, addresses, and so on will be computed at this date',
-            'data' => new DateTimeImmutable(),
             'input' => 'datetime_immutable',
         ]);
     }
+    public function getFormDefaultData(): array
+    {
+        $choices = array_combine(ListPersonHelper::FIELDS, ListPersonHelper::FIELDS);
+
+        foreach ($this->getCustomFields() as $cf) {
+            $choices[$this->translatableStringHelper->localize($cf->getName())]
+                =
+                $cf->getSlug();
+        }
+
+        return ['fields' => array_values($choices), 'address_date' => new DateTimeImmutable()];
+    }
 
     public function getAllowedFormattersTypes()
     {

src/Bundle/ChillPersonBundle/Export/Export/ListPersonDuplicate.php

@@ -62,9 +62,12 @@ class ListPersonDuplicate implements DirectExportInterface, ExportElementValidat
     {
         $builder->add('precision', NumberType::class, [
             'label' => 'Precision',
-            'data' => self::PRECISION_DEFAULT_VALUE,
         ]);
     }
+    public function getFormDefaultData(): array
+    {
+        return ['precision' => self::PRECISION_DEFAULT_VALUE];
+    }
 
     public function generate(array $acl, array $data = []): Response
     {

src/Bundle/ChillPersonBundle/Export/Export/ListPersonHavingAccompanyingPeriod.php

@@ -35,7 +35,12 @@ use function count;
 use function in_array;
 use function strlen;
 
-class ListPersonWithAccompanyingPeriod implements ExportElementValidatedInterface, ListInterface, GroupedExportInterface
+/**
+ * List the persons, having an accompanying period.
+ *
+ * Details of the accompanying period are not included
+ */
+class ListPersonHavingAccompanyingPeriod implements ExportElementValidatedInterface, ListInterface, GroupedExportInterface
 {
     public function __construct(private ExportAddressHelper $addressHelper, private ListPersonHelper $listPersonHelper, private EntityManagerInterface $entityManager)
     {
@@ -45,7 +50,6 @@ class ListPersonWithAccompanyingPeriod implements ExportElementValidatedInterfac
     {
         $choices = array_combine(ListPersonHelper::FIELDS, ListPersonHelper::FIELDS);
 
-        // Add a checkbox to select fields
         $builder->add('fields', ChoiceType::class, [
             'multiple' => true,
             'expanded' => true,
@@ -68,17 +72,20 @@ class ListPersonWithAccompanyingPeriod implements ExportElementValidatedInterfac
                     }
                 },
             ])],
-            'data' => array_values($choices),
         ]);
 
-        // add a date  field for addresses
         $builder->add('address_date', ChillDateType::class, [
             'label' => 'Data valid at this date',
             'help' => 'Data regarding center, addresses, and so on will be computed at this date',
-            'data' => new DateTimeImmutable(),
             'input' => 'datetime_immutable',
         ]);
     }
+    public function getFormDefaultData(): array
+    {
+        $choices = array_combine(ListPersonHelper::FIELDS, ListPersonHelper::FIELDS);
+
+        return ['fields' => array_values($choices), 'address_date' => new DateTimeImmutable()];
+    }
 
     public function getAllowedFormattersTypes()
     {
@@ -171,6 +178,11 @@ class ListPersonWithAccompanyingPeriod implements ExportElementValidatedInterfac
 
         $this->listPersonHelper->addSelect($qb, $fields, $data['address_date']);
 
+        $qb
+            ->addOrderBy('person.lastName')
+            ->addOrderBy('person.firstName')
+            ->addOrderBy('person.id');
+
         return $qb;
     }
 

src/Bundle/ChillPersonBundle/Export/Export/ListPersonWithAccompanyingPeriodDetails.php

@@ -0,0 +1,155 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\PersonBundle\Export\Export;
+
+use Chill\MainBundle\Export\ExportElementValidatedInterface;
+use Chill\MainBundle\Export\FormatterInterface;
+use Chill\MainBundle\Export\GroupedExportInterface;
+use Chill\MainBundle\Export\Helper\ExportAddressHelper;
+use Chill\MainBundle\Export\ListInterface;
+use Chill\MainBundle\Form\Type\ChillDateType;
+use Chill\MainBundle\Form\Type\PickRollingDateType;
+use Chill\MainBundle\Service\RollingDate\RollingDate;
+use Chill\MainBundle\Service\RollingDate\RollingDateConverterInterface;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\Entity\Person\PersonCenterHistory;
+use Chill\PersonBundle\Export\Declarations;
+use Chill\PersonBundle\Export\Helper\ListAccompanyingPeriodHelper;
+use Chill\PersonBundle\Export\Helper\ListPersonHelper;
+use Chill\PersonBundle\Security\Authorization\PersonVoter;
+use DateTimeImmutable;
+use Doctrine\ORM\AbstractQuery;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\Validator\Constraints\Callback;
+use Symfony\Component\Validator\Context\ExecutionContextInterface;
+use function array_key_exists;
+use function count;
+use function in_array;
+use function strlen;
+
+/**
+ * List the persons having an accompanying period, with the accompanying period details
+ *
+ */
+final readonly class ListPersonWithAccompanyingPeriodDetails implements ListInterface, GroupedExportInterface
+{
+    public function __construct(
+        private ListPersonHelper $listPersonHelper,
+        private ListAccompanyingPeriodHelper $listAccompanyingPeriodHelper,
+        private EntityManagerInterface $entityManager,
+        private RollingDateConverterInterface $rollingDateConverter,
+    ) {
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        $builder->add('address_date', PickRollingDateType::class, [
+            'label' => 'Data valid at this date',
+            'help' => 'Data regarding center, addresses, and so on will be computed at this date',
+        ]);
+    }
+    public function getFormDefaultData(): array
+    {
+        return ['address_date' => new RollingDate(RollingDate::T_TODAY)];
+    }
+
+    public function getAllowedFormattersTypes()
+    {
+        return [FormatterInterface::TYPE_LIST];
+    }
+
+    public function getDescription()
+    {
+        return 'export.list.person_with_acp.Create a list of people having an accompaying periods with details of period, according to various filters.';
+    }
+
+    public function getGroup(): string
+    {
+        return 'Exports of persons';
+    }
+
+    public function getLabels($key, array $values, $data)
+    {
+        if (in_array($key, $this->listPersonHelper->getAllKeys(), true)) {
+            return $this->listPersonHelper->getLabels($key, $values, $data);
+        }
+
+        return $this->listAccompanyingPeriodHelper->getLabels($key, $values, $data);
+    }
+
+    public function getQueryKeys($data)
+    {
+        return array_merge(
+            $this->listPersonHelper->getAllKeys(),
+            $this->listAccompanyingPeriodHelper->getQueryKeys($data),
+        );
+    }
+
+    public function getResult($query, $data)
+    {
+        return $query->getQuery()->getResult(AbstractQuery::HYDRATE_SCALAR);
+    }
+
+    public function getTitle()
+    {
+        return 'export.list.person_with_acp.List peoples having an accompanying period with period details';
+    }
+
+    public function getType()
+    {
+        return Declarations::PERSON_TYPE;
+    }
+
+    /**
+     * param array{fields: string[], address_date: DateTimeImmutable} $data.
+     */
+    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
+    {
+        $centers = array_map(static fn ($el) => $el['center'], $acl);
+
+        $qb = $this->entityManager->createQueryBuilder();
+
+        $qb->from(Person::class, 'person')
+            ->join('person.accompanyingPeriodParticipations', 'acppart')
+            ->join('acppart.accompanyingPeriod', 'acp')
+            ->andWhere($qb->expr()->neq('acp.step', "'" . AccompanyingPeriod::STEP_DRAFT . "'"))
+            ->andWhere(
+                $qb->expr()->exists(
+                    'SELECT 1 FROM ' . PersonCenterHistory::class . ' pch WHERE pch.person = person.id AND pch.center IN (:authorized_centers)'
+                )
+            )->setParameter('authorized_centers', $centers);
+
+        $this->listPersonHelper->addSelect($qb, ListPersonHelper::FIELDS, $this->rollingDateConverter->convert($data['address_date']));
+        $this->listAccompanyingPeriodHelper->addSelectClauses($qb, $this->rollingDateConverter->convert($data['address_date']));
+
+        $qb
+            ->addOrderBy('person.lastName')
+            ->addOrderBy('person.firstName')
+            ->addOrderBy('person.id')
+            ->addOrderBy('acp.id');
+
+        return $qb;
+    }
+
+    public function requiredRole(): string
+    {
+        return PersonVoter::LISTS;
+    }
+
+    public function supportsModifiers()
+    {
+        return [Declarations::PERSON_TYPE, Declarations::PERSON_IMPLIED_IN, Declarations::ACP_TYPE];
+    }
+}

src/Bundle/ChillPersonBundle/Export/Export/StatAccompanyingCourseDuration.php

@@ -41,9 +41,12 @@ class StatAccompanyingCourseDuration implements ExportInterface, GroupedExportIn
     {
         $builder->add('closingdate', ChillDateType::class, [
             'label' => 'Closingdate to apply',
-            'data' => new DateTime('now'),
         ]);
     }
+    public function getFormDefaultData(): array
+    {
+        return ['closingdate' => new DateTime('now')];
+    }
 
     public function getAllowedFormattersTypes(): array
     {

src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ActiveOnDateFilter.php

@@ -64,9 +64,11 @@ class ActiveOnDateFilter implements FilterInterface
     public function buildForm(FormBuilderInterface $builder)
     {
         $builder
-            ->add('on_date', PickRollingDateType::class, [
-                'data' => new RollingDate(RollingDate::T_TODAY),
-            ]);
+            ->add('on_date', PickRollingDateType::class, []);
+    }
+    public function getFormDefaultData(): array
+    {
+        return ['on_date' => new RollingDate(RollingDate::T_TODAY)];
     }
 
     public function describeAction($data, $format = 'string'): array

src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ActiveOneDayBetweenDatesFilter.php

@@ -53,12 +53,12 @@ class ActiveOneDayBetweenDatesFilter implements FilterInterface
     public function buildForm(FormBuilderInterface $builder)
     {
         $builder
-            ->add('date_from', PickRollingDateType::class, [
-                'data' => new RollingDate(RollingDate::T_YEAR_PREVIOUS_START),
-            ])
-            ->add('date_to', PickRollingDateType::class, [
-                'data' => new RollingDate(RollingDate::T_TODAY),
-            ]);
+            ->add('date_from', PickRollingDateType::class, [])
+            ->add('date_to', PickRollingDateType::class, []);
+    }
+    public function getFormDefaultData(): array
+    {
+        return ['date_from' => new RollingDate(RollingDate::T_YEAR_PREVIOUS_START), 'date_to' => new RollingDate(RollingDate::T_TODAY)];
     }
 
     public function describeAction($data, $format = 'string'): array

src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/AdministrativeLocationFilter.php

@@ -49,6 +49,10 @@ class AdministrativeLocationFilter implements FilterInterface
             'multiple' => true,
         ]);
     }
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
 
     public function describeAction($data, $format = 'string'): array
     {

src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ClosingMotiveFilter.php

@@ -60,6 +60,10 @@ class ClosingMotiveFilter implements FilterInterface
             'expanded' => true,
         ]);
     }
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
 
     public function describeAction($data, $format = 'string'): array
     {

src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ConfidentialFilter.php

@@ -22,11 +22,11 @@ use Symfony\Contracts\Translation\TranslatorInterface;
 class ConfidentialFilter implements FilterInterface
 {
     private const CHOICES = [
-        'is not confidential' => false,
-        'is confidential' => true,
+        'is not confidential' => 'false',
+        'is confidential' => 'true',
     ];
 
-    private const DEFAULT_CHOICE = false;
+    private const DEFAULT_CHOICE = 'false';
 
     public function __construct(private TranslatorInterface $translator)
     {
@@ -64,9 +64,12 @@ class ConfidentialFilter implements FilterInterface
             'multiple' => false,
             'expanded' => true,
             'empty_data' => self::DEFAULT_CHOICE,
-            'data' => self::DEFAULT_CHOICE,
         ]);
     }
+    public function getFormDefaultData(): array
+    {
+        return ['accepted_confidentials' => self::DEFAULT_CHOICE];
+    }
 
     public function describeAction($data, $format = 'string'): array
     {

src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/CreatorFilter.php

@@ -50,6 +50,10 @@ class CreatorFilter implements FilterInterface
                 'label' => false,
             ]);
     }
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
 
     public function describeAction($data, $format = 'string'): array
     {

src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/CreatorJobFilter.php

@@ -61,6 +61,10 @@ class CreatorJobFilter implements FilterInterface
             'label' => 'Job',
         ]);
     }
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
 
     public function describeAction($data, $format = 'string'): array
     {

src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/EmergencyFilter.php

@@ -22,11 +22,11 @@ use Symfony\Contracts\Translation\TranslatorInterface;
 class EmergencyFilter implements FilterInterface
 {
     private const CHOICES = [
-        'is emergency' => true,
-        'is not emergency' => false,
+        'is emergency' => 'true',
+        'is not emergency' => 'false',
     ];
 
-    private const DEFAULT_CHOICE = false;
+    private const DEFAULT_CHOICE = 'false';
 
     public function __construct(private TranslatorInterface $translator)
     {
@@ -64,9 +64,12 @@ class EmergencyFilter implements FilterInterface
             'multiple' => false,
             'expanded' => true,
             'empty_data' => self::DEFAULT_CHOICE,
-            'data' => self::DEFAULT_CHOICE,
         ]);
     }
+    public function getFormDefaultData(): array
+    {
+        return ['accepted_emergency' => self::DEFAULT_CHOICE];
+    }
 
     public function describeAction($data, $format = 'string'): array
     {

src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/EvaluationFilter.php

@@ -67,6 +67,10 @@ class EvaluationFilter implements FilterInterface
             'attr' => ['class' => 'select2'],
         ]);
     }
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
 
     public function describeAction($data, $format = 'string'): array
     {

src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/GeographicalUnitStatFilter.php

@@ -84,7 +84,6 @@ class GeographicalUnitStatFilter implements FilterInterface
             ->add('date_calc', PickRollingDateType::class, [
                 'label' => 'Compute geographical location at date',
                 'required' => true,
-                'data' => new RollingDate(RollingDate::T_TODAY),
             ])
             ->add('units', ChoiceType::class, [
                 'label' => 'Geographical unit',
@@ -98,6 +97,10 @@ class GeographicalUnitStatFilter implements FilterInterface
                 'multiple' => true,
             ]);
     }
+    public function getFormDefaultData(): array
+    {
+        return ['date_calc' => new RollingDate(RollingDate::T_TODAY)];
+    }
 
     public function describeAction($data, $format = 'string'): array
     {

src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/HasNoActionFilter.php

@@ -38,6 +38,10 @@ class HasNoActionFilter implements FilterInterface
     {
         // no form
     }
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
 
     public function describeAction($data, $format = 'string'): array
     {

src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/HasNoReferrerFilter.php

@@ -61,9 +61,12 @@ class HasNoReferrerFilter implements FilterInterface
         $builder
             ->add('calc_date', PickRollingDateType::class, [
                 'label' => 'Has no referrer on this date',
-                'data' => new RollingDate(RollingDate::T_TODAY),
             ]);
     }
+    public function getFormDefaultData(): array
+    {
+        return ['calc_date' => new RollingDate(RollingDate::T_TODAY)];
+    }
 
     public function describeAction($data, $format = 'string'): array
     {

src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/HasTemporaryLocationFilter.php

@@ -72,9 +72,12 @@ class HasTemporaryLocationFilter implements FilterInterface
             ])
             ->add('calc_date', PickRollingDateType::class, [
                 'label' => 'export.filter.course.having_temporarily.Calculation date',
-                'data' => new RollingDate(RollingDate::T_TODAY),
             ]);
     }
+    public function getFormDefaultData(): array
+    {
+        return ['calc_date' => new RollingDate(RollingDate::T_TODAY)];
+    }
 
     public function describeAction($data, $format = 'string'): array
     {

src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/HavingAnAccompanyingPeriodInfoWithinDatesFilter.php

@@ -0,0 +1,92 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters;
+
+use Chill\MainBundle\Export\FilterInterface;
+use Chill\MainBundle\Form\Type\DateIntervalType;
+use Chill\MainBundle\Form\Type\PickRollingDateType;
+use Chill\MainBundle\Service\RollingDate\RollingDate;
+use Chill\MainBundle\Service\RollingDate\RollingDateConverterInterface;
+use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodInfo;
+use Chill\PersonBundle\Export\Declarations;
+use Doctrine\DBAL\Types\Types;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\FormBuilderInterface;
+
+/**
+ * Filter accompanying course which have a row in AccompanyingPeriodInfo within the given
+ * interval
+ */
+final readonly class HavingAnAccompanyingPeriodInfoWithinDatesFilter implements FilterInterface
+{
+    public function __construct(
+        private RollingDateConverterInterface $rollingDateConverter,
+    ) {
+    }
+
+    public function buildForm(FormBuilderInterface $builder): void
+    {
+        $builder
+            ->add('start_date', PickRollingDateType::class, [
+                'label' => 'export.filter.course.having_info_within_interval.start_date',
+            ])
+            ->add('end_date', PickRollingDateType::class, [
+                'label' => 'export.filter.course.having_info_within_interval.end_date',
+            ]);
+    }
+    public function getFormDefaultData(): array
+    {
+        return ['start_date' => new RollingDate(RollingDate::T_TODAY), 'end_date' => new RollingDate(RollingDate::T_TODAY)];
+    }
+
+    public function getTitle(): string
+    {
+        return 'export.filter.course.having_info_within_interval.title';
+    }
+
+    public function describeAction($data, $format = 'string'): array
+    {
+        return [
+            'export.filter.course.having_info_within_interval.Only course with events between %startDate% and %endDate%',
+            [
+                '%startDate%' => $this->rollingDateConverter->convert($data['start_date'])->format('d-m-Y'),
+                '%endDate%' => $this->rollingDateConverter->convert($data['end_date'])->format('d-m-Y'),
+            ]
+        ];
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data): void
+    {
+        $ai = 'having_ai_within_interval_acc_info';
+        $as = 'having_ai_within_interval_start_date';
+        $ae = 'having_ai_within_interval_end_date';
+
+        $qb
+            ->andWhere(
+                $qb->expr()->exists(
+                    'SELECT 1 FROM ' . AccompanyingPeriodInfo::class . " {$ai} WHERE {$ai}.infoDate BETWEEN :{$as} AND :{$ae} AND IDENTITY({$ai}.accompanyingPeriod) = acp.id"
+                )
+            )
+            ->setParameter($as, $this->rollingDateConverter->convert($data['start_date']), Types::DATETIME_IMMUTABLE)
+            ->setParameter($ae, $this->rollingDateConverter->convert($data['end_date']), Types::DATETIME_IMMUTABLE);
+    }
+
+    public function applyOn(): string
+    {
+        return Declarations::ACP_TYPE;
+    }
+}

src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/IntensityFilter.php

@@ -64,9 +64,12 @@ class IntensityFilter implements FilterInterface
             'multiple' => false,
             'expanded' => true,
             'empty_data' => self::DEFAULT_CHOICE,
-            'data' => self::DEFAULT_CHOICE,
         ]);
     }
+    public function getFormDefaultData(): array
+    {
+        return ['accepted_intensities' => self::DEFAULT_CHOICE];
+    }
 
     public function describeAction($data, $format = 'string'): array
     {

src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/JobWorkingOnCourseFilter.php

@@ -0,0 +1,130 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters;
+
+use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Entity\UserJob;
+use Chill\MainBundle\Export\FilterInterface;
+use Chill\MainBundle\Form\Type\PickRollingDateType;
+use Chill\MainBundle\Form\Type\PickUserDynamicType;
+use Chill\MainBundle\Repository\UserJobRepositoryInterface;
+use Chill\MainBundle\Service\RollingDate\RollingDate;
+use Chill\MainBundle\Service\RollingDate\RollingDateConverterInterface;
+use Chill\MainBundle\Templating\Entity\UserRender;
+use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Export\Declarations;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
+use Symfony\Component\Form\FormBuilderInterface;
+
+/**
+ * Filter course where a user with the given job is "working" on it
+ *
+ * Makes use of AccompanyingPeriodInfo
+ */
+readonly class JobWorkingOnCourseFilter implements FilterInterface
+{
+    public function __construct(
+        private UserJobRepositoryInterface $userJobRepository,
+        private RollingDateConverterInterface $rollingDateConverter,
+        private TranslatableStringHelperInterface $translatableStringHelper,
+    ) {
+    }
+
+    public function buildForm(FormBuilderInterface $builder): void
+    {
+        $jobs = $this->userJobRepository->findAllActive();
+        usort($jobs, fn (UserJob $a, UserJob $b) => $this->translatableStringHelper->localize($a->getLabel()) <=> $this->translatableStringHelper->localize($b->getLabel()));
+
+        $builder
+            ->add('jobs', EntityType::class, [
+                'class' => UserJob::class,
+                'choices' => $jobs,
+                'choice_label' => fn (UserJob $userJob) => $this->translatableStringHelper->localize($userJob->getLabel()),
+                'multiple' => true,
+                'expanded' => true,
+            ])
+            ->add('start_date', PickRollingDateType::class, [
+                'label' => 'export.filter.course.by_job_working.Job working after'
+            ])
+            ->add('end_date', PickRollingDateType::class, [
+                'label' => 'export.filter.course.by_job_working.Job working before'
+            ])
+        ;
+    }
+
+    public function getFormDefaultData(): array
+    {
+        return [
+            'jobs' => [],
+            'start_date' => new RollingDate(RollingDate::T_YEAR_CURRENT_START),
+            'end_date' => new RollingDate(RollingDate::T_TODAY),
+        ];
+    }
+
+    public function getTitle(): string
+    {
+        return 'export.filter.course.by_job_working.title';
+    }
+
+    public function describeAction($data, $format = 'string'): array
+    {
+        return [
+            'export.filter.course.by_job_working.Filtered by job working on course: only %jobs%, between %start_date% and %end_date%', [
+                '%jobs%' => implode(
+                    ', ',
+                    array_map(
+                        fn (UserJob $userJob) => $this->translatableStringHelper->localize($userJob->getLabel()),
+                        $data['jobs']
+                    )
+                ),
+                '%start_date%' => $this->rollingDateConverter->convert($data['start_date'])?->format('d-m-Y'),
+                '%end_date%' => $this->rollingDateConverter->convert($data['end_date'])?->format('d-m-Y'),
+            ],
+        ];
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data): void
+    {
+        $ai_alias = 'jobs_working_on_course_filter_acc_info';
+        $ai_user_alias = 'jobs_working_on_course_filter_user';
+        $ai_jobs = 'jobs_working_on_course_filter_jobs';
+        $start = 'acp_jobs_work_on_start';
+        $end = 'acp_jobs_work_on_end';
+
+        $qb
+            ->andWhere(
+                $qb->expr()->exists(
+                    "SELECT 1 FROM " . AccompanyingPeriod\AccompanyingPeriodInfo::class . " {$ai_alias} JOIN {$ai_alias}.user {$ai_user_alias} " .
+                    "WHERE IDENTITY({$ai_alias}.accompanyingPeriod) = acp.id
+                    AND {$ai_user_alias}.userJob IN (:{$ai_jobs})
+                    AND {$ai_alias}.infoDate >= :{$start} and {$ai_alias}.infoDate < :{$end}
+                    "
+                )
+            )
+            ->setParameter($ai_jobs, $data['jobs'])
+            ->setParameter($start, $this->rollingDateConverter->convert($data['start_date']))
+            ->setParameter($end, $this->rollingDateConverter->convert($data['end_date']))
+        ;
+    }
+
+    public function applyOn(): string
+    {
+        return Declarations::ACP_TYPE;
+    }
+}

src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/OpenBetweenDatesFilter.php

@@ -35,7 +35,7 @@ class OpenBetweenDatesFilter implements FilterInterface
     {
         $clause = $qb->expr()->andX(
             $qb->expr()->gte('acp.openingDate', ':datefrom'),
-            $qb->expr()->lte('acp.openingDate', ':dateto')
+            $qb->expr()->lt('acp.openingDate', ':dateto')
         );
 
         $qb->andWhere($clause);
@@ -51,12 +51,12 @@ class OpenBetweenDatesFilter implements FilterInterface
     public function buildForm(FormBuilderInterface $builder)
     {
         $builder
-            ->add('date_from', PickRollingDateType::class, [
-                'data' => new RollingDate(RollingDate::T_MONTH_PREVIOUS_START),
-            ])
-            ->add('date_to', PickRollingDateType::class, [
-                'data' => new RollingDate(RollingDate::T_TODAY),
-            ]);
+            ->add('date_from', PickRollingDateType::class, [])
+            ->add('date_to', PickRollingDateType::class, []);
+    }
+    public function getFormDefaultData(): array
+    {
+        return ['date_from' => new RollingDate(RollingDate::T_MONTH_PREVIOUS_START), 'date_to' => new RollingDate(RollingDate::T_TODAY)];
     }
 
     public function describeAction($data, $format = 'string'): array

src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/OriginFilter.php

@@ -60,6 +60,10 @@ class OriginFilter implements FilterInterface
             'expanded' => true,
         ]);
     }
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
 
     public function describeAction($data, $format = 'string'): array
     {

src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ReferrerFilter.php

@@ -73,11 +73,14 @@ class ReferrerFilter implements FilterInterface
                 'multiple' => true,
             ])
             ->add('date_calc', PickRollingDateType::class, [
-                'data' => new RollingDate(RollingDate::T_TODAY),
                 'label' => 'export.filter.course.by_referrer.Computation date for referrer',
                 'required' => true,
             ]);
     }
+    public function getFormDefaultData(): array
+    {
+        return ['date_calc' => new RollingDate(RollingDate::T_TODAY)];
+    }
 
     public function describeAction($data, $format = 'string'): array
     {

src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/RequestorFilter.php

@@ -118,9 +118,12 @@ final class RequestorFilter implements FilterInterface
             'multiple' => false,
             'expanded' => true,
             'empty_data' => self::DEFAULT_CHOICE,
-            'data' => self::DEFAULT_CHOICE,
         ]);
     }
+    public function getFormDefaultData(): array
+    {
+        return ['accepted_choices' => self::DEFAULT_CHOICE];
+    }
 
     public function describeAction($data, $format = 'string'): array
     {

src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ScopeWorkingOnCourseFilter.php

@@ -0,0 +1,132 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters;
+
+use Chill\MainBundle\Entity\Scope;
+use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Entity\UserJob;
+use Chill\MainBundle\Export\FilterInterface;
+use Chill\MainBundle\Form\Type\PickRollingDateType;
+use Chill\MainBundle\Form\Type\PickUserDynamicType;
+use Chill\MainBundle\Repository\ScopeRepositoryInterface;
+use Chill\MainBundle\Repository\UserJobRepositoryInterface;
+use Chill\MainBundle\Service\RollingDate\RollingDate;
+use Chill\MainBundle\Service\RollingDate\RollingDateConverterInterface;
+use Chill\MainBundle\Templating\Entity\UserRender;
+use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Export\Declarations;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
+use Symfony\Component\Form\FormBuilderInterface;
+
+/**
+ * Filter course where a user with the given scope is "working" on it
+ *
+ * Makes use of AccompanyingPeriodInfo
+ */
+readonly class ScopeWorkingOnCourseFilter implements FilterInterface
+{
+    public function __construct(
+        private ScopeRepositoryInterface $scopeRepository,
+        private RollingDateConverterInterface $rollingDateConverter,
+        private TranslatableStringHelperInterface $translatableStringHelper,
+    ) {
+    }
+
+    public function buildForm(FormBuilderInterface $builder): void
+    {
+        $scopes = $this->scopeRepository->findAllActive();
+        usort($scopes, fn (Scope $a, Scope $b) => $this->translatableStringHelper->localize($a->getName()) <=> $this->translatableStringHelper->localize($b->getName()));
+
+        $builder
+            ->add('scopes', EntityType::class, [
+                'class' => Scope::class,
+                'choices' => $scopes,
+                'choice_label' => fn (Scope $scope) => $this->translatableStringHelper->localize($scope->getName()),
+                'multiple' => true,
+                'expanded' => true,
+            ])
+            ->add('start_date', PickRollingDateType::class, [
+                'label' => 'export.filter.course.by_scope_working.Scope working after'
+            ])
+            ->add('end_date', PickRollingDateType::class, [
+                'label' => 'export.filter.course.by_scope_working.Scope working before'
+            ])
+        ;
+    }
+
+    public function getFormDefaultData(): array
+    {
+        return [
+            'scopes' => [],
+            'start_date' => new RollingDate(RollingDate::T_YEAR_CURRENT_START),
+            'end_date' => new RollingDate(RollingDate::T_TODAY),
+        ];
+    }
+
+    public function getTitle(): string
+    {
+        return 'export.filter.course.by_scope_working.title';
+    }
+
+    public function describeAction($data, $format = 'string'): array
+    {
+        return [
+            'export.filter.course.by_scope_working.Filtered by scope working on course: only %scopes%, between %start_date% and %end_date%', [
+                '%scopes%' => implode(
+                    ', ',
+                    array_map(
+                        fn (Scope $scope) => $this->translatableStringHelper->localize($scope->getName()),
+                        $data['scopes']
+                    )
+                ),
+                '%start_date%' => $this->rollingDateConverter->convert($data['start_date'])?->format('d-m-Y'),
+                '%end_date%' => $this->rollingDateConverter->convert($data['end_date'])?->format('d-m-Y'),
+            ],
+        ];
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data): void
+    {
+        $ai_alias = 'scopes_working_on_course_filter_acc_info';
+        $ai_user_alias = 'scopes_working_on_course_filter_user';
+        $ai_scopes = 'scopes_working_on_course_filter_scopes';
+        $start = 'acp_scopes_work_on_start';
+        $end = 'acp_scopes_work_on_end';
+
+        $qb
+            ->andWhere(
+                $qb->expr()->exists(
+                    "SELECT 1 FROM " . AccompanyingPeriod\AccompanyingPeriodInfo::class . " {$ai_alias} JOIN {$ai_alias}.user {$ai_user_alias} " .
+                    "WHERE IDENTITY({$ai_alias}.accompanyingPeriod) = acp.id
+                    AND {$ai_user_alias}.mainScope IN (:{$ai_scopes})
+                    AND {$ai_alias}.infoDate >= :{$start} and {$ai_alias}.infoDate < :{$end}
+                    "
+                )
+            )
+            ->setParameter($ai_scopes, $data['scopes'])
+            ->setParameter($start, $this->rollingDateConverter->convert($data['start_date']))
+            ->setParameter($end, $this->rollingDateConverter->convert($data['end_date']))
+        ;
+    }
+
+    public function applyOn(): string
+    {
+        return Declarations::ACP_TYPE;
+    }
+}

src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/SocialActionFilter.php

@@ -62,6 +62,10 @@ class SocialActionFilter implements FilterInterface
             'multiple' => true,
         ]);
     }
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
 
     public function describeAction($data, $format = 'string'): array
     {

src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/SocialIssueFilter.php

@@ -66,6 +66,10 @@ class SocialIssueFilter implements FilterInterface
             'multiple' => true,
         ]);
     }
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
 
     public function describeAction($data, $format = 'string'): array
     {

src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/StepFilterBetweenDates.php

@@ -0,0 +1,125 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters;
+
+use Chill\MainBundle\Export\FilterInterface;
+use Chill\MainBundle\Form\Type\PickRollingDateType;
+use Chill\MainBundle\Service\RollingDate\RollingDate;
+use Chill\MainBundle\Service\RollingDate\RollingDateConverterInterface;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Export\Declarations;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
+use function in_array;
+
+class StepFilterBetweenDates implements FilterInterface
+{
+    private const DEFAULT_CHOICE = [
+        AccompanyingPeriod::STEP_CONFIRMED,
+        AccompanyingPeriod::STEP_CONFIRMED_INACTIVE_SHORT,
+        AccompanyingPeriod::STEP_CONFIRMED_INACTIVE_LONG,
+    ];
+
+    private const STEPS = [
+        'course.draft' => AccompanyingPeriod::STEP_DRAFT,
+        'course.confirmed' => AccompanyingPeriod::STEP_CONFIRMED,
+        'course.closed' => AccompanyingPeriod::STEP_CLOSED,
+        'course.inactive_short' => AccompanyingPeriod::STEP_CONFIRMED_INACTIVE_SHORT,
+        'course.inactive_long' => AccompanyingPeriod::STEP_CONFIRMED_INACTIVE_LONG,
+    ];
+
+    private RollingDateConverterInterface $rollingDateConverter;
+
+    private TranslatorInterface $translator;
+
+    public function __construct(
+        RollingDateConverterInterface $rollingDateConverter,
+        TranslatorInterface $translator
+    ) {
+        $this->rollingDateConverter = $rollingDateConverter;
+        $this->translator = $translator;
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        $alias = 'acp_filter_by_step_between_dat_alias';
+        $steps = 'acp_filter_by_step_between_dat_steps';
+        $from = 'acp_filter_by_step_between_dat_from';
+        $to = 'acp_filter_by_step_between_dat_to';
+
+        $qb
+            ->andWhere(
+                $qb->expr()->exists(
+                    "SELECT 1 FROM " . AccompanyingPeriod\AccompanyingPeriodStepHistory::class . " {$alias} " .
+                    "WHERE {$alias}.step IN (:{$steps}) AND OVERLAPSI ({$alias}.startDate, {$alias}.endDate),(:{$from}, :{$to}) = TRUE " .
+                    "AND {$alias}.period = acp"
+                )
+            )
+            ->setParameter($from, $this->rollingDateConverter->convert($data['date_from']))
+            ->setParameter($to, $this->rollingDateConverter->convert($data['date_to']))
+            ->setParameter($steps, $data['accepted_steps_multi']);
+    }
+
+    public function applyOn()
+    {
+        return Declarations::ACP_TYPE;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        $builder
+            ->add('accepted_steps_multi', ChoiceType::class, [
+                'label' => 'export.filter.course.by_step.steps',
+                'choices' => self::STEPS,
+                'multiple' => true,
+                'expanded' => true,
+            ])
+            ->add('date_from', PickRollingDateType::class, [
+                'label' => 'export.filter.course.by_step.date_from',
+            ])
+            ->add('date_to', PickRollingDateType::class, [
+                'label' => 'export.filter.course.by_step.date_to',
+            ]);
+    }
+
+    public function getFormDefaultData(): array
+    {
+        return [
+            'accepted_steps_multi' => self::DEFAULT_CHOICE,
+            'date_from' => new RollingDate(RollingDate::T_YEAR_CURRENT_START),
+            'date_to' => new RollingDate(RollingDate::T_TODAY),
+        ];
+    }
+
+    public function describeAction($data, $format = 'string')
+    {
+        $steps = array_map(fn (string $step) => $this->translator->trans(array_flip(self::STEPS)[$step]), $data['accepted_steps_multi']);
+
+        return ['export.filter.course.by_step.Filtered by steps: only %step% and between %date_from% and %date_to%', [
+            '%step%' => implode(', ', $steps),
+            '%date_from%' => $this->rollingDateConverter->convert($data['date_from'])->format('d-m-Y'),
+            '%date_to%' => $this->rollingDateConverter->convert($data['date_to'])->format('d-m-Y'),
+        ]];
+    }
+
+    public function getTitle()
+    {
+        return 'export.filter.course.by_step.Filter by step between dates';
+    }
+}

src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/StepFilterOnDate.php

@@ -23,18 +23,24 @@ use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
 use function in_array;
 
-class StepFilter implements FilterInterface
+class StepFilterOnDate implements FilterInterface
 {
     private const A = 'acp_filter_bystep_stephistories';
 
-    private const DEFAULT_CHOICE = AccompanyingPeriod::STEP_CONFIRMED;
+    private const DEFAULT_CHOICE = [
+        AccompanyingPeriod::STEP_CONFIRMED,
+        AccompanyingPeriod::STEP_CONFIRMED_INACTIVE_SHORT,
+        AccompanyingPeriod::STEP_CONFIRMED_INACTIVE_LONG,
+    ];
 
     private const P = 'acp_step_filter_date';
 
     private const STEPS = [
-        'Draft' => AccompanyingPeriod::STEP_DRAFT,
-        'Confirmed' => AccompanyingPeriod::STEP_CONFIRMED,
-        'Closed' => AccompanyingPeriod::STEP_CLOSED,
+        'course.draft' => AccompanyingPeriod::STEP_DRAFT,
+        'course.confirmed' => AccompanyingPeriod::STEP_CONFIRMED,
+        'course.closed' => AccompanyingPeriod::STEP_CLOSED,
+        'course.inactive_short' => AccompanyingPeriod::STEP_CONFIRMED_INACTIVE_SHORT,
+        'course.inactive_long' => AccompanyingPeriod::STEP_CONFIRMED_INACTIVE_LONG,
     ];
 
     public function __construct(private RollingDateConverterInterface $rollingDateConverter, private TranslatorInterface $translator)
@@ -66,7 +72,7 @@ class StepFilter implements FilterInterface
                 $qb->expr()->in(self::A . '.step', ':acp_filter_by_step_steps')
             )
             ->setParameter(self::P, $this->rollingDateConverter->convert($data['calc_date']))
-            ->setParameter('acp_filter_by_step_steps', $data['accepted_steps']);
+            ->setParameter('acp_filter_by_step_steps', $data['accepted_steps_multi']);
     }
 
     public function applyOn()
@@ -77,30 +83,36 @@ class StepFilter implements FilterInterface
     public function buildForm(FormBuilderInterface $builder)
     {
         $builder
-            ->add('accepted_steps', ChoiceType::class, [
+            ->add('accepted_steps_multi', ChoiceType::class, [
+                'label' => 'export.filter.course.by_step.steps',
                 'choices' => self::STEPS,
-                'multiple' => false,
+                'multiple' => true,
                 'expanded' => true,
-                'empty_data' => self::DEFAULT_CHOICE,
-                'data' => self::DEFAULT_CHOICE,
             ])
             ->add('calc_date', PickRollingDateType::class, [
-                'label' => 'export.acp.filter.by_step.date_calc',
-                'data' => new RollingDate(RollingDate::T_TODAY),
+                'label' => 'export.filter.course.by_step.date_calc',
             ]);
     }
 
+    public function getFormDefaultData(): array
+    {
+        return [
+            'accepted_steps_multi' => self::DEFAULT_CHOICE,
+            'calc_date' => new RollingDate(RollingDate::T_TODAY),
+        ];
+    }
+
     public function describeAction($data, $format = 'string')
     {
-        $step = array_flip(self::STEPS)[$data['accepted_steps']];
+        $steps = array_map(fn (string $step) => $this->translator->trans(array_flip(self::STEPS)[$step]), $data['accepted_steps_multi']);
 
         return ['Filtered by steps: only %step%', [
-            '%step%' => $this->translator->trans($step),
+            '%step%' => implode(', ', $steps),
         ]];
     }
 
     public function getTitle()
     {
-        return 'Filter by step';
+        return 'export.filter.course.by_step.Filter by step';
     }
 }

src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/UserJobFilter.php

@@ -84,11 +84,14 @@ class UserJobFilter implements FilterInterface
                 'label' => 'Job',
             ])
             ->add('date_calc', PickRollingDateType::class, [
-                'data' => new RollingDate(RollingDate::T_TODAY),
                 'label' => 'export.filter.course.by_user_scope.Computation date for referrer',
                 'required' => true,
             ]);
     }
+    public function getFormDefaultData(): array
+    {
+        return ['date_calc' => new RollingDate(RollingDate::T_TODAY)];
+    }
 
     public function describeAction($data, $format = 'string')
     {

src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/UserScopeFilter.php

@@ -84,11 +84,14 @@ class UserScopeFilter implements FilterInterface
                 'expanded' => true,
             ])
             ->add('date_calc', PickRollingDateType::class, [
-                'data' => new RollingDate(RollingDate::T_TODAY),
                 'label' => 'export.filter.course.by_user_scope.Computation date for referrer',
                 'required' => true,
             ]);
     }
+    public function getFormDefaultData(): array
+    {
+        return ['date_calc' => new RollingDate(RollingDate::T_TODAY)];
+    }
 
     public function describeAction($data, $format = 'string')
     {

src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/UserWorkingOnCourseFilter.php

@@ -0,0 +1,114 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters;
+
+use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Export\FilterInterface;
+use Chill\MainBundle\Form\Type\PickRollingDateType;
+use Chill\MainBundle\Form\Type\PickUserDynamicType;
+use Chill\MainBundle\Service\RollingDate\RollingDate;
+use Chill\MainBundle\Service\RollingDate\RollingDateConverterInterface;
+use Chill\MainBundle\Templating\Entity\UserRender;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Export\Declarations;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\FormBuilderInterface;
+
+/**
+ * Filter course where a user is "working" on it
+ *
+ * Makes use of AccompanyingPeriodInfo
+ */
+readonly class UserWorkingOnCourseFilter implements FilterInterface
+{
+    public function __construct(
+        private UserRender $userRender,
+        private RollingDateConverterInterface $rollingDateConverter,
+    ) {
+    }
+
+    public function buildForm(FormBuilderInterface $builder): void
+    {
+        $builder
+            ->add('users', PickUserDynamicType::class, [
+                'multiple' => true,
+            ])
+            ->add('start_date', PickRollingDateType::class, [
+                'label' => 'export.filter.course.by_user_working.User working after'
+            ])
+            ->add('end_date', PickRollingDateType::class, [
+                'label' => 'export.filter.course.by_user_working.User working before'
+            ])
+        ;
+    }
+
+    public function getFormDefaultData(): array
+    {
+        return [
+            'users' => [],
+            'start_date' => new RollingDate(RollingDate::T_YEAR_CURRENT_START),
+            'end_date' => new RollingDate(RollingDate::T_TODAY),
+        ];
+    }
+
+    public function getTitle(): string
+    {
+        return 'export.filter.course.by_user_working.title';
+    }
+
+    public function describeAction($data, $format = 'string'): array
+    {
+        return [
+            'export.filter.course.by_user_working.Filtered by user working on course: only %users%, between %start_date% and %end_date%', [
+                '%users%' => implode(
+                    ', ',
+                    array_map(
+                        fn (User $u) => $this->userRender->renderString($u, []),
+                        $data['users']
+                    )
+                ),
+                '%start_date%' => $this->rollingDateConverter->convert($data['start_date'])?->format('d-m-Y'),
+                '%end_date%' => $this->rollingDateConverter->convert($data['end_date'])?->format('d-m-Y'),
+            ],
+        ];
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data): void
+    {
+        $ai_alias = 'user_working_on_course_filter_acc_info';
+        $ai_users = 'user_working_on_course_filter_users';
+        $start = 'acp_use_work_on_start';
+        $end = 'acp_use_work_on_end';
+
+        $qb
+            ->andWhere(
+                $qb->expr()->exists(
+                    "SELECT 1 FROM " . AccompanyingPeriod\AccompanyingPeriodInfo::class . " {$ai_alias}  " .
+                    "WHERE {$ai_alias}.user IN (:{$ai_users}) AND IDENTITY({$ai_alias}.accompanyingPeriod) = acp.id AND {$ai_alias}.infoDate >= :{$start} and {$ai_alias}.infoDate < :{$end}"
+                )
+            )
+            ->setParameter($ai_users, $data['users'])
+            ->setParameter($start, $this->rollingDateConverter->convert($data['start_date']))
+            ->setParameter($end, $this->rollingDateConverter->convert($data['end_date']))
+        ;
+    }
+
+    public function applyOn(): string
+    {
+        return Declarations::ACP_TYPE;
+    }
+}

src/Bundle/ChillPersonBundle/Export/Filter/EvaluationFilters/ByEndDateFilter.php

@@ -54,13 +54,15 @@ class ByEndDateFilter implements FilterInterface
         $builder
             ->add('start_date', PickRollingDateType::class, [
                 'label' => 'start period date',
-                'data' => new RollingDate(RollingDate::T_YEAR_PREVIOUS_START),
             ])
             ->add('end_date', PickRollingDateType::class, [
                 'label' => 'end period date',
-                'data' => new RollingDate(RollingDate::T_TODAY),
             ]);
     }
+    public function getFormDefaultData(): array
+    {
+        return ['start_date' => new RollingDate(RollingDate::T_YEAR_PREVIOUS_START), 'end_date' => new RollingDate(RollingDate::T_TODAY)];
+    }
 
     public function describeAction($data, $format = 'string'): array
     {

src/Bundle/ChillPersonBundle/Export/Filter/EvaluationFilters/ByStartDateFilter.php

@@ -54,13 +54,15 @@ class ByStartDateFilter implements FilterInterface
         $builder
             ->add('start_date', PickRollingDateType::class, [
                 'label' => 'start period date',
-                'data' => new RollingDate(RollingDate::T_YEAR_PREVIOUS_START),
             ])
             ->add('end_date', PickRollingDateType::class, [
                 'label' => 'end period date',
-                'data' => new RollingDate(RollingDate::T_TODAY),
             ]);
     }
+    public function getFormDefaultData(): array
+    {
+        return ['start_date' => new RollingDate(RollingDate::T_YEAR_PREVIOUS_START), 'end_date' => new RollingDate(RollingDate::T_TODAY)];
+    }
 
     public function describeAction($data, $format = 'string'): array
     {

src/Bundle/ChillPersonBundle/Export/Filter/EvaluationFilters/CurrentEvaluationsFilter.php

@@ -37,6 +37,10 @@ class CurrentEvaluationsFilter implements FilterInterface
     {
         //no form needed
     }
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
 
     public function describeAction($data, $format = 'string'): array
     {

src/Bundle/ChillPersonBundle/Export/Filter/EvaluationFilters/EvaluationTypeFilter.php

@@ -60,6 +60,10 @@ final class EvaluationTypeFilter implements FilterInterface
             'expanded' => true,
         ]);
     }
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
 
     public function describeAction($data, $format = 'string'): array
     {

src/Bundle/ChillPersonBundle/Export/Filter/EvaluationFilters/MaxDateFilter.php

@@ -58,6 +58,10 @@ class MaxDateFilter implements FilterInterface
             'expanded' => true,
         ]);
     }
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
 
     public function describeAction($data, $format = 'string'): array
     {

src/Bundle/ChillPersonBundle/Export/Filter/HouseholdFilters/CompositionFilter.php

@@ -76,9 +76,11 @@ class CompositionFilter implements FilterInterface
                 'multiple' => true,
                 'expanded' => true,
             ])
-            ->add('on_date', PickRollingDateType::class, [
-                'data' => new RollingDate(RollingDate::T_TODAY),
-            ]);
+            ->add('on_date', PickRollingDateType::class, []);
+    }
+    public function getFormDefaultData(): array
+    {
+        return ['on_date' => new RollingDate(RollingDate::T_TODAY)];
     }
 
     public function describeAction($data, $format = 'string'): array

src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/AddressRefStatusFilter.php

@@ -71,17 +71,19 @@ class AddressRefStatusFilter implements \Chill\MainBundle\Export\FilterInterface
             ->add('date_calc', PickRollingDateType::class, [
                 'label' => 'Compute address at date',
                 'required' => true,
-                'data' => new RollingDate(RollingDate::T_TODAY),
             ])
             ->add('ref_statuses', ChoiceType::class, [
                 'label' => 'export.filter.person.by_address_ref_status.Status',
                 'choices' => [Address::ADDR_REFERENCE_STATUS_TO_REVIEW, Address::ADDR_REFERENCE_STATUS_REVIEWED, Address::ADDR_REFERENCE_STATUS_MATCH],
                 'choice_label' => fn (string $item) => 'export.filter.person.by_address_ref_status.'.$item,
                 'multiple' => true,
-                'expanded' => true,
-                'data' => [Address::ADDR_REFERENCE_STATUS_TO_REVIEW]
+                'expanded' => true
             ]);
     }
+    public function getFormDefaultData(): array
+    {
+        return ['date_calc' => new RollingDate(RollingDate::T_TODAY), 'ref_statuses' => [Address::ADDR_REFERENCE_STATUS_TO_REVIEW]];
+    }
 
     public function describeAction($data, $format = 'string')
     {

src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/AgeFilter.php

@@ -89,6 +89,15 @@ class AgeFilter implements ExportElementValidatedInterface, FilterInterface
         ]);
     }
 
+    public function getFormDefaultData(): array
+    {
+        return [
+            'min_age' => 0,
+            'max_age' => 120,
+            'date_calc' => new RollingDate(RollingDate::T_TODAY),
+        ];
+    }
+
     public function describeAction($data, $format = 'string')
     {
         return ['Filtered by person\'s age: '

src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/BirthdateFilter.php

@@ -68,14 +68,16 @@ class BirthdateFilter implements ExportElementValidatedInterface, FilterInterfac
     {
         $builder->add('date_from', PickRollingDateType::class, [
             'label' => 'Born after this date',
-            'data' => new RollingDate(RollingDate::T_YEAR_PREVIOUS_START),
         ]);
 
         $builder->add('date_to', PickRollingDateType::class, [
             'label' => 'Born before this date',
-            'data' => new RollingDate(RollingDate::T_TODAY),
         ]);
     }
+    public function getFormDefaultData(): array
+    {
+        return ['date_from' => new RollingDate(RollingDate::T_YEAR_PREVIOUS_START), 'date_to' => new RollingDate(RollingDate::T_TODAY)];
+    }
 
     public function describeAction($data, $format = 'string')
     {

src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/ByHouseholdCompositionFilter.php

@@ -74,9 +74,12 @@ class ByHouseholdCompositionFilter implements FilterInterface
             ])
             ->add('calc_date', PickRollingDateType::class, [
                 'label' => 'export.filter.person.by_composition.Date calc',
-                'data' => new RollingDate(RollingDate::T_TODAY),
             ]);
     }
+    public function getFormDefaultData(): array
+    {
+        return ['calc_date' => new RollingDate(RollingDate::T_TODAY)];
+    }
 
     public function describeAction($data, $format = 'string')
     {

src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/DeadOrAliveFilter.php

@@ -98,9 +98,12 @@ class DeadOrAliveFilter implements FilterInterface
 
         $builder->add('date_calc', PickRollingDateType::class, [
             'label' => 'Filter in relation to this date',
-            'data' => new RollingDate(RollingDate::T_TODAY),
         ]);
     }
+    public function getFormDefaultData(): array
+    {
+        return ['date_calc' => new RollingDate(RollingDate::T_TODAY)];
+    }
 
     public function describeAction($data, $format = 'string')
     {