Partage d'export enregistré et génération asynchrone des exports

src/Bundle/ChillPersonBundle/AccompanyingPeriod/Events/UserRefEventSubscriber.php

@@ -25,7 +25,7 @@ class UserRefEventSubscriber implements EventSubscriberInterface
 {
     public function __construct(private readonly Security $security, private readonly TranslatorInterface $translator, private readonly \Twig\Environment $engine, private readonly NotificationPersisterInterface $notificationPersister) {}
 
-    public static function getSubscribedEvents()
+    public static function getSubscribedEvents(): array
     {
         return [
             'workflow.accompanying_period_lifecycle.entered' => [

src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php

@@ -12,7 +12,6 @@ declare(strict_types=1);
 namespace Chill\PersonBundle\DependencyInjection;
 
 use Chill\MainBundle\DependencyInjection\MissingBundleException;
-use Chill\MainBundle\Security\Authorization\ChillExportVoter;
 use Chill\PersonBundle\Controller\AccompanyingPeriodCommentApiController;
 use Chill\PersonBundle\Controller\AccompanyingPeriodResourceApiController;
 use Chill\PersonBundle\Controller\AdministrativeStatusController;
@@ -1027,8 +1026,6 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
             'role_hierarchy' => [
                 PersonVoter::UPDATE => [PersonVoter::SEE],
                 PersonVoter::CREATE => [PersonVoter::SEE],
-                PersonVoter::LISTS => [ChillExportVoter::EXPORT],
-                PersonVoter::STATS => [ChillExportVoter::EXPORT],
                 // accompanying period
                 AccompanyingPeriodVoter::SEE_DETAILS => [AccompanyingPeriodVoter::SEE],
                 AccompanyingPeriodVoter::CREATE => [AccompanyingPeriodVoter::SEE_DETAILS],

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

@@ -27,7 +27,7 @@ class AdministrativeLocationAggregator implements AggregatorInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data)
+    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
     {
         if (!\in_array('acploc', $qb->getAllAliases(), true)) {
             $qb->leftJoin('acp.administrativeLocation', 'acploc');
@@ -42,17 +42,32 @@ class AdministrativeLocationAggregator implements AggregatorInterface
         return Declarations::ACP_TYPE;
     }
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder): void
     {
         // no form
     }
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return [];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return [];
+    }
+
     public function getFormDefaultData(): array
     {
         return [];
     }
 
-    public function getLabels($key, array $values, $data)
+    public function getLabels($key, array $values, $data): callable
     {
         return function ($value): string {
             if ('_header' === $value) {
@@ -74,7 +89,7 @@ class AdministrativeLocationAggregator implements AggregatorInterface
         return ['location_aggregator'];
     }
 
-    public function getTitle()
+    public function getTitle(): string|\Symfony\Contracts\Translation\TranslatableInterface
     {
         return 'Group by administrative location';
     }

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

@@ -24,7 +24,7 @@ class ByActionNumberAggregator implements AggregatorInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data): void
+    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
     {
         $qb->addSelect('(SELECT COUNT(acp_by_action_action.id) FROM '.AccompanyingPeriodWork::class.' acp_by_action_action WHERE acp_by_action_action.accompanyingPeriod = acp) AS acp_by_action_number_aggregator')
             ->addGroupBy('acp_by_action_number_aggregator');
@@ -40,12 +40,27 @@ class ByActionNumberAggregator implements AggregatorInterface
         // No form needed
     }
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return [];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return [];
+    }
+
     public function getFormDefaultData(): array
     {
         return [];
     }
 
-    public function getLabels($key, array $values, $data)
+    public function getLabels($key, array $values, $data): callable
     {
         return static function ($value) {
             if ('_header' === $value) {

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

@@ -39,6 +39,21 @@ final readonly class ClosingDateAggregator implements AggregatorInterface
         ]);
     }
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return ['frequency' => $formData['frequency']];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return ['frequency' => $formData['frequency']];
+    }
+
     public function getFormDefaultData(): array
     {
         return [
@@ -46,7 +61,7 @@ final readonly class ClosingDateAggregator implements AggregatorInterface
         ];
     }
 
-    public function getLabels($key, array $values, mixed $data)
+    public function getLabels($key, array $values, mixed $data): callable
     {
         return function (?string $value): string {
             if ('_header' === $value) {
@@ -57,12 +72,12 @@ final readonly class ClosingDateAggregator implements AggregatorInterface
         };
     }
 
-    public function getQueryKeys($data)
+    public function getQueryKeys($data): array
     {
         return [self::PREFIX.'_closing_date'];
     }
 
-    public function getTitle()
+    public function getTitle(): string|\Symfony\Contracts\Translation\TranslatableInterface
     {
         return 'export.aggregator.course.by_closing_date.title';
     }
@@ -72,7 +87,7 @@ final readonly class ClosingDateAggregator implements AggregatorInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data)
+    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
     {
         $p = self::PREFIX;
 
@@ -81,7 +96,7 @@ final readonly class ClosingDateAggregator implements AggregatorInterface
         $qb->addOrderBy("{$p}_closing_date", 'DESC');
     }
 
-    public function applyOn()
+    public function applyOn(): string
     {
         return Declarations::ACP_TYPE;
     }

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

@@ -27,7 +27,7 @@ class ClosingMotiveAggregator implements AggregatorInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data)
+    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
     {
         $qb->addSelect('IDENTITY(acp.closingMotive) AS closingmotive_aggregator');
         $qb->addGroupBy('closingmotive_aggregator');
@@ -38,17 +38,32 @@ class ClosingMotiveAggregator implements AggregatorInterface
         return Declarations::ACP_TYPE;
     }
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder): void
     {
         // no form
     }
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return [];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return [];
+    }
+
     public function getFormDefaultData(): array
     {
         return [];
     }
 
-    public function getLabels($key, array $values, $data)
+    public function getLabels($key, array $values, $data): callable
     {
         return function ($value): string {
             if ('_header' === $value) {
@@ -67,7 +82,7 @@ class ClosingMotiveAggregator implements AggregatorInterface
         };
     }
 
-    public function getQueryKeys($data)
+    public function getQueryKeys($data): array
     {
         return ['closingmotive_aggregator'];
     }

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

@@ -26,7 +26,7 @@ class ConfidentialAggregator implements AggregatorInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data)
+    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
     {
         $qb->addSelect('acp.confidential AS confidential_aggregator');
         $qb->addGroupBy('confidential_aggregator');
@@ -37,17 +37,32 @@ class ConfidentialAggregator implements AggregatorInterface
         return Declarations::ACP_TYPE;
     }
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder): void
     {
         // no form
     }
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return [];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return [];
+    }
+
     public function getFormDefaultData(): array
     {
         return [];
     }
 
