From 318d6b6d4e7dfe5df6ede6cdbe14615b33093977 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Wed, 16 Nov 2022 14:57:40 +0100
Subject: [PATCH] Fixed: remaining options not linked with PickRollingDateType

---
 .../GeographicalUnitStatAggregator.php               | 12 ++++++------
 .../Filter/EvaluationFilters/ByEndDateFilter.php     |  2 --
 .../Filter/EvaluationFilters/ByStartDateFilter.php   |  2 --
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/GeographicalUnitStatAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/GeographicalUnitStatAggregator.php
index 04a6ff8cd..e0606a959 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/GeographicalUnitStatAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/GeographicalUnitStatAggregator.php
@@ -58,9 +58,9 @@ final class GeographicalUnitStatAggregator implements AggregatorInterface
             $qb->expr()->andX(
                 'acp_geog_agg_location_history.startDate <= :acp_geog_aggregator_date',
                 $qb->expr()->orX(
-                        'acp_geog_agg_location_history.endDate IS NULL',
-                        'acp_geog_agg_location_history.endDate > :acp_geog_aggregator_date'
-                    )
+                    'acp_geog_agg_location_history.endDate IS NULL',
+                    'acp_geog_agg_location_history.endDate > :acp_geog_aggregator_date'
+                )
             )
         );
 
@@ -73,9 +73,9 @@ final class GeographicalUnitStatAggregator implements AggregatorInterface
                 'IDENTITY(acp_geog_agg_address_person_location.person) = IDENTITY(acp_geog_agg_location_history.personLocation)',
                 'acp_geog_agg_address_person_location.validFrom < :acp_geog_aggregator_date',
                 $qb->expr()->orX(
-                        'acp_geog_agg_address_person_location.validTo > :acp_geog_aggregator_date',
-                        $qb->expr()->isNull('acp_geog_agg_address_person_location.validTo')
-                    )
+                    'acp_geog_agg_address_person_location.validTo > :acp_geog_aggregator_date',
+                    $qb->expr()->isNull('acp_geog_agg_address_person_location.validTo')
+                )
             )
         );
 
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/EvaluationFilters/ByEndDateFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/EvaluationFilters/ByEndDateFilter.php
index 2dd9192bd..de86604e6 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/EvaluationFilters/ByEndDateFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/EvaluationFilters/ByEndDateFilter.php
@@ -16,7 +16,6 @@ use Chill\MainBundle\Form\Type\PickRollingDateType;
 use Chill\MainBundle\Service\RollingDate\RollingDate;
 use Chill\MainBundle\Service\RollingDate\RollingDateConverterInterface;
 use Chill\PersonBundle\Export\Declarations;
-use DateTimeImmutable;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
 
@@ -59,7 +58,6 @@ class ByEndDateFilter implements FilterInterface
             ->add('start_date', PickRollingDateType::class, [
                 'label' => 'start period date',
                 'data' => new RollingDate(RollingDate::T_YEAR_PREVIOUS_START),
-                'input' => 'datetime_immutable',
             ])
             ->add('end_date', PickRollingDateType::class, [
                 'label' => 'end period date',
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/EvaluationFilters/ByStartDateFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/EvaluationFilters/ByStartDateFilter.php
index 95314708f..27518599c 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/EvaluationFilters/ByStartDateFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/EvaluationFilters/ByStartDateFilter.php
@@ -16,7 +16,6 @@ use Chill\MainBundle\Form\Type\PickRollingDateType;
 use Chill\MainBundle\Service\RollingDate\RollingDate;
 use Chill\MainBundle\Service\RollingDate\RollingDateConverterInterface;
 use Chill\PersonBundle\Export\Declarations;
-use DateTimeImmutable;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
 
@@ -59,7 +58,6 @@ class ByStartDateFilter implements FilterInterface
             ->add('start_date', PickRollingDateType::class, [
                 'label' => 'start period date',
                 'data' => new RollingDate(RollingDate::T_YEAR_PREVIOUS_START),
-                'input' => 'datetime_immutable',
             ])
             ->add('end_date', PickRollingDateType::class, [
                 'label' => 'end period date',