-    public function getLabels($key, array $values, $data)
+    public function getLabels($key, array $values, $data): callable
     {
         return function ($value): string {
             if ('_header' === $value) {

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

@@ -34,7 +34,7 @@ class CreatorJobAggregator implements AggregatorInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data)
+    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
     {
         $p = self::PREFIX;
 
@@ -78,14 +78,29 @@ class CreatorJobAggregator implements AggregatorInterface
         return Declarations::ACP_TYPE;
     }
 
-    public function buildForm(FormBuilderInterface $builder) {}
+    public function buildForm(FormBuilderInterface $builder): void {}
+
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return [];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return [];
+    }
 
     public function getFormDefaultData(): array
     {
         return [];
     }
 
-    public function getLabels($key, array $values, $data)
+    public function getLabels($key, array $values, $data): callable
     {
         return function ($value): string {
             if ('_header' === $value) {

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

@@ -33,7 +33,7 @@ final readonly class DurationAggregator implements AggregatorInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data)
+    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
     {
         match ($data['precision']) {
             'day' => $qb->addSelect('(COALESCE(acp.closingDate, :now) - acp.openingDate)  AS duration_aggregator'),
@@ -54,7 +54,7 @@ final readonly class DurationAggregator implements AggregatorInterface
         return Declarations::ACP_TYPE;
     }
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder): void
     {
         $builder->add('precision', ChoiceType::class, [
             'choices' => array_combine(self::CHOICES, self::CHOICES),
@@ -65,12 +65,27 @@ final readonly class DurationAggregator implements AggregatorInterface
         ]);
     }
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return ['precision' => $formData['precision']];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return ['precision' => $formData['precision']];
+    }
+
     public function getFormDefaultData(): array
     {
         return [];
     }
 
-    public function getLabels($key, array $values, $data)
+    public function getLabels($key, array $values, $data): callable
     {
         return static function ($value) use ($data) {
             if ('_header' === $value) {

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

@@ -26,7 +26,7 @@ class EmergencyAggregator implements AggregatorInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data)
+    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
     {
         $qb->addSelect('acp.emergency AS emergency_aggregator');
         $qb->addGroupBy('emergency_aggregator');
@@ -37,17 +37,32 @@ class EmergencyAggregator implements AggregatorInterface
         return Declarations::ACP_TYPE;
     }
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder): void
     {
         // no form
     }
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return [];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return [];
+    }
+
     public function getFormDefaultData(): array
     {
         return [];
     }
 
-    public function getLabels($key, array $values, $data)
+    public function getLabels($key, array $values, $data): callable
     {
         return function ($value): string {
             if ('_header' === $value) {

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

@@ -27,7 +27,7 @@ final readonly class EvaluationAggregator implements AggregatorInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data)
+    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
     {
         if (!\in_array('acpw', $qb->getAllAliases(), true)) {
             $qb->leftJoin('acp.works', 'acpw');
@@ -46,17 +46,32 @@ final readonly class EvaluationAggregator implements AggregatorInterface
         return Declarations::ACP_TYPE;
     }
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder): void
     {
         // no form
     }
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return [];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return [];
+    }
+
     public function getFormDefaultData(): array
     {
         return [];
     }
 
-    public function getLabels($key, array $values, $data)
+    public function getLabels($key, array $values, $data): callable
     {
         return function ($value): string {
             if ('_header' === $value) {

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

@@ -28,14 +28,20 @@ use Symfony\Component\Form\FormBuilderInterface;
 
 final readonly class GeographicalUnitStatAggregator implements AggregatorInterface
 {
-    public function __construct(private GeographicalUnitLayerRepositoryInterface $geographicalUnitLayerRepository, private TranslatableStringHelperInterface $translatableStringHelper, private RollingDateConverterInterface $rollingDateConverter) {}
+    use \Chill\MainBundle\Export\ExportDataNormalizerTrait;
+
+    public function __construct(
+        private GeographicalUnitLayerRepositoryInterface $geographicalUnitLayerRepository,
+        private TranslatableStringHelperInterface $translatableStringHelper,
+        private RollingDateConverterInterface $rollingDateConverter,
+    ) {}
 
     public function addRole(): ?string
     {
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data)
+    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
     {
         $qb->leftJoin('acp.locationHistories', 'acp_geog_agg_location_history');
 
@@ -105,7 +111,7 @@ final readonly class GeographicalUnitStatAggregator implements AggregatorInterfa
         return Declarations::ACP_TYPE;
     }
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder): void
     {
         $builder
             ->add('date_calc', PickRollingDateType::class, [
@@ -123,12 +129,27 @@ final readonly class GeographicalUnitStatAggregator implements AggregatorInterfa
             ]);
     }
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return ['date_calc' => $formData['date_calc']->normalize(), 'level' => $this->normalizeDoctrineEntity($formData['level'])];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return ['date_calc' => RollingDate::fromNormalized($formData['date_calc']), 'level' => $this->denormalizeDoctrineEntity($formData['level'], $this->geographicalUnitLayerRepository)];
+    }
+
     public function getFormDefaultData(): array
     {
         return ['date_calc' => new RollingDate(RollingDate::T_TODAY)];
     }
 
-    public function getLabels($key, array $values, $data)
+    public function getLabels($key, array $values, $data): callable
     {
         return match ($key) {
             'acp_geog_agg_unitname' => static function ($value): string {

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

@@ -26,7 +26,7 @@ class IntensityAggregator implements AggregatorInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data)
+    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
     {
         $qb->addSelect('acp.intensity AS intensity_aggregator');
         $qb->addGroupBy('intensity_aggregator');
@@ -37,17 +37,32 @@ class IntensityAggregator implements AggregatorInterface
         return Declarations::ACP_TYPE;
     }
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder): void
     {
         // no form
     }
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return [];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return [];
+    }
+
     public function getFormDefaultData(): array
     {
         return [];
     }
 
-    public function getLabels($key, array $values, $data)
+    public function getLabels($key, array $values, $data): callable
     {
         return function ($value): string {
             if ('_header' === $value) {

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

@@ -35,7 +35,7 @@ final readonly class JobWorkingOnCourseAggregator implements AggregatorInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data)
+    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
     {
         $p = self::PREFIX;
 
@@ -72,14 +72,29 @@ final readonly class JobWorkingOnCourseAggregator implements AggregatorInterface
         return Declarations::ACP_TYPE;
     }
 
-    public function buildForm(FormBuilderInterface $builder) {}
+    public function buildForm(FormBuilderInterface $builder): void {}
+
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return [];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return [];
+    }
 
     public function getFormDefaultData(): array
     {
         return [];
     }
 
-    public function getLabels($key, array $values, $data): \Closure
+    public function getLabels($key, array $values, $data): callable
     {
         return function (int|string|null $jobId) {
             if (null === $jobId || '' === $jobId) {

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

@@ -39,6 +39,21 @@ final readonly class OpeningDateAggregator implements AggregatorInterface
         ]);
     }
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return ['frequency' => $formData['frequency']];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return ['frequency' => $formData['frequency']];
+    }
+
     public function getFormDefaultData(): array
     {
         return [
@@ -46,7 +61,7 @@ final readonly class OpeningDateAggregator implements AggregatorInterface
         ];
     }
 
-    public function getLabels($key, array $values, mixed $data)
+    public function getLabels($key, array $values, mixed $data): callable
     {
         return function (?string $value): string {
             if ('_header' === $value) {
@@ -57,12 +72,12 @@ final readonly class OpeningDateAggregator implements AggregatorInterface
         };
     }
 
-    public function getQueryKeys($data)
+    public function getQueryKeys($data): array
     {
         return [self::PREFIX.'_opening_date'];
     }
 
-    public function getTitle()
+    public function getTitle(): string|\Symfony\Contracts\Translation\TranslatableInterface
     {
         return 'export.aggregator.course.by_opening_date.title';
     }
@@ -72,7 +87,7 @@ final readonly class OpeningDateAggregator implements AggregatorInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data)
+    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
     {
         $p = self::PREFIX;
 
@@ -81,7 +96,7 @@ final readonly class OpeningDateAggregator implements AggregatorInterface
         $qb->addOrderBy("{$p}_opening_date", 'DESC');
     }
 
-    public function applyOn()
+    public function applyOn(): string
     {
         return Declarations::ACP_TYPE;
     }

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

@@ -36,7 +36,7 @@ final readonly class OriginAggregator implements AggregatorInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data)
+    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
     {
         if (!\in_array('acporigin', $qb->getAllAliases(), true)) {
             $qb->leftJoin('acp.origin', 'acporigin');
@@ -51,17 +51,32 @@ final readonly class OriginAggregator implements AggregatorInterface
         return Declarations::ACP_TYPE;
     }
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder): void
     {
         // no form
     }
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return [];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return [];
+    }
+
     public function getFormDefaultData(): array
     {
         return [];
     }
 
-    public function getLabels($key, array $values, $data)
+    public function getLabels($key, array $values, $data): callable
     {
         return function ($value): string {
             if ('_header' === $value) {

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

@@ -25,17 +25,32 @@ final readonly class PersonParticipatingAggregator implements AggregatorInterfac
         private LabelPersonHelper $labelPersonHelper,
     ) {}
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder): void
     {
         // nothing to do here
     }
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return [];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return [];
+    }
+
     public function getFormDefaultData(): array
     {
         return [];
     }
 
-    public function getLabels($key, array $values, mixed $data)
+    public function getLabels($key, array $values, mixed $data): callable
     {
         return match ($key) {
             self::KEY => $this->labelPersonHelper->getLabel($key, $values, 'export.aggregator.course.by-user.header'),
@@ -43,12 +58,12 @@ final readonly class PersonParticipatingAggregator implements AggregatorInterfac
         };
     }
 
-    public function getQueryKeys($data)
+    public function getQueryKeys($data): array
     {
         return [self::KEY];
     }
 
-    public function getTitle()
+    public function getTitle(): string|\Symfony\Contracts\Translation\TranslatableInterface
     {
         return 'export.aggregator.course.by-user.title';
     }
@@ -58,7 +73,7 @@ final readonly class PersonParticipatingAggregator implements AggregatorInterfac
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data)
+    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
     {
         $k = self::KEY;
 
@@ -70,7 +85,7 @@ final readonly class PersonParticipatingAggregator implements AggregatorInterfac
             ->addGroupBy($k);
     }
 
-    public function applyOn()
+    public function applyOn(): string
     {
         return Declarations::ACP_TYPE;
     }

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

@@ -39,7 +39,7 @@ final readonly class ReferrerAggregator implements AggregatorInterface, DataTran
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data)
+    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
     {
         $qb
             ->addSelect('IDENTITY('.self::A.'.user) AS referrer_aggregator')
@@ -66,7 +66,7 @@ final readonly class ReferrerAggregator implements AggregatorInterface, DataTran
         return Declarations::ACP_TYPE;
     }
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder): void
     {
         $builder
             ->add('start_date', PickRollingDateType::class, [
@@ -79,6 +79,26 @@ final readonly class ReferrerAggregator implements AggregatorInterface, DataTran
             ]);
     }
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return ['start_date' => $formData['start_date']->normalize(), 'end_date' => $formData['end_date']->normalize()];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        $defaultData = $this->getFormDefaultData();
+
+        return [
+            'start_date' => array_key_exists('start_date', $formData) ? RollingDate::fromNormalized($formData['start_date']) : $defaultData['start_date'],
+            'end_date' => array_key_exists('end_date', $formData) ? RollingDate::fromNormalized($formData['end_date']) : $defaultData['end_date'],
+        ];
+    }
+
     public function getFormDefaultData(): array
     {
         return [
@@ -102,7 +122,7 @@ final readonly class ReferrerAggregator implements AggregatorInterface, DataTran
         return $data;
     }
 
-    public function getLabels($key, array $values, $data)
+    public function getLabels($key, array $values, $data): callable
     {
         return function ($value): string {
             if ('_header' === $value) {

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

@@ -39,7 +39,7 @@ readonly class ReferrerScopeAggregator implements AggregatorInterface, DataTrans
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data)
+    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
     {
         $p = self::PREFIX;
 
@@ -76,7 +76,7 @@ readonly class ReferrerScopeAggregator implements AggregatorInterface, DataTrans
         return Declarations::ACP_TYPE;
     }
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder): void
     {
         $builder
             ->add('start_date', PickRollingDateType::class, [
@@ -89,6 +89,26 @@ readonly class ReferrerScopeAggregator implements AggregatorInterface, DataTrans
             ]);
     }
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return ['start_date' => $formData['start_date']->normalize(), 'end_date' => $formData['end_date']->normalize()];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        $default = $this->getFormDefaultData();
+
+        return [
+            'start_date' => array_key_exists('start_date', $formData) ? RollingDate::fromNormalized($formData['start_date']) : $default['start_date'],
+            'end_date' => array_key_exists('end_date', $formData) ? RollingDate::fromNormalized($formData['end_date']) : $default['end_date'],
+        ];
+    }
+
     public function getFormDefaultData(): array
     {
         return [
@@ -108,7 +128,7 @@ readonly class ReferrerScopeAggregator implements AggregatorInterface, DataTrans
         return $data;
     }
 
-    public function getLabels($key, array $values, $data)
+    public function getLabels($key, array $values, $data): callable
     {
         return function ($value) {
             if ('_header' === $value) {

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

@@ -26,7 +26,7 @@ final readonly class RequestorAggregator implements AggregatorInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data)
+    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
     {
         if (!\in_array('acppart', $qb->getAllAliases(), true)) {
             $qb->join('acp.participations', 'acppart');
@@ -58,17 +58,32 @@ final readonly class RequestorAggregator implements AggregatorInterface
         return Declarations::ACP_TYPE;
     }
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder): void
     {
         // no form
     }
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return [];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return [];
+    }
+
     public function getFormDefaultData(): array
     {
         return [];
     }
 
-    public function getLabels($key, array $values, $data)
+    public function getLabels($key, array $values, $data): callable
     {
         return function ($value): string {
             if ('_header' === $value) {

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

@@ -27,7 +27,7 @@ final readonly class ScopeAggregator implements AggregatorInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data)
+    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
     {
         if (!\in_array('acpscope', $qb->getAllAliases(), true)) {
             $qb->leftJoin('acp.scopes', 'acpscope');
@@ -42,17 +42,32 @@ final readonly class ScopeAggregator implements AggregatorInterface
         return Declarations::ACP_TYPE;
     }
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder): void
     {
         // no form
     }
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return [];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return [];
+    }
+
     public function getFormDefaultData(): array
     {
         return [];
     }
 
-    public function getLabels($key, array $values, $data)
+    public function getLabels($key, array $values, $data): callable
     {
         return function ($value): string {
             if ('_header' === $value) {

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

@@ -35,7 +35,7 @@ final readonly class ScopeWorkingOnCourseAggregator implements AggregatorInterfa
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data)
+    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
     {
         $p = self::PREFIX;
 
@@ -72,14 +72,29 @@ final readonly class ScopeWorkingOnCourseAggregator implements AggregatorInterfa
         return Declarations::ACP_TYPE;
     }
 
-    public function buildForm(FormBuilderInterface $builder) {}
+    public function buildForm(FormBuilderInterface $builder): void {}
+
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return [];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return [];
+    }
 
     public function getFormDefaultData(): array
     {
         return [];
     }
 
-    public function getLabels($key, array $values, $data): \Closure
+    public function getLabels($key, array $values, $data): callable
     {
         return function (int|string|null $scopeId) {
             if (null === $scopeId || '' === $scopeId) {

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

@@ -27,7 +27,7 @@ final readonly class SocialActionAggregator implements AggregatorInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data)
+    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
     {
         if (!\in_array('acpw', $qb->getAllAliases(), true)) {
             // here, we will only see accompanying period linked with a socialAction
@@ -43,17 +43,32 @@ final readonly class SocialActionAggregator implements AggregatorInterface
         return Declarations::ACP_TYPE;
     }
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder): void
     {
         // no form
     }
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return [];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return [];
+    }
+
     public function getFormDefaultData(): array
     {
         return [];
     }
 
-    public function getLabels($key, array $values, $data)
+    public function getLabels($key, array $values, $data): callable
     {
         return function ($value) {
             if ('_header' === $value) {

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

@@ -27,7 +27,7 @@ final readonly class SocialIssueAggregator implements AggregatorInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data)
+    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
     {
         if (!\in_array('acpsocialissue', $qb->getAllAliases(), true)) {
             // we will see accompanying period linked with social issues
@@ -43,17 +43,32 @@ final readonly class SocialIssueAggregator implements AggregatorInterface
         return Declarations::ACP_TYPE;
     }
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder): void
     {
         // no form
     }
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return [];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return [];
+    }
+
     public function getFormDefaultData(): array
     {
         return [];
     }
 
-    public function getLabels($key, array $values, $data)
+    public function getLabels($key, array $values, $data): callable
     {
         return function ($value): string {
             if ('_header' === $value) {

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

@@ -34,7 +34,7 @@ final readonly class StepAggregator implements AggregatorInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data)
+    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
     {
         if (!\in_array(self::A, $qb->getAllAliases(), true)) {
             $qb->leftJoin('acp.stepHistories', self::A);
@@ -63,17 +63,32 @@ final readonly class StepAggregator implements AggregatorInterface
         return Declarations::ACP_TYPE;
     }
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder): void
     {
         $builder->add('on_date', PickRollingDateType::class, []);
     }
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return ['on_date' => $formData['on_date']->normalize()];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return ['on_date' => RollingDate::fromNormalized($formData['on_date'])];
+    }
+
     public function getFormDefaultData(): array
     {
         return ['on_date' => new RollingDate(RollingDate::T_TODAY)];
     }
 
-    public function getLabels($key, array $values, $data)
+    public function getLabels($key, array $values, $data): callable
     {
         return function ($value): string {
             switch ($value) {

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

@@ -39,7 +39,7 @@ final readonly class UserJobAggregator implements AggregatorInterface, DataTrans
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data)
+    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
     {
         $p = self::PREFIX;
 
@@ -76,7 +76,7 @@ final readonly class UserJobAggregator implements AggregatorInterface, DataTrans
         return Declarations::ACP_TYPE;
     }
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder): void
     {
         $builder
             ->add('start_date', PickRollingDateType::class, [
@@ -89,6 +89,21 @@ final readonly class UserJobAggregator implements AggregatorInterface, DataTrans
             ]);
     }
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return ['start_date' => $formData['start_date']->normalize(), 'end_date' => $formData['end_date']->normalize()];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return ['start_date' => RollingDate::fromNormalized($formData['start_date']), 'end_date' => RollingDate::fromNormalized($formData['end_date'])];
+    }
+
     public function getFormDefaultData(): array
     {
         return [
@@ -108,7 +123,7 @@ final readonly class UserJobAggregator implements AggregatorInterface, DataTrans
         return $data;
     }
 
-    public function getLabels($key, array $values, $data)
+    public function getLabels($key, array $values, $data): callable
     {
         return function ($value): string {
             if ('_header' === $value) {

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

@@ -29,17 +29,32 @@ final readonly class UserWorkingOnCourseAggregator implements AggregatorInterfac
         private UserRepositoryInterface $userRepository,
     ) {}
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder): void
     {
         // nothing to add here
     }
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return [];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return [];
+    }
+
     public function getFormDefaultData(): array
     {
         return [];
     }
 
-    public function getLabels($key, array $values, $data): \Closure
+    public function getLabels($key, array $values, $data): callable
     {
         return function (int|string|null $userId) {
             if (null === $userId || '' === $userId) {
@@ -58,12 +73,12 @@ final readonly class UserWorkingOnCourseAggregator implements AggregatorInterfac
         };
     }
 
-    public function getQueryKeys($data)
+    public function getQueryKeys($data): array
     {
         return [self::COLUMN_NAME];
     }
 
-    public function getTitle()
+    public function getTitle(): string|\Symfony\Contracts\Translation\TranslatableInterface
     {
         return 'export.aggregator.course.by_user_working.title';
     }
@@ -73,7 +88,7 @@ final readonly class UserWorkingOnCourseAggregator implements AggregatorInterfac
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data)
+    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
     {
         if (!in_array('acpinfo', $qb->getAllAliases(), true)) {
             $qb->leftJoin(
@@ -92,7 +107,7 @@ final readonly class UserWorkingOnCourseAggregator implements AggregatorInterfac
         $qb->addGroupBy('acpinfo_user.id');
     }
 
-    public function applyOn()
+    public function applyOn(): string
     {
         return Declarations::ACP_TYPE;
     }

src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingPeriodStepHistoryAggregators/ByClosingMotiveAggregator.php

@@ -27,17 +27,32 @@ final readonly class ByClosingMotiveAggregator implements AggregatorInterface
         private ClosingMotiveRender $closingMotiveRender,
     ) {}
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder): void
     {
         // nothing to add here
     }
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return [];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return [];
+    }
+
     public function getFormDefaultData(): array
     {
         return [];
     }
 
-    public function getLabels($key, array $values, mixed $data)
+    public function getLabels($key, array $values, mixed $data): callable
     {
         return function (int|string|null $value): string {
             if ('_header' === $value) {
@@ -52,14 +67,14 @@ final readonly class ByClosingMotiveAggregator implements AggregatorInterface
         };
     }
 
-    public function getQueryKeys($data)
+    public function getQueryKeys($data): array
     {
         return [
             self::KEY,
         ];
     }
 
-    public function getTitle()
+    public function getTitle(): string|\Symfony\Contracts\Translation\TranslatableInterface
     {
         return 'export.aggregator.step_history.by_closing_motive.title';
     }
@@ -69,14 +84,14 @@ final readonly class ByClosingMotiveAggregator implements AggregatorInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data)
+    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
     {
         $qb
             ->addSelect('IDENTITY(acpstephistory.closingMotive) AS '.self::KEY)
             ->addGroupBy(self::KEY);
     }
 
-    public function applyOn()
+    public function applyOn(): string
     {
         return Declarations::ACP_STEP_HISTORY;
     }

src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingPeriodStepHistoryAggregators/ByDateAggregator.php

@@ -26,7 +26,7 @@ final readonly class ByDateAggregator implements AggregatorInterface
 {
     private const KEY = 'acpstephistory_by_date_agg';
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder): void
     {
         $builder->add('frequency', ChoiceType::class, [
             'choices' => array_combine(
@@ -39,12 +39,27 @@ final readonly class ByDateAggregator implements AggregatorInterface
         ]);
     }
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return ['frequency' => $formData['frequency']];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return ['frequency' => $formData['frequency']];
+    }
+
     public function getFormDefaultData(): array
     {
         return ['frequency' => DateGroupingChoiceEnum::YEAR->value];
     }
 
-    public function getLabels($key, array $values, mixed $data)
+    public function getLabels($key, array $values, mixed $data): callable
     {
         return function (?string $value): string {
             if ('_header' === $value) {
@@ -59,12 +74,12 @@ final readonly class ByDateAggregator implements AggregatorInterface
         };
     }
 
-    public function getQueryKeys($data)
+    public function getQueryKeys($data): array
     {
         return [self::KEY];
     }
 
-    public function getTitle()
+    public function getTitle(): string|\Symfony\Contracts\Translation\TranslatableInterface
     {
         return 'export.aggregator.step_history.by_date.title';
     }
@@ -74,7 +89,7 @@ final readonly class ByDateAggregator implements AggregatorInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data)
+    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
     {
         $p = self::KEY;
 
@@ -83,7 +98,7 @@ final readonly class ByDateAggregator implements AggregatorInterface
         $qb->addOrderBy($p, 'DESC');
     }
 
-    public function applyOn()
+    public function applyOn(): string
     {
         return Declarations::ACP_STEP_HISTORY;
     }

src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingPeriodStepHistoryAggregators/ByStepAggregator.php

@@ -29,17 +29,32 @@ final readonly class ByStepAggregator implements AggregatorInterface
         private TranslatorInterface $translator,
     ) {}
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder): void
     {
         // nothing in this form
     }
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return [];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return [];
+    }
+
     public function getFormDefaultData(): array
     {
         return [];
     }
 
-    public function getLabels($key, array $values, mixed $data)
+    public function getLabels($key, array $values, mixed $data): callable
     {
         return function (?string $step): string {
             if ('_header' === $step) {
@@ -54,14 +69,14 @@ final readonly class ByStepAggregator implements AggregatorInterface
         };
     }
 
-    public function getQueryKeys($data)
+    public function getQueryKeys($data): array
     {
         return [
             self::KEY,
         ];
     }
 
-    public function getTitle()
+    public function getTitle(): string|\Symfony\Contracts\Translation\TranslatableInterface
     {
         return 'export.aggregator.step_history.by_step.title';
     }
@@ -71,14 +86,14 @@ final readonly class ByStepAggregator implements AggregatorInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data)
+    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
     {
         $qb
             ->addSelect('acpstephistory.step AS '.self::KEY)
             ->addGroupBy(self::KEY);
     }
 
-    public function applyOn()
+    public function applyOn(): string
     {
         return Declarations::ACP_STEP_HISTORY;
     }

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

@@ -32,7 +32,7 @@ final class ByEndDateAggregator implements AggregatorInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data)
+    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
     {
         $fmt = match ($data['frequency']) {
             'week' => 'YYYY-IW',
@@ -51,7 +51,7 @@ final class ByEndDateAggregator implements AggregatorInterface
         return Declarations::EVAL_TYPE;
     }
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder): void
     {
         $builder->add('frequency', ChoiceType::class, [
             'choices' => self::CHOICES,
@@ -61,12 +61,27 @@ final class ByEndDateAggregator implements AggregatorInterface
         ]);
     }
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return ['frequency' => $formData['frequency']];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return ['frequency' => $formData['frequency']];
+    }
+
     public function getFormDefaultData(): array
     {
         return ['frequency' => self::DEFAULT_CHOICE];
     }
 
-    public function getLabels($key, array $values, $data)
+    public function getLabels($key, array $values, $data): callable
     {
         return static function ($value): string {
             if ('_header' === $value) {

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

@@ -32,7 +32,7 @@ final class ByMaxDateAggregator implements AggregatorInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data)
+    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
     {
         $fmt = match ($data['frequency']) {
             'week' => 'YYYY-IW',
@@ -51,7 +51,7 @@ final class ByMaxDateAggregator implements AggregatorInterface
         return Declarations::EVAL_TYPE;
     }
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder): void
     {
         $builder->add('frequency', ChoiceType::class, [
             'choices' => self::CHOICES,
@@ -61,12 +61,27 @@ final class ByMaxDateAggregator implements AggregatorInterface
         ]);
     }
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return ['frequency' => $formData['frequency']];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return ['frequency' => $formData['frequency']];
+    }
+
     public function getFormDefaultData(): array
     {
         return ['frequency' => self::DEFAULT_CHOICE];
     }
 
-    public function getLabels($key, array $values, $data)
+    public function getLabels($key, array $values, $data): callable
     {
         return static function ($value): string {
             if ('_header' === $value) {

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

@@ -32,7 +32,7 @@ final class ByStartDateAggregator implements AggregatorInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data)
+    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
     {
         $fmt = match ($data['frequency']) {
             'week' => 'YYYY-IW',
@@ -51,7 +51,7 @@ final class ByStartDateAggregator implements AggregatorInterface
         return Declarations::EVAL_TYPE;
     }
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder): void
     {
         $builder->add('frequency', ChoiceType::class, [
             'choices' => self::CHOICES,
@@ -61,12 +61,27 @@ final class ByStartDateAggregator implements AggregatorInterface
         ]);
     }
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return ['frequency' => $formData['frequency']];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return ['frequency' => $formData['frequency']];
+    }
+
     public function getFormDefaultData(): array
     {
         return ['frequency' => self::DEFAULT_CHOICE];
     }
 
-    public function getLabels($key, array $values, $data)
+    public function getLabels($key, array $values, $data): callable
     {
         return static function ($value): string {
             if ('_header' === $value) {

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

@@ -27,7 +27,7 @@ class EvaluationTypeAggregator implements AggregatorInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data)
+    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
     {
         $qb->addSelect('IDENTITY(workeval.evaluation) AS eval_evaluationtype_aggregator');
         $qb->addGroupBy('eval_evaluationtype_aggregator');
@@ -38,17 +38,32 @@ class EvaluationTypeAggregator implements AggregatorInterface
         return Declarations::EVAL_TYPE;
     }
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder): void
     {
         // no form
     }
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return [];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return [];
+    }
+
     public function getFormDefaultData(): array
     {
         return [];
     }
 
-    public function getLabels($key, array $values, $data)
+    public function getLabels($key, array $values, $data): callable
     {
         return function ($value): string {
             if ('_header' === $value) {

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

@@ -26,7 +26,7 @@ class HavingEndDateAggregator implements AggregatorInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data)
+    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
     {
         $qb
             ->addSelect('CASE WHEN workeval.endDate IS NULL THEN true ELSE false END AS eval_enddate_aggregator')
@@ -38,17 +38,32 @@ class HavingEndDateAggregator implements AggregatorInterface
         return Declarations::EVAL_TYPE;
     }
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder): void
     {
         // No form needed
     }
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return [];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return [];
+    }
+
     public function getFormDefaultData(): array
     {
         return [];
     }
 
-    public function getLabels($key, array $values, $data)
+    public function getLabels($key, array $values, $data): callable
     {
         return function ($value): string {
             if ('_header' === $value) {

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

@@ -29,7 +29,7 @@ class ChildrenNumberAggregator implements AggregatorInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data)
+    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
     {
         if (!\in_array('composition_children', $qb->getAllAliases(), true)) {
             $clause = $qb->expr()->andX(
@@ -58,17 +58,32 @@ class ChildrenNumberAggregator implements AggregatorInterface
         return Declarations::HOUSEHOLD_TYPE;
     }
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder): void
     {
         $builder->add('on_date', PickRollingDateType::class, []);
     }
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return ['on_date' => $formData['on_date']->normalize()];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return ['on_date' => RollingDate::fromNormalized($formData['on_date'])];
+    }
+
     public function getFormDefaultData(): array
     {
         return ['on_date' => new RollingDate(RollingDate::T_TODAY)];
     }
 
-    public function getLabels($key, array $values, $data)
+    public function getLabels($key, array $values, $data): callable
     {
         return static function (int|string|null $value): string {
             if ('_header' === $value) {

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

@@ -31,7 +31,7 @@ class CompositionAggregator implements AggregatorInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data)
+    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
     {
         if (!\in_array('composition_type', $qb->getAllAliases(), true)) {
             $clause = $qb->expr()->andX(
@@ -60,17 +60,32 @@ class CompositionAggregator implements AggregatorInterface
         return Declarations::HOUSEHOLD_TYPE;
     }
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder): void
     {
         $builder->add('on_date', PickRollingDateType::class, []);
     }
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return ['on_date' => $formData['on_date']->normalize()];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return ['on_date' => RollingDate::fromNormalized($formData['on_date'])];
+    }
+
     public function getFormDefaultData(): array
     {
         return ['on_date' => new RollingDate(RollingDate::T_TODAY)];
     }
 
-    public function getLabels($key, array $values, $data)
+    public function getLabels($key, array $values, $data): callable
     {
         return function ($value): string {
             if ('_header' === $value) {

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

@@ -27,7 +27,7 @@ final readonly class AdministrativeStatusAggregator implements AggregatorInterfa
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data)
+    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
     {
         $qb->leftJoin('person.administrativeStatus', 'admin_status');
         $qb->addSelect('admin_status.id as administrative_status_aggregator');
@@ -35,19 +35,34 @@ final readonly class AdministrativeStatusAggregator implements AggregatorInterfa
         $qb->addGroupBy('administrative_status_aggregator');
     }
 
-    public function applyOn()
+    public function applyOn(): string
     {
         return Declarations::PERSON_TYPE;
     }
 
-    public function buildForm(FormBuilderInterface $builder) {}
+    public function buildForm(FormBuilderInterface $builder): void {}
+
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return [];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return [];
+    }
 
     public function getFormDefaultData(): array
     {
         return [];
     }
 
-    public function getLabels($key, array $values, $data)
+    public function getLabels($key, array $values, $data): callable
     {
         return function ($value): string {
             if ('_header' === $value) {
@@ -64,12 +79,12 @@ final readonly class AdministrativeStatusAggregator implements AggregatorInterfa
         };
     }
 
-    public function getQueryKeys($data)
+    public function getQueryKeys($data): array
     {
         return ['administrative_status_aggregator'];
     }
 
-    public function getTitle()
+    public function getTitle(): string|\Symfony\Contracts\Translation\TranslatableInterface
     {
         return 'Group people by administrative status';
     }

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

@@ -31,31 +31,46 @@ final readonly class AgeAggregator implements AggregatorInterface, ExportElement
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data)
+    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
     {
         $qb->addSelect('DATE_DIFF(:date_age_calculation, person.birthdate)/365 as person_age');
         $qb->setParameter('date_age_calculation', $this->rollingDateConverter->convert($data['date_age_calculation']));
         $qb->addGroupBy('person_age');
     }
 
-    public function applyOn()
+    public function applyOn(): string
     {
         return 'person';
     }
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder): void
     {
         $builder->add('date_age_calculation', PickRollingDateType::class, [
             'label' => 'Calculate age in relation to this date',
         ]);
     }
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return ['date_age_calculation' => $formData['date_age_calculation']->normalize()];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return ['date_age_calculation' => RollingDate::fromNormalized($formData['date_age_calculation'])];
+    }
+
     public function getFormDefaultData(): array
     {
         return ['date_age_calculation' => new RollingDate(RollingDate::T_TODAY)];
     }
 
-    public function getLabels($key, array $values, $data)
+    public function getLabels($key, array $values, $data): callable
     {
         return function ($value) {
             if ('_header' === $value) {
@@ -66,19 +81,19 @@ final readonly class AgeAggregator implements AggregatorInterface, ExportElement
         };
     }
 
-    public function getQueryKeys($data)
+    public function getQueryKeys($data): array
     {
         return [
             'person_age',
         ];
     }
 
-    public function getTitle()
+    public function getTitle(): string|\Symfony\Contracts\Translation\TranslatableInterface
     {
         return 'Aggregate by age';
     }
 
-    public function validateForm($data, ExecutionContextInterface $context)
+    public function validateForm($data, ExecutionContextInterface $context): void
     {
         if (null === $data['date_age_calculation']) {
             $context->buildViolation('The date should not be empty')

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

@@ -34,7 +34,7 @@ class ByHouseholdCompositionAggregator implements AggregatorInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data)
+    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
     {
         $p = self::PREFIX;
 
@@ -71,24 +71,39 @@ class ByHouseholdCompositionAggregator implements AggregatorInterface
             ->addGroupBy("{$p}_select");
     }
 
-    public function applyOn()
+    public function applyOn(): string
     {
         return Declarations::PERSON_TYPE;
     }
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder): void
     {
         $builder->add('date_calc', PickRollingDateType::class, [
             'label' => 'export.aggregator.person.by_household_composition.Calc date',
         ]);
     }
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return ['date_calc' => $formData['date_calc']->normalize()];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return ['date_calc' => RollingDate::fromNormalized($formData['date_calc'])];
+    }
+
     public function getFormDefaultData(): array
     {
         return ['date_calc' => new RollingDate(RollingDate::T_TODAY)];
     }
 
-    public function getLabels($key, array $values, $data)
+    public function getLabels($key, array $values, $data): callable
     {
         return function ($value) {
             if ('_header' === $value) {
@@ -107,12 +122,12 @@ class ByHouseholdCompositionAggregator implements AggregatorInterface
         };
     }
 
-    public function getQueryKeys($data)
+    public function getQueryKeys($data): array
     {
         return [self::PREFIX.'_select'];
     }
 
-    public function getTitle()
+    public function getTitle(): string|\Symfony\Contracts\Translation\TranslatableInterface
     {
         return 'export.aggregator.person.by_household_composition.Group course by household composition';
     }

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

@@ -29,13 +29,28 @@ final readonly class CenterAggregator implements AggregatorInterface
         private RollingDateConverterInterface $rollingDateConverter,
     ) {}
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder): void
     {
         $builder->add('at_date', PickRollingDateType::class, [
             'label' => 'export.aggregator.person.by_center.at_date',
         ]);
     }
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return ['at_date' => $formData['at_date']->normalize()];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return ['at_date' => RollingDate::fromNormalized($formData['at_date'])];
+    }
+
     public function getFormDefaultData(): array
     {
         return [
@@ -43,7 +58,7 @@ final readonly class CenterAggregator implements AggregatorInterface
         ];
     }
 
-    public function getLabels($key, array $values, $data): \Closure
+    public function getLabels($key, array $values, $data): callable
     {
         return function (int|string|null $value) {
             if (null === $value || '' === $value) {
@@ -58,12 +73,12 @@ final readonly class CenterAggregator implements AggregatorInterface
         };
     }
 
-    public function getQueryKeys($data)
+    public function getQueryKeys($data): array
     {
         return [self::COLUMN_NAME];
     }
 
-    public function getTitle()
+    public function getTitle(): string|\Symfony\Contracts\Translation\TranslatableInterface
     {
         return 'export.aggregator.person.by_center.title';
     }
@@ -73,7 +88,7 @@ final readonly class CenterAggregator implements AggregatorInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data)
+    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
     {
         $alias = 'pers_center_agg';
         $atDate = 'pers_center_agg_at_date';
@@ -94,7 +109,7 @@ final readonly class CenterAggregator implements AggregatorInterface
         $qb->addGroupBy(self::COLUMN_NAME);
     }
 
-    public function applyOn()
+    public function applyOn(): string
     {
         return Declarations::PERSON_TYPE;
     }

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

@@ -32,7 +32,7 @@ final readonly class CountryOfBirthAggregator implements AggregatorInterface, Ex
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data): void
+    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
     {
         // add a clause in select part
         if ('country' === $data['group_by_level']) {
@@ -75,12 +75,12 @@ final readonly class CountryOfBirthAggregator implements AggregatorInterface, Ex
         $qb->addGroupBy('country_of_birth_aggregator');
     }
 
-    public function applyOn()
+    public function applyOn(): string
     {
         return 'person';
     }
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder): void
     {
         $builder->add('group_by_level', ChoiceType::class, [
             'choices' => [
@@ -92,12 +92,27 @@ final readonly class CountryOfBirthAggregator implements AggregatorInterface, Ex
         ]);
     }
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return ['group_by_level' => $formData['group_by_level']];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return ['group_by_level' => $formData['group_by_level']];
+    }
+
     public function getFormDefaultData(): array
     {
         return [];
     }
 
-    public function getLabels($key, array $values, $data)
+    public function getLabels($key, array $values, $data): callable
     {
         $labels = [];
 
@@ -138,17 +153,17 @@ final readonly class CountryOfBirthAggregator implements AggregatorInterface, Ex
         return static fn (?string $value): string => $labels[(string) $value];
     }
 
-    public function getQueryKeys($data)
+    public function getQueryKeys($data): array
     {
         return ['country_of_birth_aggregator'];
     }
 
-    public function getTitle()
+    public function getTitle(): string|\Symfony\Contracts\Translation\TranslatableInterface
     {
         return 'Group people by country of birth';
     }
 
-    public function validateForm($data, ExecutionContextInterface $context)
+    public function validateForm($data, ExecutionContextInterface $context): void
     {
         if (null === $data['group_by_level']) {
             $context->buildViolation('You should select an option')

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

@@ -27,7 +27,7 @@ final readonly class EmploymentStatusAggregator implements AggregatorInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data)
+    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
     {
         $qb->leftJoin('person.employmentStatus', 'es');
         $qb->addSelect('es.id as employment_status_aggregator');
@@ -35,19 +35,34 @@ final readonly class EmploymentStatusAggregator implements AggregatorInterface
         $qb->addGroupBy('employment_status_aggregator');
     }
 
-    public function applyOn()
+    public function applyOn(): string
     {
         return Declarations::PERSON_TYPE;
     }
 
-    public function buildForm(FormBuilderInterface $builder) {}
+    public function buildForm(FormBuilderInterface $builder): void {}
+
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return [];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return [];
+    }
 
     public function getFormDefaultData(): array
     {
         return [];
     }
 
-    public function getLabels($key, array $values, $data)
+    public function getLabels($key, array $values, $data): callable
     {
         return function ($value): string {
             if ('_header' === $value) {
@@ -64,12 +79,12 @@ final readonly class EmploymentStatusAggregator implements AggregatorInterface
         };
     }
 
-    public function getQueryKeys($data)
+    public function getQueryKeys($data): array
     {
         return ['employment_status_aggregator'];
     }
 
-    public function getTitle()
+    public function getTitle(): string|\Symfony\Contracts\Translation\TranslatableInterface
     {
         return 'Group people by employment status';
     }

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

@@ -28,7 +28,7 @@ final readonly class GenderAggregator implements AggregatorInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data)
+    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
     {
         $qb->leftJoin('person.gender', 'g');
         $qb->addSelect('g.id as gender');
@@ -36,19 +36,34 @@ final readonly class GenderAggregator implements AggregatorInterface
         $qb->addGroupBy('gender');
     }
 
-    public function applyOn()
+    public function applyOn(): string
     {
         return Declarations::PERSON_TYPE;
     }
 
-    public function buildForm(FormBuilderInterface $builder) {}
+    public function buildForm(FormBuilderInterface $builder): void {}
+
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return [];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return [];
+    }
 
     public function getFormDefaultData(): array
     {
         return [];
     }
 
-    public function getLabels($key, array $values, $data)
+    public function getLabels($key, array $values, $data): callable
     {
         return function (int|string|null $value) {
             if (null === $value || '' === $value) {
@@ -67,12 +82,12 @@ final readonly class GenderAggregator implements AggregatorInterface
         };
     }
 
-    public function getQueryKeys($data)
+    public function getQueryKeys($data): array
     {
         return ['gender'];
     }
 
-    public function getTitle()
+    public function getTitle(): string|\Symfony\Contracts\Translation\TranslatableInterface
     {
         return 'Group people by gender';
     }

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

@@ -24,16 +24,22 @@ use Doctrine\ORM\QueryBuilder;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\FormBuilderInterface;
 
-class GeographicalUnitAggregator implements AggregatorInterface
+final readonly class GeographicalUnitAggregator implements AggregatorInterface
 {
-    public function __construct(private readonly GeographicalUnitLayerRepositoryInterface $geographicalUnitLayerRepository, private readonly TranslatableStringHelperInterface $translatableStringHelper, private readonly RollingDateConverterInterface $rollingDateConverter) {}
+    use \Chill\MainBundle\Export\ExportDataNormalizerTrait;
+
+    public function __construct(
+        private GeographicalUnitLayerRepositoryInterface $geographicalUnitLayerRepository,
+        private TranslatableStringHelperInterface $translatableStringHelper,
+        private RollingDateConverterInterface $rollingDateConverter,
+    ) {}
 
     public function addRole(): ?string
     {
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data): void
+    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
     {
         $qb
             ->leftJoin(
@@ -73,12 +79,12 @@ class GeographicalUnitAggregator implements AggregatorInterface
             ->addGroupBy('geog_unit_key');
     }
 
-    public function applyOn()
+    public function applyOn(): string
     {
         return Declarations::PERSON_TYPE;
     }
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder): void
     {
         $builder
             ->add('date_calc', PickRollingDateType::class, [
@@ -96,6 +102,21 @@ class GeographicalUnitAggregator implements AggregatorInterface
             ]);
     }
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return ['date_calc' => $formData['date_calc']->normalize(), 'level' => $this->normalizeDoctrineEntity($formData['level'])];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return ['date_calc' => RollingDate::fromNormalized($formData['date_calc']), 'level' => $this->denormalizeDoctrineEntity($formData['level'], $this->geographicalUnitLayerRepository)];
+    }
+
     public function getFormDefaultData(): array
     {
         return ['date_calc' => new RollingDate(RollingDate::T_TODAY)];
@@ -106,7 +127,7 @@ class GeographicalUnitAggregator implements AggregatorInterface
         return 'person_geog_agg';
     }
 
-    public function getLabels($key, array $values, $data)
+    public function getLabels($key, array $values, $data): callable
     {
         return match ($key) {
             'geog_unit_name' => static function ($value): string {
@@ -135,12 +156,12 @@ class GeographicalUnitAggregator implements AggregatorInterface
         };
     }
 
-    public function getQueryKeys($data)
+    public function getQueryKeys($data): array
     {
         return ['geog_unit_name', 'geog_unit_key'];
     }
 
-    public function getTitle()
+    public function getTitle(): string|\Symfony\Contracts\Translation\TranslatableInterface
     {
         return 'Group people by geographical unit based on his address';
     }

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

@@ -35,7 +35,7 @@ final readonly class HouseholdPositionAggregator implements AggregatorInterface,
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data)
+    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
     {
         if (!\in_array('householdmember', $qb->getAllAliases(), true)) {
             $qb->join(HouseholdMember::class, 'householdmember', Expr\Join::WITH, 'householdmember.person = person');
@@ -62,24 +62,39 @@ final readonly class HouseholdPositionAggregator implements AggregatorInterface,
         $qb->addGroupBy('household_position_aggregator');
     }
 
-    public function applyOn()
+    public function applyOn(): string
     {
         return Declarations::PERSON_TYPE;
     }
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder): void
     {
         $builder->add('date_position', PickRollingDateType::class, [
             'label' => 'Household position in relation to this date',
         ]);
     }
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return ['date_position' => $formData['date_position']->normalize()];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return ['date_position' => RollingDate::fromNormalized($formData['date_position'])];
+    }
+
     public function getFormDefaultData(): array
     {
         return ['date_position' => new RollingDate(RollingDate::T_TODAY)];
     }
 
-    public function getLabels($key, array $values, $data)
+    public function getLabels($key, array $values, $data): callable
     {
         return function ($value) {
             if ('_header' === $value) {
@@ -96,19 +111,19 @@ final readonly class HouseholdPositionAggregator implements AggregatorInterface,
         };
     }
 
-    public function getQueryKeys($data)
+    public function getQueryKeys($data): array
     {
         return [
             'household_position_aggregator',
         ];
     }
 
-    public function getTitle()
+    public function getTitle(): string|\Symfony\Contracts\Translation\TranslatableInterface
     {
         return 'Aggregate by household position';
     }
 
-    public function validateForm($data, ExecutionContextInterface $context)
+    public function validateForm($data, ExecutionContextInterface $context): void
     {
         if (null === $data['date_position']) {
             $context->buildViolation('The date should not be empty')

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

@@ -27,7 +27,7 @@ final readonly class MaritalStatusAggregator implements AggregatorInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data)
+    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
     {
         if (!\in_array('personmarital', $qb->getAllAliases(), true)) {
             $qb->join('person.maritalStatus', 'personmarital');
@@ -37,22 +37,37 @@ final readonly class MaritalStatusAggregator implements AggregatorInterface
         $qb->addGroupBy('marital_status_aggregator');
     }
 
-    public function applyOn()
+    public function applyOn(): string
     {
         return Declarations::PERSON_TYPE;
     }
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder): void
     {
         // no form
     }
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return [];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return [];
+    }
+
     public function getFormDefaultData(): array
     {
         return [];
     }
 
-    public function getLabels($key, array $values, $data)
+    public function getLabels($key, array $values, $data): callable
     {
         return function ($value): string {
             if ('_header' === $value) {
@@ -69,12 +84,12 @@ final readonly class MaritalStatusAggregator implements AggregatorInterface
         };
     }
 
-    public function getQueryKeys($data)
+    public function getQueryKeys($data): array
     {
         return ['marital_status_aggregator'];
     }
 
-    public function getTitle()
+    public function getTitle(): string|\Symfony\Contracts\Translation\TranslatableInterface
     {
         return 'Group people by marital status';
     }

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

@@ -31,7 +31,7 @@ final readonly class NationalityAggregator implements AggregatorInterface, Expor
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data)
+    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
     {
         // add a clause in select part
         if ('country' === $data['group_by_level']) {
@@ -70,12 +70,12 @@ final readonly class NationalityAggregator implements AggregatorInterface, Expor
         $qb->addGroupBy('nationality_aggregator');
     }
 
-    public function applyOn()
+    public function applyOn(): string
     {
         return 'person';
     }
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder): void
     {
         $builder->add('group_by_level', ChoiceType::class, [
             'choices' => [
@@ -87,6 +87,21 @@ final readonly class NationalityAggregator implements AggregatorInterface, Expor
         ]);
     }
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return ['group_by_level' => $formData['group_by_level']];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return ['group_by_level' => $formData['group_by_level']];
+    }
+
     public function getFormDefaultData(): array
     {
         return [
@@ -94,7 +109,7 @@ final readonly class NationalityAggregator implements AggregatorInterface, Expor
         ];
     }
 
-    public function getLabels($key, array $values, $data)
+    public function getLabels($key, array $values, $data): callable
     {
         $labels = [];
 
@@ -135,17 +150,17 @@ final readonly class NationalityAggregator implements AggregatorInterface, Expor
         return static fn ($value): string => $labels[$value];
     }
 
-    public function getQueryKeys($data)
+    public function getQueryKeys($data): array
     {
         return ['nationality_aggregator'];
     }
 
-    public function getTitle()
+    public function getTitle(): string|\Symfony\Contracts\Translation\TranslatableInterface
     {
         return 'Group people by nationality';
     }
 
-    public function validateForm($data, ExecutionContextInterface $context)
+    public function validateForm($data, ExecutionContextInterface $context): void
     {
         if (null === $data['group_by_level']) {
             $context->buildViolation('You should select an option')

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

@@ -28,7 +28,7 @@ final readonly class PostalCodeAggregator implements AggregatorInterface
         private RollingDateConverterInterface $rollingDateConverter,
     ) {}
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder): void
     {
         $builder
             ->add('calc_date', PickRollingDateType::class, [
@@ -36,12 +36,27 @@ final readonly class PostalCodeAggregator implements AggregatorInterface
             ]);
     }
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return ['calc_date' => $formData['calc_date']->normalize()];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return ['calc_date' => RollingDate::fromNormalized($formData['calc_date'])];
+    }
+
     public function getFormDefaultData(): array
     {
         return ['calc_date' => new RollingDate(RollingDate::T_TODAY)];
     }
 
-    public function getLabels($key, array $values, mixed $data)
+    public function getLabels($key, array $values, mixed $data): callable
     {
         return function (int|string|null $value): string {
             if ('_header' === $value) {
@@ -56,12 +71,12 @@ final readonly class PostalCodeAggregator implements AggregatorInterface
         };
     }
 
-    public function getQueryKeys($data)
+    public function getQueryKeys($data): array
     {
         return [self::PREFIX.'_postal_code_code', self::PREFIX.'_postal_code_label'];
     }
 
-    public function getTitle()
+    public function getTitle(): string|\Symfony\Contracts\Translation\TranslatableInterface
     {
         return 'export.aggregator.person.by_postal_code.title';
     }
@@ -71,7 +86,7 @@ final readonly class PostalCodeAggregator implements AggregatorInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data)
+    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
     {
         $p = self::PREFIX;
 
@@ -92,7 +107,7 @@ final readonly class PostalCodeAggregator implements AggregatorInterface
         ;
     }
 
-    public function applyOn()
+    public function applyOn(): string
     {
         return Declarations::PERSON_TYPE;
     }

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

@@ -29,7 +29,7 @@ final readonly class ActionTypeAggregator implements AggregatorInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data)
+    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
     {
         if (!\in_array('acpwsocialaction', $qb->getAllAliases(), true)) {
             $qb->leftJoin('acpw.socialAction', 'acpwsocialaction');
@@ -46,22 +46,37 @@ final readonly class ActionTypeAggregator implements AggregatorInterface
             ->addGroupBy('social_action_type_aggregator');
     }
 
-    public function applyOn()
+    public function applyOn(): string
     {
         return Declarations::SOCIAL_WORK_ACTION_TYPE;
     }
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder): void
     {
         // no form
     }
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return [];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return [];
+    }
+
     public function getFormDefaultData(): array
     {
         return [];
     }
 
-    public function getLabels($key, array $values, $data)
+    public function getLabels($key, array $values, $data): callable
     {
         return match ($key) {
             'action_type_aggregator' => function ($value): string {
@@ -90,12 +105,12 @@ final readonly class ActionTypeAggregator implements AggregatorInterface
         };
     }
 
-    public function getQueryKeys($data)
+    public function getQueryKeys($data): array
     {
         return ['social_action_type_aggregator', 'action_type_aggregator'];
     }
 
-    public function getTitle()
+    public function getTitle(): string|\Symfony\Contracts\Translation\TranslatableInterface
     {
         return 'Group social work actions by action type';
     }

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

@@ -32,7 +32,7 @@ class CreatorAggregator implements AggregatorInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data)
+    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
     {
         $p = self::PREFIX;
 
@@ -46,14 +46,29 @@ class CreatorAggregator implements AggregatorInterface
         return Declarations::SOCIAL_WORK_ACTION_TYPE;
     }
 
-    public function buildForm(FormBuilderInterface $builder) {}
+    public function buildForm(FormBuilderInterface $builder): void {}
+
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return [];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return [];
+    }
 
     public function getFormDefaultData(): array
     {
         return [];
     }
 
-    public function getLabels($key, array $values, mixed $data)
+    public function getLabels($key, array $values, mixed $data): callable
     {
         return function ($value): string {
             if ('_header' === $value) {

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

@@ -34,7 +34,7 @@ class CreatorJobAggregator implements AggregatorInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data)
+    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
     {
         $p = self::PREFIX;
 
@@ -63,14 +63,29 @@ class CreatorJobAggregator implements AggregatorInterface
         return Declarations::SOCIAL_WORK_ACTION_TYPE;
     }
 
-    public function buildForm(FormBuilderInterface $builder) {}
+    public function buildForm(FormBuilderInterface $builder): void {}
+
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return [];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return [];
+    }
 
     public function getFormDefaultData(): array
     {
         return [];
     }
 
-    public function getLabels($key, array $values, mixed $data)
+    public function getLabels($key, array $values, mixed $data): callable
     {
         return function ($value): string {
             if ('_header' === $value) {

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

@@ -34,7 +34,7 @@ class CreatorScopeAggregator implements AggregatorInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data)
+    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
     {
         $p = self::PREFIX;
 
@@ -63,14 +63,29 @@ class CreatorScopeAggregator implements AggregatorInterface
         return Declarations::SOCIAL_WORK_ACTION_TYPE;
     }
 
-    public function buildForm(FormBuilderInterface $builder) {}
+    public function buildForm(FormBuilderInterface $builder): void {}
+
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return [];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return [];
+    }
 
     public function getFormDefaultData(): array
     {
         return [];
     }
 
-    public function getLabels($key, array $values, mixed $data)
+    public function getLabels($key, array $values, mixed $data): callable
     {
         return function ($value): string {
             if ('_header' === $value) {

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

@@ -26,7 +26,7 @@ class CurrentActionAggregator implements AggregatorInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data): void
+    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
     {
         $qb
             ->addSelect('
@@ -46,12 +46,27 @@ class CurrentActionAggregator implements AggregatorInterface
         // No form needed
     }
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return [];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return [];
+    }
+
     public function getFormDefaultData(): array
     {
         return [];
     }
 
-    public function getLabels($key, array $values, $data)
+    public function getLabels($key, array $values, $data): callable
     {
         return function ($value): string {
             if ('_header' === $value) {

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

@@ -27,7 +27,7 @@ final readonly class GoalAggregator implements AggregatorInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data)
+    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
     {
         if (!\in_array('goal', $qb->getAllAliases(), true)) {
             $qb->leftJoin('acpw.goals', 'goal');
@@ -42,17 +42,32 @@ final readonly class GoalAggregator implements AggregatorInterface
         return Declarations::SOCIAL_WORK_ACTION_TYPE;
     }
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder): void
     {
         // no form
     }
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return [];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return [];
+    }
+
     public function getFormDefaultData(): array
     {
         return [];
     }
 
-    public function getLabels($key, array $values, $data)
+    public function getLabels($key, array $values, $data): callable
     {
         return function ($value): string {
             if ('_header' === $value) {

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

@@ -28,7 +28,7 @@ class GoalResultAggregator implements AggregatorInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data)
+    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
     {
         if (!\in_array('goal', $qb->getAllAliases(), true)) {
             $qb->leftJoin('acpw.goals', 'goal');
@@ -48,17 +48,32 @@ class GoalResultAggregator implements AggregatorInterface
         return Declarations::SOCIAL_WORK_ACTION_TYPE;
     }
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder): void
     {
         // no form
     }
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return [];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return [];
+    }
+
     public function getFormDefaultData(): array
     {
         return [];
     }
 
-    public function getLabels($key, array $values, $data)
+    public function getLabels($key, array $values, $data): callable
     {
         return function ($value) use ($key): string {
             if (null === $value || '' === $value) {

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

@@ -27,27 +27,42 @@ final readonly class HandlingThirdPartyAggregator implements AggregatorInterface
 
     public function __construct(private LabelThirdPartyHelper $labelThirdPartyHelper) {}
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder): void
     {
         // no form needed here
     }
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return [];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return [];
+    }
+
     public function getFormDefaultData(): array
     {
         return [];
     }
 
-    public function getLabels($key, array $values, mixed $data)
+    public function getLabels($key, array $values, mixed $data): callable
     {
         return $this->labelThirdPartyHelper->getLabel($key, $values, 'export.aggregator.course_work.by_handling_third_party.header');
     }
 
-    public function getQueryKeys($data)
+    public function getQueryKeys($data): array
     {
         return [self::PREFIX.'_h3party'];
     }
 
-    public function getTitle()
+    public function getTitle(): string|\Symfony\Contracts\Translation\TranslatableInterface
     {
         return 'export.aggregator.course_work.by_handling_third_party.title';
     }
@@ -57,7 +72,7 @@ final readonly class HandlingThirdPartyAggregator implements AggregatorInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data)
+    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
     {
         $p = self::PREFIX;
 
@@ -66,7 +81,7 @@ final readonly class HandlingThirdPartyAggregator implements AggregatorInterface
             ->addGroupBy("{$p}_h3party");
     }
 
-    public function applyOn()
+    public function applyOn(): string
     {
         return Declarations::SOCIAL_WORK_ACTION_TYPE;
     }

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

@@ -35,7 +35,7 @@ final readonly class JobAggregator implements AggregatorInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data)
+    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
     {
         $p = self::PREFIX;
 
@@ -58,14 +58,29 @@ final readonly class JobAggregator implements AggregatorInterface
         return Declarations::SOCIAL_WORK_ACTION_TYPE;
     }
 
-    public function buildForm(FormBuilderInterface $builder) {}
+    public function buildForm(FormBuilderInterface $builder): void {}
+
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return [];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return [];
+    }
 
     public function getFormDefaultData(): array
     {
         return [];
     }
 
-    public function getLabels($key, array $values, $data)
+    public function getLabels($key, array $values, $data): callable
     {
         return function ($value): string {
             if ('_header' === $value) {

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

@@ -36,7 +36,7 @@ final readonly class ReferrerAggregator implements AggregatorInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data)
+    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
     {
         $p = self::PREFIX;
 
@@ -56,13 +56,36 @@ final readonly class ReferrerAggregator implements AggregatorInterface
         return Declarations::SOCIAL_WORK_ACTION_TYPE;
     }
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder): void
     {
         $builder->add('referrer_at', PickRollingDateType::class, [
             'label' => 'export.aggregator.course_work.by_treating_agent.Calc date',
         ]);
     }
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        if (!array_key_exists('referrer_at', $formData)) {
+            return ['referrer_at' => (new RollingDate(RollingDate::T_TODAY))->normalize()];
+        }
+
+        return ['referrer_at' => $formData['referrer_at']->normalize()];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        if (!array_key_exists('referrer_at', $formData)) {
+            return ['referrer_at' => new RollingDate(RollingDate::T_TODAY)];
+        }
+
+        return ['referrer_at' => RollingDate::fromNormalized($formData['referrer_at'])];
+    }
+
     public function getFormDefaultData(): array
     {
         return [
@@ -70,7 +93,7 @@ final readonly class ReferrerAggregator implements AggregatorInterface
         ];
     }
 
-    public function getLabels($key, array $values, $data)
+    public function getLabels($key, array $values, $data): callable
     {
         return function ($value): string {
             if ('_header' === $value) {

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

@@ -27,7 +27,7 @@ final readonly class ResultAggregator implements AggregatorInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data)
+    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
     {
         if (!\in_array('result', $qb->getAllAliases(), true)) {
             $qb->leftJoin('acpw.results', 'result');
@@ -42,17 +42,32 @@ final readonly class ResultAggregator implements AggregatorInterface
         return Declarations::SOCIAL_WORK_ACTION_TYPE;
     }
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder): void
     {
         // no form
     }
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return [];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return [];
+    }
+
     public function getFormDefaultData(): array
     {
         return [];
     }
 
-    public function getLabels($key, array $values, $data)
+    public function getLabels($key, array $values, $data): callable
     {
         return function ($value): string {
             if ('_header' === $value) {

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

@@ -35,7 +35,7 @@ final readonly class ScopeAggregator implements AggregatorInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data)
+    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
     {
         $p = self::PREFIX;
 
@@ -58,14 +58,29 @@ final readonly class ScopeAggregator implements AggregatorInterface
         return Declarations::SOCIAL_WORK_ACTION_TYPE;
     }
 
-    public function buildForm(FormBuilderInterface $builder) {}
+    public function buildForm(FormBuilderInterface $builder): void {}
+
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return [];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return [];
+    }
 
     public function getFormDefaultData(): array
     {
         return [];
     }
 
-    public function getLabels($key, array $values, $data)
+    public function getLabels($key, array $values, $data): callable
     {
         return function ($value): string {
             if ('_header' === $value) {

src/Bundle/ChillPersonBundle/Export/Export/AvgDurationAPWorkPersonAssociatedOnAccompanyingPeriod.php

@@ -36,6 +36,21 @@ class AvgDurationAPWorkPersonAssociatedOnAccompanyingPeriod implements ExportInt
 
     public function buildForm(FormBuilderInterface $builder) {}
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return [];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return [];
+    }
+
     public function getFormDefaultData(): array
     {
         return [];
@@ -70,7 +85,7 @@ class AvgDurationAPWorkPersonAssociatedOnAccompanyingPeriod implements ExportInt
         return ['export_result'];
     }
 
-    public function getResult($query, $data)
+    public function getResult($query, $data, \Chill\MainBundle\Export\ExportGenerationContext $context): array
     {
         return $query->getQuery()->getResult(Query::HYDRATE_SCALAR);
     }
@@ -85,7 +100,7 @@ class AvgDurationAPWorkPersonAssociatedOnAccompanyingPeriod implements ExportInt
         return Declarations::SOCIAL_WORK_ACTION_TYPE;
     }
 
-    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
+    public function initiateQuery(array $requiredModifiers, array $acl, array $data, \Chill\MainBundle\Export\ExportGenerationContext $context): \Doctrine\ORM\QueryBuilder
     {
         $centers = array_map(static fn ($el) => $el['center'], $acl);
 

src/Bundle/ChillPersonBundle/Export/Export/AvgDurationAPWorkPersonAssociatedOnWork.php

@@ -36,6 +36,21 @@ class AvgDurationAPWorkPersonAssociatedOnWork implements ExportInterface, Groupe
 
     public function buildForm(FormBuilderInterface $builder) {}
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return [];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return [];
+    }
+
     public function getFormDefaultData(): array
     {
         return [];
@@ -70,7 +85,7 @@ class AvgDurationAPWorkPersonAssociatedOnWork implements ExportInterface, Groupe
         return ['export_result'];
     }
 
-    public function getResult($query, $data)
+    public function getResult($query, $data, \Chill\MainBundle\Export\ExportGenerationContext $context): array
     {
         return $query->getQuery()->getResult(Query::HYDRATE_SCALAR);
     }
@@ -85,7 +100,7 @@ class AvgDurationAPWorkPersonAssociatedOnWork implements ExportInterface, Groupe
         return Declarations::SOCIAL_WORK_ACTION_TYPE;
     }
 
-    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
+    public function initiateQuery(array $requiredModifiers, array $acl, array $data, \Chill\MainBundle\Export\ExportGenerationContext $context): \Doctrine\ORM\QueryBuilder
     {
         $centers = array_map(static fn ($el) => $el['center'], $acl);
 

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

@@ -12,6 +12,7 @@ declare(strict_types=1);
 namespace Chill\PersonBundle\Export\Export;
 
 use Chill\MainBundle\Export\AccompanyingCourseExportHelper;
+use Chill\MainBundle\Export\ExportGenerationContext;
 use Chill\MainBundle\Export\ExportInterface;
 use Chill\MainBundle\Export\FormatterInterface;
 use Chill\MainBundle\Export\GroupedExportInterface;
@@ -25,6 +26,7 @@ use Doctrine\ORM\Query;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\Translation\TranslatableMessage;
 
 class CountAccompanyingCourse implements ExportInterface, GroupedExportInterface
 {
@@ -44,11 +46,26 @@ class CountAccompanyingCourse implements ExportInterface, GroupedExportInterface
         // Nothing to add here
     }
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
     public function getFormDefaultData(): array
     {
         return [];
     }
 
+    public function normalizeFormData(array $formData): array
+    {
+        return $formData;
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return $formData;
+    }
+
     public function getAllowedFormattersTypes(): array
     {
         return [FormatterInterface::TYPE_TABULAR];
@@ -81,14 +98,14 @@ class CountAccompanyingCourse implements ExportInterface, GroupedExportInterface
         return ['export_result'];
     }
 
-    public function getResult($query, $data)
+    public function getResult($query, $data, ExportGenerationContext $context): array
     {
         return $query->getQuery()->getResult(Query::HYDRATE_SCALAR);
     }
 
-    public function getTitle(): string
+    public function getTitle(): TranslatableMessage
     {
-        return 'Count accompanying courses';
+        return new TranslatableMessage('Count accompanying courses');
     }
 
     public function getType(): string
@@ -96,7 +113,7 @@ class CountAccompanyingCourse implements ExportInterface, GroupedExportInterface
         return Declarations::ACP_TYPE;
     }
 
-    public function initiateQuery(array $requiredModifiers, array $acl, array $data = []): QueryBuilder
+    public function initiateQuery(array $requiredModifiers, array $acl, array $data, ExportGenerationContext $context): QueryBuilder
     {
         $centers = array_map(static fn ($el) => $el['center'], $acl);
 

src/Bundle/ChillPersonBundle/Export/Export/CountAccompanyingCourseStepHistory.php

@@ -44,6 +44,21 @@ class CountAccompanyingCourseStepHistory implements ExportInterface, GroupedExpo
         // Nothing to add here
     }
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return [];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return [];
+    }
+
     public function getFormDefaultData(): array
     {
         return [];
@@ -78,7 +93,7 @@ class CountAccompanyingCourseStepHistory implements ExportInterface, GroupedExpo
         return ['export_result'];
     }
 
-    public function getResult($query, $data)
+    public function getResult($query, $data, \Chill\MainBundle\Export\ExportGenerationContext $context): array
     {
         return $query->getQuery()->getResult(Query::HYDRATE_SCALAR);
     }
@@ -93,7 +108,7 @@ class CountAccompanyingCourseStepHistory implements ExportInterface, GroupedExpo
         return Declarations::ACP_TYPE;
     }
 
-    public function initiateQuery(array $requiredModifiers, array $acl, array $data = []): QueryBuilder
+    public function initiateQuery(array $requiredModifiers, array $acl, array $data, \Chill\MainBundle\Export\ExportGenerationContext $context): QueryBuilder
     {
         $centers = array_map(static fn ($el) => $el['center'], $acl);
 

src/Bundle/ChillPersonBundle/Export/Export/CountAccompanyingPeriodWorkAssociatePersonOnAccompanyingPeriod.php

@@ -41,6 +41,21 @@ class CountAccompanyingPeriodWorkAssociatePersonOnAccompanyingPeriod implements
         // No form necessary?
     }
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return [];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return [];
+    }
+
     public function getFormDefaultData(): array
     {
         return [];
@@ -78,7 +93,7 @@ class CountAccompanyingPeriodWorkAssociatePersonOnAccompanyingPeriod implements
         return ['export_result'];
     }
 
-    public function getResult($query, $data)
+    public function getResult($query, $data, \Chill\MainBundle\Export\ExportGenerationContext $context): array
     {
         return $query->getQuery()->getResult(Query::HYDRATE_SCALAR);
     }
@@ -93,7 +108,7 @@ class CountAccompanyingPeriodWorkAssociatePersonOnAccompanyingPeriod implements
         return Declarations::SOCIAL_WORK_ACTION_TYPE;
     }
 
-    public function initiateQuery(array $requiredModifiers, array $acl, array $data = []): QueryBuilder
+    public function initiateQuery(array $requiredModifiers, array $acl, array $data, \Chill\MainBundle\Export\ExportGenerationContext $context): QueryBuilder
     {
         $centers = array_map(static fn ($el) => $el['center'], $acl);
 

src/Bundle/ChillPersonBundle/Export/Export/CountAccompanyingPeriodWorkAssociatePersonOnWork.php

@@ -41,6 +41,21 @@ class CountAccompanyingPeriodWorkAssociatePersonOnWork implements ExportInterfac
         // No form necessary?
     }
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return [];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return [];
+    }
+
     public function getFormDefaultData(): array
     {
         return [];
@@ -78,7 +93,7 @@ class CountAccompanyingPeriodWorkAssociatePersonOnWork implements ExportInterfac
         return ['export_result'];
     }
 
-    public function getResult($query, $data)
+    public function getResult($query, $data, \Chill\MainBundle\Export\ExportGenerationContext $context): array
     {
         return $query->getQuery()->getResult(Query::HYDRATE_SCALAR);
     }
@@ -93,7 +108,7 @@ class CountAccompanyingPeriodWorkAssociatePersonOnWork implements ExportInterfac
         return Declarations::SOCIAL_WORK_ACTION_TYPE;
     }
 
-    public function initiateQuery(array $requiredModifiers, array $acl, array $data = []): QueryBuilder
+    public function initiateQuery(array $requiredModifiers, array $acl, array $data, \Chill\MainBundle\Export\ExportGenerationContext $context): QueryBuilder
     {
         $centers = array_map(static fn ($el) => $el['center'], $acl);
 

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

@@ -37,6 +37,21 @@ class CountEvaluation implements ExportInterface, GroupedExportInterface
 
     public function buildForm(FormBuilderInterface $builder) {}
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return [];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return [];
+    }
+
     public function getFormDefaultData(): array
     {
         return [];
@@ -74,7 +89,7 @@ class CountEvaluation implements ExportInterface, GroupedExportInterface
         return ['export_result'];
     }
 
-    public function getResult($query, $data)
+    public function getResult($query, $data, \Chill\MainBundle\Export\ExportGenerationContext $context): array
     {
         return $query->getQuery()->getResult(Query::HYDRATE_SCALAR);
     }
@@ -89,7 +104,7 @@ class CountEvaluation implements ExportInterface, GroupedExportInterface
         return Declarations::EVAL_TYPE;
     }
 
-    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
+    public function initiateQuery(array $requiredModifiers, array $acl, array $data, \Chill\MainBundle\Export\ExportGenerationContext $context): \Doctrine\ORM\QueryBuilder
     {
         $centers = array_map(static fn ($el) => $el['center'], $acl);
 

src/Bundle/ChillPersonBundle/Export/Export/CountHouseholdInPeriod.php

@@ -49,6 +49,21 @@ class CountHouseholdInPeriod implements ExportInterface, GroupedExportInterface
             ]);
     }
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return ['calc_date' => $formData['calc_date']->normalize()];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return ['calc_date' => RollingDate::fromNormalized($formData['calc_date'])];
+    }
+
     public function getFormDefaultData(): array
     {
         return ['calc_date' => new RollingDate(RollingDate::T_TODAY)];
@@ -93,7 +108,7 @@ class CountHouseholdInPeriod implements ExportInterface, GroupedExportInterface
         return ['household_export_result', 'acp_export_result'];
     }
 
-    public function getResult($query, $data)
+    public function getResult($query, $data, \Chill\MainBundle\Export\ExportGenerationContext $context): array
     {
         return $query->getQuery()->getResult(Query::HYDRATE_SCALAR);
     }
@@ -108,7 +123,7 @@ class CountHouseholdInPeriod implements ExportInterface, GroupedExportInterface
         return Declarations::HOUSEHOLD_TYPE;
     }
 
-    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
+    public function initiateQuery(array $requiredModifiers, array $acl, array $data, \Chill\MainBundle\Export\ExportGenerationContext $context): \Doctrine\ORM\QueryBuilder
     {
         $centers = array_map(static fn ($el) => $el['center'], $acl);
 

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

@@ -39,6 +39,21 @@ class CountPerson implements ExportInterface, GroupedExportInterface
         // No form necessary
     }
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return [];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return [];
+    }
+
     public function getFormDefaultData(): array
     {
         return [];
@@ -71,32 +86,30 @@ class CountPerson implements ExportInterface, GroupedExportInterface
         return static fn ($value) => $labels[$value];
     }
 
-    public function getQueryKeys($data)
+    public function getQueryKeys($data): array
     {
         return ['export_result'];
     }
 
-    public function getResult($query, $data)
+    public function getResult($query, $data, \Chill\MainBundle\Export\ExportGenerationContext $context): array
     {
         return $query->getQuery()->getResult(Query::HYDRATE_SCALAR);
     }
 
-    public function getTitle()
+    public function getTitle(): string|\Symfony\Contracts\Translation\TranslatableInterface
     {
         return 'Count people';
     }
 
-    public function getType()
+    public function getType(): string
     {
         return Declarations::PERSON_TYPE;
     }
 
     /**
      * Initiate the query.
-     *
-     * @return QueryBuilder
      */
-    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
+    public function initiateQuery(array $requiredModifiers, array $acl, array $data, \Chill\MainBundle\Export\ExportGenerationContext $context): QueryBuilder
     {
         $centers = array_map(static fn ($el) => $el['center'], $acl);
 

src/Bundle/ChillPersonBundle/Export/Export/CountPersonOnAccompanyingPeriodWorkAssociatePersonOnWork.php

@@ -41,6 +41,21 @@ class CountPersonOnAccompanyingPeriodWorkAssociatePersonOnWork implements Export
         // No form necessary?
     }
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return [];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return [];
+    }
+
     public function getFormDefaultData(): array
     {
         return [];
@@ -78,7 +93,7 @@ class CountPersonOnAccompanyingPeriodWorkAssociatePersonOnWork implements Export
         return ['export_result'];
     }
 
-    public function getResult($query, $data)
+    public function getResult($query, $data, \Chill\MainBundle\Export\ExportGenerationContext $context): array
     {
         return $query->getQuery()->getResult(Query::HYDRATE_SCALAR);
     }
@@ -93,7 +108,7 @@ class CountPersonOnAccompanyingPeriodWorkAssociatePersonOnWork implements Export
         return Declarations::SOCIAL_WORK_ACTION_TYPE;
     }
 
-    public function initiateQuery(array $requiredModifiers, array $acl, array $data = []): QueryBuilder
+    public function initiateQuery(array $requiredModifiers, array $acl, array $data, \Chill\MainBundle\Export\ExportGenerationContext $context): QueryBuilder
     {
         $centers = array_map(static fn ($el) => $el['center'], $acl);
 

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

@@ -43,6 +43,21 @@ class CountPersonWithAccompanyingCourse implements ExportInterface, GroupedExpor
         // TODO: Implement buildForm() method.
     }
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return [];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return [];
+    }
+
     public function getFormDefaultData(): array
     {
         return [];
@@ -80,7 +95,7 @@ class CountPersonWithAccompanyingCourse implements ExportInterface, GroupedExpor
         return ['export_result'];
     }
 
-    public function getResult($query, $data)
+    public function getResult($query, $data, \Chill\MainBundle\Export\ExportGenerationContext $context): array
     {
         return $query->getQuery()->getResult(Query::HYDRATE_SCALAR);
     }
@@ -95,7 +110,7 @@ class CountPersonWithAccompanyingCourse implements ExportInterface, GroupedExpor
         return Declarations::HOUSEHOLD_TYPE;
     }
 
-    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
+    public function initiateQuery(array $requiredModifiers, array $acl, array $data, \Chill\MainBundle\Export\ExportGenerationContext $context): \Doctrine\ORM\QueryBuilder
     {
         $centers = array_map(static fn ($el) => $el['center'], $acl);
 

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

@@ -12,6 +12,7 @@ declare(strict_types=1);
 namespace Chill\PersonBundle\Export\Export;
 
 use Chill\MainBundle\Export\AccompanyingCourseExportHelper;
+use Chill\MainBundle\Export\ExportGenerationContext;
 use Chill\MainBundle\Export\FormatterInterface;
 use Chill\MainBundle\Export\GroupedExportInterface;
 use Chill\MainBundle\Export\ListInterface;
@@ -46,6 +47,21 @@ final readonly class ListAccompanyingPeriod implements ListInterface, GroupedExp
             ]);
     }
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return ['calc_date' => $formData['calc_date']->normalize()];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return ['calc_date' => RollingDate::fromNormalized($formData['calc_date'])];
+    }
+
     public function getFormDefaultData(): array
     {
         return [
@@ -73,27 +89,27 @@ final readonly class ListAccompanyingPeriod implements ListInterface, GroupedExp
         return $this->listAccompanyingPeriodHelper->getLabels($key, $values, $data);
     }
 
-    public function getQueryKeys($data)
+    public function getQueryKeys($data): array
     {
         return $this->listAccompanyingPeriodHelper->getQueryKeys($data);
     }
 
-    public function getResult($query, $data)
+    public function getResult($query, $data, ExportGenerationContext $context): array
     {
         return $query->getQuery()->getResult(AbstractQuery::HYDRATE_SCALAR);
     }
 
-    public function getTitle()
+    public function getTitle(): string|\Symfony\Contracts\Translation\TranslatableInterface
     {
         return 'export.list.acp.List of accompanying periods';
     }
 
-    public function getType()
+    public function getType(): string
     {
         return Declarations::PERSON_TYPE;
     }
 
-    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
+    public function initiateQuery(array $requiredModifiers, array $acl, array $data, ExportGenerationContext $context): \Doctrine\ORM\QueryBuilder
     {
         $qb = $this->entityManager->createQueryBuilder();
 
@@ -102,7 +118,7 @@ final readonly class ListAccompanyingPeriod implements ListInterface, GroupedExp
             ->andWhere('acp.step != :list_acp_step')
             ->setParameter('list_acp_step', AccompanyingPeriod::STEP_DRAFT);
 
-        $this->filterListAccompanyingPeriodHelper->addFilterAccompanyingPeriods($qb, $requiredModifiers, $acl, $data);
+        $this->filterListAccompanyingPeriodHelper->addFilterAccompanyingPeriods($qb, $requiredModifiers, $acl, $context->byUser, $data);
 
         $this->listAccompanyingPeriodHelper->addSelectClauses($qb, $this->rollingDateConverter->convert($data['calc_date']));
 

src/Bundle/ChillPersonBundle/Export/Export/ListAccompanyingPeriodWorkAssociatePersonOnAccompanyingPeriod.php

@@ -12,6 +12,7 @@ declare(strict_types=1);
 namespace Chill\PersonBundle\Export\Export;
 
 use Chill\MainBundle\Export\AccompanyingCourseExportHelper;
+use Chill\MainBundle\Export\ExportGenerationContext;
 use Chill\MainBundle\Export\FormatterInterface;
 use Chill\MainBundle\Export\GroupedExportInterface;
 use Chill\MainBundle\Export\Helper\AggregateStringHelper;
@@ -103,6 +104,21 @@ final readonly class ListAccompanyingPeriodWorkAssociatePersonOnAccompanyingPeri
             ]);
     }
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return ['calc_date' => $formData['calc_date']->normalize()];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return ['calc_date' => RollingDate::fromNormalized($formData['calc_date'])];
+    }
+
     public function getFormDefaultData(): array
     {
         return ['calc_date' => new RollingDate(RollingDate::T_TODAY)];
@@ -177,12 +193,12 @@ final readonly class ListAccompanyingPeriodWorkAssociatePersonOnAccompanyingPeri
         };
     }
 
-    public function getQueryKeys($data)
+    public function getQueryKeys($data): array
     {
         return self::FIELDS;
     }
 
-    public function getResult($query, $data)
+    public function getResult($query, $data, ExportGenerationContext $context): array
     {
         return $query->getQuery()->getResult(AbstractQuery::HYDRATE_SCALAR);
     }
@@ -197,7 +213,7 @@ final readonly class ListAccompanyingPeriodWorkAssociatePersonOnAccompanyingPeri
         return Declarations::SOCIAL_WORK_ACTION_TYPE;
     }
 
-    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
+    public function initiateQuery(array $requiredModifiers, array $acl, array $data, ExportGenerationContext $context): QueryBuilder
     {
         $centers = array_map(static fn ($el) => $el['center'], $acl);
         $calcDate = $data['calc_date'] ?? new RollingDate(RollingDate::T_TODAY);
@@ -217,7 +233,7 @@ final readonly class ListAccompanyingPeriodWorkAssociatePersonOnAccompanyingPeri
             ->andWhere('acppart.startDate <= :calc_date AND (acppart.endDate > :calc_date OR acppart.endDate IS NULL)')
             ->setParameter('calc_date', $this->rollingDateConverter->convert($calcDate));
 
-        $this->filterListAccompanyingPeriodHelper->addFilterAccompanyingPeriods($qb, $requiredModifiers, $acl, $data);
+        $this->filterListAccompanyingPeriodHelper->addFilterAccompanyingPeriods($qb, $requiredModifiers, $acl, $context->byUser, $data);
 
         AccompanyingCourseExportHelper::addClosingMotiveExclusionClause($qb);
 

src/Bundle/ChillPersonBundle/Export/Export/ListAccompanyingPeriodWorkAssociatePersonOnWork.php

@@ -12,6 +12,7 @@ declare(strict_types=1);
 namespace Chill\PersonBundle\Export\Export;
 
 use Chill\MainBundle\Export\AccompanyingCourseExportHelper;
+use Chill\MainBundle\Export\ExportGenerationContext;
 use Chill\MainBundle\Export\FormatterInterface;
 use Chill\MainBundle\Export\GroupedExportInterface;
 use Chill\MainBundle\Export\Helper\AggregateStringHelper;
@@ -103,6 +104,21 @@ final readonly class ListAccompanyingPeriodWorkAssociatePersonOnWork implements
             ]);
     }
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return ['calc_date' => $formData['calc_date']->normalize()];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return ['calc_date' => RollingDate::fromNormalized($formData['calc_date'])];
+    }
+
     public function getFormDefaultData(): array
     {
         return ['calc_date' => new RollingDate(RollingDate::T_TODAY)];
@@ -177,12 +193,12 @@ final readonly class ListAccompanyingPeriodWorkAssociatePersonOnWork implements
         };
     }
 
-    public function getQueryKeys($data)
+    public function getQueryKeys($data): array
     {
         return self::FIELDS;
     }
 
-    public function getResult($query, $data)
+    public function getResult($query, $data, ExportGenerationContext $context): array
     {
         return $query->getQuery()->getResult(AbstractQuery::HYDRATE_SCALAR);
     }
@@ -197,7 +213,7 @@ final readonly class ListAccompanyingPeriodWorkAssociatePersonOnWork implements
         return Declarations::SOCIAL_WORK_ACTION_TYPE;
     }
 
-    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
+    public function initiateQuery(array $requiredModifiers, array $acl, array $data, ExportGenerationContext $context): QueryBuilder
     {
         $centers = array_map(static fn ($el) => $el['center'], $acl);
         $calcDate = $data['calc_date'] ?? new RollingDate(RollingDate::T_TODAY);
@@ -212,7 +228,7 @@ final readonly class ListAccompanyingPeriodWorkAssociatePersonOnWork implements
             ->join('acpw.persons', 'person')
         ;
 
-        $this->filterListAccompanyingPeriodHelper->addFilterAccompanyingPeriods($qb, $requiredModifiers, $acl, $data);
+        $this->filterListAccompanyingPeriodHelper->addFilterAccompanyingPeriods($qb, $requiredModifiers, $acl, $context->byUser, $data);
 
         AccompanyingCourseExportHelper::addClosingMotiveExclusionClause($qb);
 

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

@@ -12,6 +12,7 @@ declare(strict_types=1);
 namespace Chill\PersonBundle\Export\Export;
 
 use Chill\MainBundle\Export\AccompanyingCourseExportHelper;
+use Chill\MainBundle\Export\ExportGenerationContext;
 use Chill\MainBundle\Export\FormatterInterface;
 use Chill\MainBundle\Export\GroupedExportInterface;
 use Chill\MainBundle\Export\Helper\AggregateStringHelper;
@@ -93,6 +94,21 @@ final readonly class ListEvaluation implements ListInterface, GroupedExportInter
             ]);
     }
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return ['calc_date' => $formData['calc_date']->normalize()];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return ['calc_date' => RollingDate::fromNormalized($formData['calc_date'])];
+    }
+
     public function getFormDefaultData(): array
     {
         return ['calc_date' => new RollingDate(RollingDate::T_TODAY)];
@@ -165,12 +181,12 @@ final readonly class ListEvaluation implements ListInterface, GroupedExportInter
         };
     }
 
-    public function getQueryKeys($data)
+    public function getQueryKeys($data): array
     {
         return self::FIELDS;
     }
 
-    public function getResult($query, $data)
+    public function getResult($query, $data, ExportGenerationContext $context): array
     {
         return $query->getQuery()->getResult(AbstractQuery::HYDRATE_SCALAR);
     }
@@ -185,7 +201,7 @@ final readonly class ListEvaluation implements ListInterface, GroupedExportInter
         return Declarations::EVAL_TYPE;
     }
 
-    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
+    public function initiateQuery(array $requiredModifiers, array $acl, array $data, ExportGenerationContext $context): QueryBuilder
     {
         $centers = array_map(static fn ($el) => $el['center'], $acl);
         $calcDate = $data['calc_date'] ?? new RollingDate(RollingDate::T_TODAY);
@@ -206,7 +222,7 @@ final readonly class ListEvaluation implements ListInterface, GroupedExportInter
             ->andWhere('acppart.startDate <= :calc_date AND (acppart.endDate > :calc_date OR acppart.endDate IS NULL)')
             ->setParameter('calc_date', $this->rollingDateConverter->convert($calcDate));
 
-        $this->filterListAccompanyingPeriodHelper->addFilterAccompanyingPeriods($qb, $requiredModifiers, $acl, $data);
+        $this->filterListAccompanyingPeriodHelper->addFilterAccompanyingPeriods($qb, $requiredModifiers, $acl, $context->byUser, $data);
 
         AccompanyingCourseExportHelper::addClosingMotiveExclusionClause($qb);
 

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

@@ -67,6 +67,21 @@ class ListHouseholdInPeriod implements ListInterface, GroupedExportInterface
             ]);
     }
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return ['calc_date' => $formData['calc_date']->normalize()];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return ['calc_date' => RollingDate::fromNormalized($formData['calc_date'])];
+    }
+
     public function getFormDefaultData(): array
     {
         return ['calc_date' => new RollingDate(RollingDate::T_TODAY)];
@@ -114,7 +129,7 @@ class ListHouseholdInPeriod implements ListInterface, GroupedExportInterface
         );
     }
 
-    public function getResult($query, $data)
+    public function getResult($query, $data, \Chill\MainBundle\Export\ExportGenerationContext $context): array
     {
         return $query->getQuery()->getResult(AbstractQuery::HYDRATE_SCALAR);
     }
@@ -129,7 +144,7 @@ class ListHouseholdInPeriod implements ListInterface, GroupedExportInterface
         return Declarations::HOUSEHOLD_TYPE;
     }
 
-    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
+    public function initiateQuery(array $requiredModifiers, array $acl, array $data, \Chill\MainBundle\Export\ExportGenerationContext $context): QueryBuilder
     {
         $centers = array_map(static fn ($el) => $el['center'], $acl);
 

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

@@ -33,6 +33,7 @@ use Symfony\Component\Form\FormBuilderInterface;
  */
 class ListPerson implements ListInterface, GroupedExportInterface
 {
+    use \Chill\MainBundle\Export\ExportDataNormalizerTrait;
     private array $slugs = [];
     private readonly bool $filterStatsByCenters;
 
@@ -56,6 +57,21 @@ class ListPerson implements ListInterface, GroupedExportInterface
         ]);
     }
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return ['address_date' => $this->normalizeDate($formData['address_date'])];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return ['address_date' => $this->denormalizeDate($formData['address_date'])];
+    }
+
     public function getFormDefaultData(): array
     {
         return ['address_date' => new \DateTimeImmutable()];
@@ -85,7 +101,7 @@ class ListPerson implements ListInterface, GroupedExportInterface
         return $this->getLabelForCustomField($key, $values, $data);
     }
 
-    public function getQueryKeys($data)
+    public function getQueryKeys($data): array
     {
         $fields = [];
 
@@ -97,17 +113,17 @@ class ListPerson implements ListInterface, GroupedExportInterface
         return [...$fields, ...\array_keys($this->slugs)];
     }
 
-    public function getResult($query, $data)
+    public function getResult($query, $data, \Chill\MainBundle\Export\ExportGenerationContext $context): array
     {
         return $query->getQuery()->getResult(Query::HYDRATE_SCALAR);
     }
 
-    public function getTitle()
+    public function getTitle(): string|\Symfony\Contracts\Translation\TranslatableInterface
     {
         return 'List peoples';
     }
 
-    public function getType()
+    public function getType(): string
     {
         return Declarations::PERSON_TYPE;
     }
@@ -115,7 +131,7 @@ class ListPerson implements ListInterface, GroupedExportInterface
     /**
      * param array{fields: string[], address_date: DateTimeImmutable} $data.
      */
-    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
+    public function initiateQuery(array $requiredModifiers, array $acl, array $data, \Chill\MainBundle\Export\ExportGenerationContext $context): \Doctrine\ORM\QueryBuilder
     {
         $centers = array_map(static fn ($el) => $el['center'], $acl);
 

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

@@ -13,6 +13,7 @@ namespace Chill\PersonBundle\Export\Export;
 
 use Chill\MainBundle\Export\DirectExportInterface;
 use Chill\MainBundle\Export\ExportElementValidatedInterface;
+use Chill\MainBundle\Export\FormattedExportGeneration;
 use Chill\MainBundle\Export\GroupedExportInterface;
 use Chill\PersonBundle\Security\Authorization\PersonVoter;
 use Doctrine\ORM\EntityManagerInterface;
@@ -20,9 +21,6 @@ use PhpOffice\PhpSpreadsheet\Spreadsheet;
 use PhpOffice\PhpSpreadsheet\Writer\Xlsx;
 use Symfony\Component\Form\Extension\Core\Type\NumberType;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\HttpFoundation\BinaryFileResponse;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpFoundation\ResponseHeaderBag;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
@@ -65,12 +63,27 @@ class ListPersonDuplicate implements DirectExportInterface, ExportElementValidat
         ]);
     }
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return ['precision' => $formData['precision']];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return ['precision' => $formData['precision']];
+    }
+
     public function getFormDefaultData(): array
     {
         return ['precision' => self::PRECISION_DEFAULT_VALUE];
     }
 
-    public function generate(array $acl, array $data = []): Response
+    public function generate(array $acl, array $data, \Chill\MainBundle\Export\ExportGenerationContext $context): FormattedExportGeneration
     {
         $values = [];
         $values[] = $this->getHeaders();
@@ -105,11 +118,10 @@ class ListPersonDuplicate implements DirectExportInterface, ExportElementValidat
         $temp_file = sys_get_temp_dir().'/'.uniqid('export_').'.xlsx';
         $writer->save($temp_file);
 
-        $response = new BinaryFileResponse($temp_file);
-        $response->headers->set('Content-Type', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet');
-        $response->setContentDisposition(ResponseHeaderBag::DISPOSITION_ATTACHMENT, 'export_duplicate.xlsx');
+        $formatted = new FormattedExportGeneration(file_get_contents($temp_file), 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet');
+        unlink($temp_file);
 
-        return $response;
+        return $formatted;
     }
 
     public function getDescription(): string
@@ -125,7 +137,7 @@ class ListPersonDuplicate implements DirectExportInterface, ExportElementValidat
     /**
      * @return string
      */
-    public function getTitle()
+    public function getTitle(): string|\Symfony\Contracts\Translation\TranslatableInterface
     {
         return 'List duplicates';
     }
@@ -135,7 +147,7 @@ class ListPersonDuplicate implements DirectExportInterface, ExportElementValidat
         return PersonVoter::DUPLICATE;
     }
 
-    public function validateForm($data, ExecutionContextInterface $context) {}
+    public function validateForm($data, ExecutionContextInterface $context): void {}
 
     protected function getHeaders(): array
     {

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

@@ -56,6 +56,21 @@ final readonly class ListPersonHavingAccompanyingPeriod implements ListInterface
         ]);
     }
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return ['address_date_rolling' => $formData['address_date_rolling']->normalize()];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return ['address_date_rolling' => RollingDate::fromNormalized($formData['address_date_rolling'])];
+    }
+
     public function getFormDefaultData(): array
     {
         return ['address_date_rolling' => new RollingDate(RollingDate::T_TODAY)];
@@ -81,22 +96,22 @@ final readonly class ListPersonHavingAccompanyingPeriod implements ListInterface
         return $this->listPersonHelper->getLabels($key, $values, $data);
     }
 
-    public function getQueryKeys($data)
+    public function getQueryKeys($data): array
     {
         return $this->listPersonHelper->getAllKeys();
     }
 
-    public function getResult($query, $data)
+    public function getResult($query, $data, \Chill\MainBundle\Export\ExportGenerationContext $context): array
     {
         return $query->getQuery()->getResult(AbstractQuery::HYDRATE_SCALAR);
     }
 
-    public function getTitle()
+    public function getTitle(): string|\Symfony\Contracts\Translation\TranslatableInterface
     {
         return 'export.list.person_with_acp.List peoples having an accompanying period';
     }
 
-    public function getType()
+    public function getType(): string
     {
         return Declarations::PERSON_TYPE;
     }
@@ -104,7 +119,7 @@ final readonly class ListPersonHavingAccompanyingPeriod implements ListInterface
     /**
      * param array{fields: string[], address_date: DateTimeImmutable} $data.
      */
-    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
+    public function initiateQuery(array $requiredModifiers, array $acl, array $data, \Chill\MainBundle\Export\ExportGenerationContext $context): \Doctrine\ORM\QueryBuilder
     {
         $centers = array_map(static fn ($el) => $el['center'], $acl);
 

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

@@ -12,6 +12,7 @@ declare(strict_types=1);
 namespace Chill\PersonBundle\Export\Export;
 
 use Chill\MainBundle\Export\AccompanyingCourseExportHelper;
+use Chill\MainBundle\Export\ExportGenerationContext;
 use Chill\MainBundle\Export\FormatterInterface;
 use Chill\MainBundle\Export\GroupedExportInterface;
 use Chill\MainBundle\Export\ListInterface;
@@ -51,6 +52,21 @@ final readonly class ListPersonWithAccompanyingPeriodDetails implements ListInte
         ]);
     }
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return ['address_date' => $formData['address_date']->normalize()];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return ['address_date' => RollingDate::fromNormalized($formData['address_date'])];
+    }
+
     public function getFormDefaultData(): array
     {
         return ['address_date' => new RollingDate(RollingDate::T_TODAY)];
@@ -80,7 +96,7 @@ final readonly class ListPersonWithAccompanyingPeriodDetails implements ListInte
         return $this->listAccompanyingPeriodHelper->getLabels($key, $values, $data);
     }
 
-    public function getQueryKeys($data)
+    public function getQueryKeys($data): array
     {
         return array_merge(
             $this->listPersonHelper->getAllKeys(),
@@ -88,17 +104,17 @@ final readonly class ListPersonWithAccompanyingPeriodDetails implements ListInte
         );
     }
 
-    public function getResult($query, $data)
+    public function getResult($query, $data, ExportGenerationContext $context): array
     {
         return $query->getQuery()->getResult(AbstractQuery::HYDRATE_SCALAR);
     }
 
-    public function getTitle()
+    public function getTitle(): string|\Symfony\Contracts\Translation\TranslatableInterface
     {
         return 'export.list.person_with_acp.List peoples having an accompanying period with period details';
     }
 
-    public function getType()
+    public function getType(): string
     {
         return Declarations::PERSON_TYPE;
     }
@@ -106,7 +122,7 @@ final readonly class ListPersonWithAccompanyingPeriodDetails implements ListInte
     /**
      * param array{fields: string[], address_date: DateTimeImmutable} $data.
      */
-    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
+    public function initiateQuery(array $requiredModifiers, array $acl, array $data, ExportGenerationContext $context): \Doctrine\ORM\QueryBuilder
     {
         $centers = array_map(static fn ($el) => $el['center'], $acl);
 
@@ -117,7 +133,7 @@ final readonly class ListPersonWithAccompanyingPeriodDetails implements ListInte
             ->join('acppart.accompanyingPeriod', 'acp')
             ->andWhere($qb->expr()->neq('acp.step', "'".AccompanyingPeriod::STEP_DRAFT."'"));
 
-        $this->filterListAccompanyingPeriodHelper->addFilterAccompanyingPeriods($qb, $requiredModifiers, $acl, $data);
+        $this->filterListAccompanyingPeriodHelper->addFilterAccompanyingPeriods($qb, $requiredModifiers, $acl, $context->byUser, $data);
 
         $this->listPersonHelper->addSelect($qb, $this->rollingDateConverter->convert($data['address_date']));
         $this->listAccompanyingPeriodHelper->addSelectClauses($qb, $this->rollingDateConverter->convert($data['address_date']));

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

@@ -51,6 +51,21 @@ final readonly class StatAccompanyingCourseDuration implements ExportInterface,
         ]);
     }
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return ['closingdate_rolling' => $formData['closingdate_rolling']->normalize()];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return ['closingdate_rolling' => RollingDate::fromNormalized($formData['closingdate_rolling'])];
+    }
+
     public function getFormDefaultData(): array
     {
         return ['closingdate_rolling' => new RollingDate(RollingDate::T_TODAY)];
@@ -97,7 +112,7 @@ final readonly class StatAccompanyingCourseDuration implements ExportInterface,
         return ['avg_export_result', 'count_acp_export_result', 'count_acppart_export_result', 'count_pers_export_result'];
     }
 
-    public function getResult($query, $data)
+    public function getResult($query, $data, \Chill\MainBundle\Export\ExportGenerationContext $context): array
     {
         return $query->getQuery()->getResult(Query::HYDRATE_SCALAR);
     }
@@ -112,7 +127,7 @@ final readonly class StatAccompanyingCourseDuration implements ExportInterface,
         return Declarations::ACP_TYPE;
     }
 
-    public function initiateQuery(array $requiredModifiers, array $acl, array $data = []): QueryBuilder
+    public function initiateQuery(array $requiredModifiers, array $acl, array $data, \Chill\MainBundle\Export\ExportGenerationContext $context): QueryBuilder
     {
         $centers = array_map(static fn ($el) => $el['center'], $acl);
 

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

@@ -11,6 +11,7 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters;
 
+use Chill\MainBundle\Export\ExportGenerationContext;
 use Chill\MainBundle\Export\FilterInterface;
 use Chill\MainBundle\Form\Type\PickRollingDateType;
 use Chill\MainBundle\Service\RollingDate\RollingDate;
@@ -29,7 +30,7 @@ class ActiveOnDateFilter implements FilterInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data)
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         $where = $qb->getDQLPart('where');
 
@@ -59,18 +60,33 @@ class ActiveOnDateFilter implements FilterInterface
         return Declarations::ACP_TYPE;
     }
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder): void
     {
         $builder
             ->add('on_date', PickRollingDateType::class, []);
     }
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return ['on_date' => $formData['on_date']->normalize()];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return ['on_date' => RollingDate::fromNormalized($formData['on_date'])];
+    }
+
     public function getFormDefaultData(): array
     {
         return ['on_date' => new RollingDate(RollingDate::T_TODAY)];
     }
 
-    public function describeAction($data, $format = 'string'): array
+    public function describeAction($data, ExportGenerationContext $context): array
     {
         return ['Filtered by actives courses: active on %ondate%', [
             '%ondate%' => $this->rollingDateConverter->convert($data['on_date'])->format('d-m-Y'),

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

@@ -11,6 +11,7 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters;
 
+use Chill\MainBundle\Export\ExportGenerationContext;
 use Chill\MainBundle\Export\FilterInterface;
 use Chill\MainBundle\Form\Type\PickRollingDateType;
 use Chill\MainBundle\Service\RollingDate\RollingDate;
@@ -28,7 +29,7 @@ class ActiveOneDayBetweenDatesFilter implements FilterInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data)
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         $clause = "OVERLAPSI (acp.openingDate, acp.closingDate), (:datefrom, :dateto) = 'TRUE'";
 
@@ -48,19 +49,34 @@ class ActiveOneDayBetweenDatesFilter implements FilterInterface
         return Declarations::ACP_TYPE;
     }
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder): void
     {
         $builder
             ->add('date_from', PickRollingDateType::class, [])
             ->add('date_to', PickRollingDateType::class, []);
     }
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return ['date_from' => $formData['date_from']->normalize(), 'date_to' => $formData['date_to']->normalize()];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return ['date_from' => RollingDate::fromNormalized($formData['date_from']), 'date_to' => RollingDate::fromNormalized($formData['date_to'])];
+    }
+
     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
+    public function describeAction($data, ExportGenerationContext $context): array
     {
         return ['Filtered by actives courses: at least one day between %datefrom% and %dateto%', [
             '%datefrom%' => $this->rollingDateConverter->convert($data['date_from'])->format('d-m-Y'),

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

@@ -11,23 +11,27 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters;
 
+use Chill\MainBundle\Export\ExportGenerationContext;
 use Chill\MainBundle\Export\FilterInterface;
 use Chill\MainBundle\Form\Type\PickUserLocationType;
+use Chill\MainBundle\Repository\LocationTypeRepository;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Chill\PersonBundle\Export\Declarations;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
 
-class AdministrativeLocationFilter implements FilterInterface
+final readonly class AdministrativeLocationFilter implements FilterInterface
 {
-    public function __construct(private readonly TranslatableStringHelper $translatableStringHelper) {}
+    use \Chill\MainBundle\Export\ExportDataNormalizerTrait;
+
+    public function __construct(private TranslatableStringHelper $translatableStringHelper, private LocationTypeRepository $locationTypeRepository) {}
 
     public function addRole(): ?string
     {
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data)
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         $clause = $qb->expr()->in('acp.administrativeLocation', ':locations');
         $qb
@@ -40,7 +44,7 @@ class AdministrativeLocationFilter implements FilterInterface
         return Declarations::ACP_TYPE;
     }
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder): void
     {
         $builder->add('accepted_locations', PickUserLocationType::class, [
             'label' => 'Accepted locations',
@@ -48,12 +52,27 @@ class AdministrativeLocationFilter implements FilterInterface
         ]);
     }
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return ['accepted_locations' => $this->normalizeDoctrineEntity($formData['accepted_locations'])];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return ['accepted_locations' => $this->denormalizeDoctrineEntity($formData['accepted_locations'], $this->locationTypeRepository)];
+    }
+
     public function getFormDefaultData(): array
     {
         return [];
     }
 
-    public function describeAction($data, $format = 'string'): array
+    public function describeAction($data, ExportGenerationContext $context): array
     {
         $locations = [];
 

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

@@ -11,25 +11,29 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters;
 
+use Chill\MainBundle\Export\ExportGenerationContext;
 use Chill\MainBundle\Export\FilterInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Chill\PersonBundle\Entity\AccompanyingPeriod\ClosingMotive;
 use Chill\PersonBundle\Export\Declarations;
+use Chill\PersonBundle\Repository\AccompanyingPeriod\ClosingMotiveRepositoryInterface;
 use Doctrine\ORM\Query\Expr\Andx;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\FormBuilderInterface;
 
-class ClosingMotiveFilter implements FilterInterface
+final readonly class ClosingMotiveFilter implements FilterInterface
 {
-    public function __construct(private readonly TranslatableStringHelper $translatableStringHelper) {}
+    use \Chill\MainBundle\Export\ExportDataNormalizerTrait;
+
+    public function __construct(private TranslatableStringHelper $translatableStringHelper, private ClosingMotiveRepositoryInterface $closingMotiveRepository) {}
 
     public function addRole(): ?string
     {
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data)
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         $where = $qb->getDQLPart('where');
         $clause = $qb->expr()->in('acp.closingMotive', ':closingmotive');
@@ -49,7 +53,7 @@ class ClosingMotiveFilter implements FilterInterface
         return Declarations::ACP_TYPE;
     }
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder): void
     {
         $builder->add('accepted_closingmotives', EntityType::class, [
             'class' => ClosingMotive::class,
@@ -59,12 +63,27 @@ class ClosingMotiveFilter implements FilterInterface
         ]);
     }
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return ['accepted_closingmotives' => $this->normalizeDoctrineEntity($formData['accepted_closingmotives'])];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return ['accepted_closingmotives' => $this->denormalizeDoctrineEntity($formData['accepted_closingmotives'], $this->closingMotiveRepository)];
+    }
+
     public function getFormDefaultData(): array
     {
         return [];
     }
 
-    public function describeAction($data, $format = 'string'): array
+    public function describeAction($data, ExportGenerationContext $context): array
     {
         $motives = [];
 

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

@@ -11,6 +11,7 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters;
 
+use Chill\MainBundle\Export\ExportGenerationContext;
 use Chill\MainBundle\Export\FilterInterface;
 use Chill\PersonBundle\Export\Declarations;
 use Doctrine\ORM\Query\Expr\Andx;
@@ -35,7 +36,7 @@ class ConfidentialFilter implements FilterInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data)
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         $where = $qb->getDQLPart('where');
         $clause = $qb->expr()->eq('acp.confidential', ':confidential');
@@ -55,7 +56,7 @@ class ConfidentialFilter implements FilterInterface
         return Declarations::ACP_TYPE;
     }
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder): void
     {
         $builder->add('accepted_confidentials', ChoiceType::class, [
             'choices' => self::CHOICES,
@@ -65,12 +66,27 @@ class ConfidentialFilter implements FilterInterface
         ]);
     }
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return ['accepted_confidentials' => $formData['accepted_confidentials']];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return ['accepted_confidentials' => $formData['accepted_confidentials']];
+    }
+
     public function getFormDefaultData(): array
     {
         return ['accepted_confidentials' => self::DEFAULT_CHOICE];
     }
 
-    public function describeAction($data, $format = 'string'): array
+    public function describeAction($data, ExportGenerationContext $context): array
     {
         return [
             'Filtered by confidential: only %confidential%', [

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

@@ -12,21 +12,27 @@ declare(strict_types=1);
 namespace Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters;
 
 use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Export\ExportGenerationContext;
 use Chill\MainBundle\Export\FilterInterface;
-use Chill\MainBundle\Form\Type\PickUserDynamicType;
+use Chill\MainBundle\Form\Type\PickUserOrMeDynamicType;
+use Chill\MainBundle\Repository\UserRepositoryInterface;
 use Chill\PersonBundle\Export\Declarations;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
 
-class CreatorFilter implements FilterInterface
+final readonly class CreatorFilter implements FilterInterface
 {
+    use \Chill\MainBundle\Export\ExportDataNormalizerTrait;
+
+    public function __construct(private readonly UserRepositoryInterface $userRepository) {}
+
     public function addRole(): ?string
     {
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data)
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         if (!\in_array('acp_creator', $qb->getAllAliases(), true)) {
             $qb->join('acp.createdBy', 'acp_creator');
@@ -34,7 +40,7 @@ class CreatorFilter implements FilterInterface
 
         $qb
             ->andWhere($qb->expr()->in('acp_creator', ':creators'))
-            ->setParameter('creators', $data['accepted_creators']);
+            ->setParameter('creators', $this->userOrMe($data['accepted_creators'], $exportGenerationContext));
     }
 
     public function applyOn(): string
@@ -42,21 +48,36 @@ class CreatorFilter implements FilterInterface
         return Declarations::ACP_TYPE;
     }
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder): void
     {
         $builder
-            ->add('accepted_creators', PickUserDynamicType::class, [
+            ->add('accepted_creators', PickUserOrMeDynamicType::class, [
                 'multiple' => true,
                 'label' => false,
             ]);
     }
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return ['accepted_creators' => $this->normalizeUserOrMe($formData['accepted_creators'])];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return ['accepted_creators' => $this->denormalizeUserOrMe($formData['accepted_creators'], $this->userRepository)];
+    }
+
     public function getFormDefaultData(): array
     {
         return [];
     }
 
-    public function describeAction($data, $format = 'string'): array
+    public function describeAction($data, ExportGenerationContext $context): array
     {
         return [
             'Filtered by creator: only %creators%', [
@@ -64,7 +85,7 @@ class CreatorFilter implements FilterInterface
                     ', ',
                     array_map(
                         static fn (User $u) => $u->getLabel(),
-                        $data['accepted_creators'] instanceof Collection ? $data['accepted_creators']->toArray() : $data['accepted_creators']
+                        $data['accepted_creators'] instanceof Collection ? $this->userOrMe($data['accepted_creators']->toArray(), $context) : $this->userOrMe($data['accepted_creators'], $context)
                     )
                 ),
             ], ];

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

@@ -13,6 +13,7 @@ namespace Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters;
 
 use Chill\MainBundle\Entity\User\UserJobHistory;
 use Chill\MainBundle\Entity\UserJob;
+use Chill\MainBundle\Export\ExportGenerationContext;
 use Chill\MainBundle\Export\FilterInterface;
 use Chill\MainBundle\Repository\UserJobRepositoryInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
@@ -21,14 +22,16 @@ use Doctrine\ORM\Query\Expr\Join;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\Translation\TranslatableMessage;
 
-class CreatorJobFilter implements FilterInterface
+final readonly class CreatorJobFilter implements FilterInterface
 {
+    use \Chill\MainBundle\Export\ExportDataNormalizerTrait;
     private const PREFIX = 'acp_filter_creator_job';
 
     public function __construct(
-        private readonly TranslatableStringHelper $translatableStringHelper,
-        private readonly UserJobRepositoryInterface $userJobRepository,
+        private TranslatableStringHelper $translatableStringHelper,
+        private UserJobRepositoryInterface $userJobRepository,
     ) {}
 
     public function addRole(): ?string
@@ -36,7 +39,7 @@ class CreatorJobFilter implements FilterInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data)
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         $p = self::PREFIX;
 
@@ -83,7 +86,7 @@ class CreatorJobFilter implements FilterInterface
         return Declarations::ACP_TYPE;
     }
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder): void
     {
         $builder
             ->add('creator_job', EntityType::class, [
@@ -98,19 +101,34 @@ class CreatorJobFilter implements FilterInterface
             ]);
     }
 
-    public function describeAction($data, $format = 'string'): array
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return ['creator_job' => $this->normalizeDoctrineEntity($formData['creator_job'])];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return ['creator_job' => $this->denormalizeDoctrineEntity($formData['creator_job'], $this->userJobRepository)];
+    }
+
+    public function describeAction($data, ExportGenerationContext $context): TranslatableMessage
     {
         $creatorJobs = [];
 
         foreach ($data['creator_job'] as $j) {
             $creatorJobs[] = $this->translatableStringHelper->localize(
-                $j->getLabel()
+                $j->getLabel(),
             );
         }
 
-        return ['export.filter.course.creator_job.Filtered by creator job: only %jobs%', [
+        return new TranslatableMessage('export.filter.course.creator_job.Filtered by creator job: only %jobs%', [
             '%jobs%' => implode(', ', $creatorJobs),
-        ]];
+        ]);
     }
 
     public function getFormDefaultData(): array
@@ -120,8 +138,8 @@ class CreatorJobFilter implements FilterInterface
         ];
     }
 
-    public function getTitle(): string
+    public function getTitle(): TranslatableMessage
     {
-        return 'export.filter.course.creator_job.Filter by creator job';
+        return new TranslatableMessage('export.filter.course.creator_job.Filter by creator job');
     }
 }

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

@@ -11,6 +11,7 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters;
 
+use Chill\MainBundle\Export\ExportGenerationContext;
 use Chill\MainBundle\Export\FilterInterface;
 use Chill\PersonBundle\Export\Declarations;
 use Doctrine\ORM\Query\Expr\Andx;
@@ -35,7 +36,7 @@ class EmergencyFilter implements FilterInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data)
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         $where = $qb->getDQLPart('where');
         $clause = $qb->expr()->eq('acp.emergency', ':emergency');
@@ -55,7 +56,7 @@ class EmergencyFilter implements FilterInterface
         return Declarations::ACP_TYPE;
     }
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder): void
     {
         $builder->add('accepted_emergency', ChoiceType::class, [
             'choices' => self::CHOICES,
@@ -65,12 +66,27 @@ class EmergencyFilter implements FilterInterface
         ]);
     }
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return ['accepted_emergency' => $formData['accepted_emergency']];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return ['accepted_emergency' => $formData['accepted_emergency']];
+    }
+
     public function getFormDefaultData(): array
     {
         return ['accepted_emergency' => self::DEFAULT_CHOICE];
     }
 
-    public function describeAction($data, $format = 'string'): array
+    public function describeAction($data, ExportGenerationContext $context): array
     {
         return [
             'Filtered by emergency: only %emergency%', [

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

@@ -11,6 +11,7 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters;
 
+use Chill\MainBundle\Export\ExportGenerationContext;
 use Chill\MainBundle\Export\FilterInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Chill\PersonBundle\Entity\SocialWork\Evaluation;
@@ -20,16 +21,18 @@ use Doctrine\ORM\QueryBuilder;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\FormBuilderInterface;
 
-class EvaluationFilter implements FilterInterface
+final readonly class EvaluationFilter implements FilterInterface
 {
-    public function __construct(private readonly EvaluationRepositoryInterface $evaluationRepository, private readonly TranslatableStringHelper $translatableStringHelper) {}
+    use \Chill\MainBundle\Export\ExportDataNormalizerTrait;
+
+    public function __construct(private EvaluationRepositoryInterface $evaluationRepository, private TranslatableStringHelper $translatableStringHelper) {}
 
     public function addRole(): ?string
     {
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data)
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         if (!\in_array('acpw', $qb->getAllAliases(), true)) {
             $qb->join('acp.works', 'acpw');
@@ -53,7 +56,7 @@ class EvaluationFilter implements FilterInterface
         return Declarations::ACP_TYPE;
     }
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder): void
     {
         $builder->add('accepted_evaluations', EntityType::class, [
             'class' => Evaluation::class,
@@ -65,12 +68,27 @@ class EvaluationFilter implements FilterInterface
         ]);
     }
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return ['accepted_evaluations' => $this->normalizeDoctrineEntity($formData['accepted_evaluations'])];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return ['accepted_evaluations' => $this->denormalizeDoctrineEntity($formData['accepted_evaluations'], $this->evaluationRepository)];
+    }
+
     public function getFormDefaultData(): array
     {
         return [];
     }
 
-    public function describeAction($data, $format = 'string'): array
+    public function describeAction($data, ExportGenerationContext $context): array
     {
         $evaluations = [];
 

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

@@ -13,6 +13,7 @@ namespace Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters;
 
 use Chill\MainBundle\Entity\Address;
 use Chill\MainBundle\Entity\GeographicalUnit\SimpleGeographicalUnitDTO;
+use Chill\MainBundle\Export\ExportGenerationContext;
 use Chill\MainBundle\Export\FilterInterface;
 use Chill\MainBundle\Form\Type\PickRollingDateType;
 use Chill\MainBundle\Repository\GeographicalUnitLayerRepositoryInterface;
@@ -45,7 +46,7 @@ class GeographicalUnitStatFilter implements FilterInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data)
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         $subQueryDql =
             'SELECT
@@ -86,7 +87,7 @@ class GeographicalUnitStatFilter implements FilterInterface
         return Declarations::ACP_TYPE;
     }
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder): void
     {
         $builder
             ->add('date_calc', PickRollingDateType::class, [
@@ -106,12 +107,38 @@ class GeographicalUnitStatFilter implements FilterInterface
             ]);
     }
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return [
+            'date_calc' => $formData['date_calc']->normalize(),
+            'units' => array_map(static fn (SimpleGeographicalUnitDTO $unitDTO) => $unitDTO->id, $formData['units']),
+        ];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        $units = array_filter(
+            array_map(
+                fn (int $id) => $this->geographicalUnitRepository->findSimpleGeographicalUnit($id),
+                $formData['units'],
+            ),
+            static fn (?SimpleGeographicalUnitDTO $unitDTO) => null !== $unitDTO,
+        );
+
+        return ['date_calc' => RollingDate::fromNormalized($formData['date_calc']), 'units' => $units];
+    }
+
     public function getFormDefaultData(): array
     {
         return ['date_calc' => new RollingDate(RollingDate::T_TODAY)];
     }
 
-    public function describeAction($data, $format = 'string'): array
+    public function describeAction($data, ExportGenerationContext $context): array
     {
         return ['Filtered by geographic unit: computed at %date%, only in %units%', [
             '%date%' => $this->rollingDateConverter->convert($data['date_calc'])->format('d-m-Y'),

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

@@ -11,10 +11,12 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters;
 
+use Chill\MainBundle\Export\ExportGenerationContext;
 use Chill\MainBundle\Export\FilterInterface;
 use Chill\PersonBundle\Export\Declarations;
 use Chill\ThirdPartyBundle\Entity\ThirdParty;
 use Chill\ThirdPartyBundle\Form\Type\PickThirdpartyDynamicType;
+use Chill\ThirdPartyBundle\Repository\ThirdPartyRepository;
 use Chill\ThirdPartyBundle\Templating\Entity\ThirdPartyRender;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\QueryBuilder;
@@ -22,18 +24,20 @@ use Symfony\Component\Form\FormBuilderInterface;
 
 final readonly class HandlingThirdPartyFilter implements FilterInterface
 {
+    use \Chill\MainBundle\Export\ExportDataNormalizerTrait;
     private const PREFIX = 'acpw_handling_3party_filter';
 
     public function __construct(
         private ThirdPartyRender $thirdPartyRender,
+        private ThirdPartyRepository $thirdPartyRepository,
     ) {}
 
-    public function getTitle()
+    public function getTitle(): string|\Symfony\Contracts\Translation\TranslatableInterface
     {
         return 'export.filter.work.by_handling3party.title';
     }
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder): void
     {
         $builder->add('handling_3parties', PickThirdpartyDynamicType::class, [
             'label' => 'export.filter.work.by_handling3party.pick_3parties',
@@ -41,12 +45,27 @@ final readonly class HandlingThirdPartyFilter implements FilterInterface
         ]);
     }
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return ['handling_3parties' => $this->normalizeDoctrineEntity($formData['handling_3parties'])];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return ['handling_3parties' => $this->denormalizeDoctrineEntity($formData['handling_3parties'], $this->thirdPartyRepository)];
+    }
+
     public function getFormDefaultData(): array
     {
         return ['handling_3parties' => []];
     }
 
-    public function describeAction($data, $format = 'string')
+    public function describeAction($data, ExportGenerationContext $context): string|\Symfony\Contracts\Translation\TranslatableInterface|array
     {
         return [
             'export.filter.work.by_handling3party.Only 3 parties %3parties%',
@@ -67,7 +86,7 @@ final readonly class HandlingThirdPartyFilter implements FilterInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data)
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         $p = self::PREFIX;
 
@@ -75,7 +94,7 @@ final readonly class HandlingThirdPartyFilter implements FilterInterface
         $qb->setParameter("{$p}_3ps", $data['handling_3parties']);
     }
 
-    public function applyOn()
+    public function applyOn(): string
     {
         return Declarations::SOCIAL_WORK_ACTION_TYPE;
     }

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

@@ -11,6 +11,7 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters;
 
+use Chill\MainBundle\Export\ExportGenerationContext;
 use Chill\MainBundle\Export\FilterInterface;
 use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork;
 use Chill\PersonBundle\Export\Declarations;
@@ -24,7 +25,7 @@ class HasNoActionFilter implements FilterInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data): void
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         $qb->andWhere('NOT EXISTS (SELECT 1 FROM '.AccompanyingPeriodWork::class.' work WHERE work.accompanyingPeriod = acp)');
     }
@@ -39,12 +40,27 @@ class HasNoActionFilter implements FilterInterface
         // no form
     }
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return [];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return [];
+    }
+
     public function getFormDefaultData(): array
     {
         return [];
     }
 
-    public function describeAction($data, $format = 'string'): array
+    public function describeAction($data, ExportGenerationContext $context): array
     {
         return ['Filtered acp which has no actions'];
     }

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

@@ -11,6 +11,7 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters;
 
+use Chill\MainBundle\Export\ExportGenerationContext;
 use Chill\MainBundle\Export\FilterInterface;
 use Chill\MainBundle\Form\Type\PickRollingDateType;
 use Chill\MainBundle\Service\RollingDate\RollingDate;
@@ -29,7 +30,7 @@ class HasNoReferrerFilter implements FilterInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data)
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         $qb
             ->andWhere('
@@ -54,7 +55,7 @@ class HasNoReferrerFilter implements FilterInterface
         return Declarations::ACP_TYPE;
     }
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder): void
     {
         $builder
             ->add('calc_date', PickRollingDateType::class, [
@@ -62,12 +63,27 @@ class HasNoReferrerFilter implements FilterInterface
             ]);
     }
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return ['calc_date' => $formData['calc_date']->normalize()];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return ['calc_date' => RollingDate::fromNormalized($formData['calc_date'])];
+    }
+
     public function getFormDefaultData(): array
     {
         return ['calc_date' => new RollingDate(RollingDate::T_TODAY)];
     }
 
-    public function describeAction($data, $format = 'string'): array
+    public function describeAction($data, ExportGenerationContext $context): array
     {
         return ['Filtered acp which has no referrer on date: %date%', [
             '%date%' => $this->rollingDateConverter->convert($data['calc_date'])->format('d-m-Y'),

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

@@ -11,6 +11,7 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters;
 
+use Chill\MainBundle\Export\ExportGenerationContext;
 use Chill\MainBundle\Export\FilterInterface;
 use Chill\MainBundle\Form\Type\PickRollingDateType;
 use Chill\MainBundle\Service\RollingDate\RollingDate;
@@ -29,7 +30,7 @@ class HasTemporaryLocationFilter implements FilterInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data)
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         $qb
             ->join('acp.locationHistories', 'acp_having_temporarily_location')
@@ -52,7 +53,7 @@ class HasTemporaryLocationFilter implements FilterInterface
         return Declarations::ACP_TYPE;
     }
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder): void
     {
         $builder
             ->add('having_temporarily', ChoiceType::class, [
@@ -73,12 +74,27 @@ class HasTemporaryLocationFilter implements FilterInterface
             ]);
     }
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return ['having_temporarily' => $formData['having_temporarily'], 'calc_date' => $formData['calc_date']->normalize()];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return ['having_temporarily' => $formData['having_temporarily'], 'calc_date' => RollingDate::fromNormalized($formData['calc_date'])];
+    }
+
     public function getFormDefaultData(): array
     {
         return ['calc_date' => new RollingDate(RollingDate::T_TODAY)];
     }
 
-    public function describeAction($data, $format = 'string'): array
+    public function describeAction($data, ExportGenerationContext $context): array
     {
         return match ($data['having_temporarily']) {
             true => ['export.filter.course.having_temporarily.Having a temporarily location', []],

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

@@ -11,6 +11,7 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters;
 
+use Chill\MainBundle\Export\ExportGenerationContext;
 use Chill\MainBundle\Export\FilterInterface;
 use Chill\MainBundle\Form\Type\PickRollingDateType;
 use Chill\MainBundle\Service\RollingDate\RollingDate;
@@ -42,6 +43,21 @@ final readonly class HavingAnAccompanyingPeriodInfoWithinDatesFilter implements
             ]);
     }
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return ['start_date' => $formData['start_date']->normalize(), 'end_date' => $formData['end_date']->normalize()];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return ['start_date' => RollingDate::fromNormalized($formData['start_date']), 'end_date' => RollingDate::fromNormalized($formData['end_date'])];
+    }
+
     public function getFormDefaultData(): array
     {
         return ['start_date' => new RollingDate(RollingDate::T_TODAY), 'end_date' => new RollingDate(RollingDate::T_TODAY)];
@@ -52,7 +68,7 @@ final readonly class HavingAnAccompanyingPeriodInfoWithinDatesFilter implements
         return 'export.filter.course.having_info_within_interval.title';
     }
 
-    public function describeAction($data, $format = 'string'): array
+    public function describeAction($data, ExportGenerationContext $context): array
     {
         return [
             'export.filter.course.having_info_within_interval.Only course with events between %startDate% and %endDate%',
@@ -68,7 +84,7 @@ final readonly class HavingAnAccompanyingPeriodInfoWithinDatesFilter implements
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data): void
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         $ai = 'having_ai_within_interval_acc_info';
         $as = 'having_ai_within_interval_start_date';

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

@@ -11,6 +11,7 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters;
 
+use Chill\MainBundle\Export\ExportGenerationContext;
 use Chill\MainBundle\Export\FilterInterface;
 use Chill\PersonBundle\Export\Declarations;
 use Doctrine\ORM\Query\Expr\Andx;
@@ -35,7 +36,7 @@ class IntensityFilter implements FilterInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data)
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         $where = $qb->getDQLPart('where');
         $clause = $qb->expr()->eq('acp.intensity', ':intensity');
@@ -55,7 +56,7 @@ class IntensityFilter implements FilterInterface
         return Declarations::ACP_TYPE;
     }
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder): void
     {
         $builder->add('accepted_intensities', ChoiceType::class, [
             'choices' => self::CHOICES,
@@ -65,12 +66,27 @@ class IntensityFilter implements FilterInterface
         ]);
     }
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return ['accepted_intensities' => $formData['accepted_intensities']];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return ['accepted_intensities' => $formData['accepted_intensities']];
+    }
+
     public function getFormDefaultData(): array
     {
         return ['accepted_intensities' => self::DEFAULT_CHOICE];
     }
 
-    public function describeAction($data, $format = 'string'): array
+    public function describeAction($data, ExportGenerationContext $context): array
     {
         return [
             'Filtered by intensity: only %intensity%', [

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

@@ -13,6 +13,7 @@ namespace Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters;
 
 use Chill\MainBundle\Entity\User\UserJobHistory;
 use Chill\MainBundle\Entity\UserJob;
+use Chill\MainBundle\Export\ExportGenerationContext;
 use Chill\MainBundle\Export\FilterInterface;
 use Chill\MainBundle\Form\Type\PickRollingDateType;
 use Chill\MainBundle\Repository\UserJobRepositoryInterface;
@@ -33,6 +34,7 @@ use Symfony\Component\Form\FormBuilderInterface;
  */
 readonly class JobWorkingOnCourseFilter implements FilterInterface
 {
+    use \Chill\MainBundle\Export\ExportDataNormalizerTrait;
     private const PREFIX = 'acp_filter_user_job_working_on_course';
 
     public function __construct(
@@ -46,7 +48,7 @@ readonly class JobWorkingOnCourseFilter implements FilterInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data): void
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         $p = self::PREFIX;
 
@@ -105,7 +107,22 @@ readonly class JobWorkingOnCourseFilter implements FilterInterface
         ;
     }
 
-    public function describeAction($data, $format = 'string'): array
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return ['jobs' => $this->normalizeDoctrineEntity($formData['jobs']), 'start_date' => $formData['start_date']->normalize(), 'end_date' => $formData['end_date']->normalize()];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return ['jobs' => $this->denormalizeDoctrineEntity($formData['jobs'], $this->userJobRepository), 'start_date' => RollingDate::fromNormalized($formData['start_date']), 'end_date' => RollingDate::fromNormalized($formData['end_date'])];
+    }
+
+    public function describeAction($data, ExportGenerationContext $context): array
     {
         return [
             'export.filter.course.by_job_working.Filtered by job working on course: only %jobs%, between %start_date% and %end_date%', [

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

@@ -12,6 +12,7 @@ declare(strict_types=1);
 namespace Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters;
 
 use Chill\MainBundle\Entity\Address;
+use Chill\MainBundle\Export\ExportGenerationContext;
 use Chill\MainBundle\Export\FilterInterface;
 use Chill\MainBundle\Form\Type\PickRollingDateType;
 use Chill\MainBundle\Service\RollingDate\RollingDate;
@@ -28,18 +29,33 @@ final readonly class NotAssociatedWithAReferenceAddressFilter implements FilterI
         private RollingDateConverterInterface $rollingDateConverter,
     ) {}
 
-    public function getTitle()
+    public function getTitle(): string|\Symfony\Contracts\Translation\TranslatableInterface
     {
         return 'export.filter.course.not_having_address_reference.title';
     }
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder): void
     {
         $builder->add('date_calc', PickRollingDateType::class, [
             'label' => 'export.filter.course.not_having_address_reference.adress_at',
         ]);
     }
 
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return ['date_calc' => $formData['date_calc']->normalize()];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return ['date_calc' => RollingDate::fromNormalized($formData['date_calc'])];
+    }
+
     public function getFormDefaultData(): array
     {
         return [
@@ -47,7 +63,7 @@ final readonly class NotAssociatedWithAReferenceAddressFilter implements FilterI
         ];
     }
 
-    public function describeAction($data, $format = 'string')
+    public function describeAction($data, ExportGenerationContext $context): string|\Symfony\Contracts\Translation\TranslatableInterface|array
     {
         return [
             'exports.filter.course.not_having_address_reference.describe',
@@ -62,7 +78,7 @@ final readonly class NotAssociatedWithAReferenceAddressFilter implements FilterI
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data)
+    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
         $k = 'acp_not_associated_ref_filter';
 
@@ -91,7 +107,7 @@ final readonly class NotAssociatedWithAReferenceAddressFilter implements FilterI
         $qb->setParameter("{$k}_date_calc", $this->rollingDateConverter->convert($data['date_calc']));
     }
 
-    public function applyOn()
+    public function applyOn(): string
     {
         return Declarations::ACP_TYPE;
     }