Merge branch '111_exports_suite' into calendar/finalization

src/Bundle/ChillPersonBundle/Entity/Person.php

@@ -27,6 +27,8 @@ use Chill\MainBundle\Validation\Constraint\PhonenumberConstraint;
 use Chill\PersonBundle\Entity\Household\Household;
 use Chill\PersonBundle\Entity\Household\HouseholdMember;
 use Chill\PersonBundle\Entity\Household\PersonHouseholdAddress;
+use Chill\PersonBundle\Entity\Person\PersonCenterCurrent;
+use Chill\PersonBundle\Entity\Person\PersonCenterHistory;
 use Chill\PersonBundle\Entity\Person\PersonCurrentAddress;
 use Chill\PersonBundle\Entity\Person\PersonResource;
 use Chill\PersonBundle\Validator\Constraints\Household\HouseholdMembershipSequential;
@@ -44,6 +46,7 @@ use libphonenumber\PhoneNumber;
 use Symfony\Component\Serializer\Annotation\DiscriminatorMap;
 use Symfony\Component\Validator\Constraints as Assert;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
+use UnexpectedValueException;
 use function count;
 use function in_array;
 
@@ -188,9 +191,23 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      * The person's center.
      *
      * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\Center")
+     *
+     * @deprecated
      */
     private ?Center $center = null;
 
+    /**
+     * @ORM\OneToOne(targetEntity=PersonCenterCurrent::class, mappedBy="person")
+     */
+    private ?PersonCenterCurrent $centerCurrent = null;
+
+    /**
+     * @ORM\OneToMany(targetEntity=PersonCenterHistory::class, mappedBy="person", cascade={"persist"})
+     *
+     * @var Collection|PersonCenterHistory[]
+     */
+    private Collection $centerHistory;
+
     /**
      * Array where customfield's data are stored.
      *
@@ -531,6 +548,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
         $this->budgetResources = new ArrayCollection();
         $this->budgetCharges = new ArrayCollection();
         $this->resources = new ArrayCollection();
+        $this->centerHistory = new ArrayCollection();
     }
 
     /**
@@ -905,7 +923,33 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
 
     public function getCenter(): ?Center
     {
-        return $this->center;
+        if (null !== $this->centerCurrent) {
+            return $this->centerCurrent->getCenter();
+        }
+
+        if (null === $currentCenterHistory = $this->getCurrentCenterHistory()) {
+            return null;
+        }
+
+        return $currentCenterHistory->getCenter();
+    }
+
+    public function getCenterCurrent(): ?PersonCenterCurrent
+    {
+        if (null !== $this->centerCurrent) {
+            return $this->centerCurrent;
+        }
+
+        if (null === $currentCenterHistory = $this->getCurrentCenterHistory()) {
+            return null;
+        }
+
+        return new PersonCenterCurrent($currentCenterHistory);
+    }
+
+    public function getCenterHistory(): Collection
+    {
+        return $this->centerHistory;
     }
 
     public function getCFData(): ?array
@@ -1518,17 +1562,39 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
         return $this;
     }
 
+    /**
+     * Associate the center with the person. The association start on 'now'.
+     *
+     * @return $this
+     */
     public function setCenter(Center $center): self
     {
         $this->center = $center;
 
+        $modification = new DateTimeImmutable('now');
+
+        foreach ($this->centerHistory as $centerHistory) {
+            if (null === $centerHistory->getEndDate()) {
+                $centerHistory->setEndDate($modification);
+            }
+        }
+
+        $this->centerHistory[] = $new = new PersonCenterHistory($this, $center, $modification);
+
+        return $this;
+    }
+
+    public function setCenterHistory(Collection $centerHistory): Person
+    {
+        $this->centerHistory = $centerHistory;
+
         return $this;
     }
 
     /**
-     * @return Report
+     * @return Person
      */
-    public function setCFData(?array $cFData)
+    public function setCFData(?array $cFData): self
     {
         $this->cFData = $cFData;
 
@@ -1727,6 +1793,34 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
         return $this;
     }
 
+    private function getCurrentCenterHistory(): ?PersonCenterHistory
+    {
+        if (0 === $this->centerHistory->count()) {
+            return null;
+        }
+
+        $criteria = Criteria::create();
+        $now = new DateTimeImmutable('now');
+        $criteria->where(Criteria::expr()->lte('startDate', $now))
+            ->andWhere(Criteria::expr()->orX(
+                Criteria::expr()->isNull('endDate'),
+                Criteria::expr()->gt('endDate', $now)
+            ));
+
+        $histories = $this->centerHistory->matching($criteria);
+
+        switch ($histories->count()) {
+            case 0:
+                return null;
+
+            case 1:
+                return $histories->first();
+
+            default:
+                throw new UnexpectedValueException('It should not contains more than one center at a time');
+        }
+    }
+
     /**
      * This private function scan accompanyingPeriodParticipations Collection,
      * searching for a given AccompanyingPeriod.

src/Bundle/ChillPersonBundle/Entity/Person/PersonCenterCurrent.php

@@ -0,0 +1,100 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Entity\Person;
+
+use Chill\MainBundle\Entity\Center;
+use Chill\PersonBundle\Entity\Person;
+use DateTimeImmutable;
+use Doctrine\ORM\Mapping as ORM;
+
+/**
+ * Associate a Person with the current center.
+ *
+ * The process of selecting the current center is done on database side,
+ * using a SQL view.
+ *
+ * @ORM\Entity(readOnly=true)
+ * @ORM\Table(name="view_chill_person_person_center_history_current")
+ * @psalm-internal Chill\PersonBundle\Entity
+ */
+class PersonCenterCurrent
+{
+    /**
+     * @ORM\ManyToOne(targetEntity=Center::class)
+     */
+    private Center $center;
+
+    /**
+     * @ORM\Column(type="date_immutable", nullable=true, options={"default": null})
+     */
+    private ?DateTimeImmutable $endDate = null;
+
+    /**
+     * @ORM\Id
+     * @ORM\Column(type="integer")
+     */
+    private ?int $id = null;
+
+    /**
+     * @ORM\ManyToOne(targetEntity=Person::class, inversedBy="centerCurrent")
+     */
+    private Person $person;
+
+    /**
+     * @ORM\Column(type="date_immutable", nullable=false)
+     */
+    private DateTimeImmutable $startDate;
+
+    /**
+     * Populate the properties person, center, start and end date from history.
+     *
+     * The creator and updatedby are not filled.
+     *
+     * @internal Should not be instantied, unless inside Person entity
+     */
+    public function __construct(PersonCenterHistory $history)
+    {
+        $this->person = $history->getPerson();
+        $this->center = $history->getCenter();
+        $this->startDate = $history->getStartDate();
+        $this->endDate = $history->getEndDate();
+        $this->id = $history->getId();
+    }
+
+    public function getCenter(): Center
+    {
+        return $this->center;
+    }
+
+    public function getEndDate(): ?DateTimeImmutable
+    {
+        return $this->endDate;
+    }
+
+    /**
+     * The id will be the same as the current @see{PersonCenterHistory::class}.
+     */
+    public function getId(): int
+    {
+        return $this->id;
+    }
+
+    public function getPerson(): Person
+    {
+        return $this->person;
+    }
+
+    public function getStartDate(): DateTimeImmutable
+    {
+        return $this->startDate;
+    }
+}

src/Bundle/ChillPersonBundle/Entity/Person/PersonCenterHistory.php

@@ -0,0 +1,121 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Entity\Person;
+
+use Chill\MainBundle\Doctrine\Model\TrackCreationInterface;
+use Chill\MainBundle\Doctrine\Model\TrackCreationTrait;
+use Chill\MainBundle\Doctrine\Model\TrackUpdateInterface;
+use Chill\MainBundle\Doctrine\Model\TrackUpdateTrait;
+use Chill\MainBundle\Entity\Center;
+use Chill\PersonBundle\Entity\Person;
+use DateTimeImmutable;
+use Doctrine\ORM\Mapping as ORM;
+
+/**
+ * Associate a Person with a Center. The association may change on date intervals.
+ *
+ * @ORM\Entity
+ * @ORM\Table(name="chill_person_person_center_history")
+ */
+class PersonCenterHistory implements TrackCreationInterface, TrackUpdateInterface
+{
+    use TrackCreationTrait;
+
+    use TrackUpdateTrait;
+
+    /**
+     * @ORM\ManyToOne(targetEntity=Center::class)
+     */
+    private ?Center $center = null;
+
+    /**
+     * @ORM\Column(type="date_immutable", nullable=true, options={"default": null})
+     */
+    private ?DateTimeImmutable $endDate = null;
+
+    /**
+     * @ORM\Id
+     * @ORM\GeneratedValue
+     * @ORM\Column(type="integer")
+     */
+    private ?int $id = null;
+
+    /**
+     * @ORM\ManyToOne(targetEntity=Person::class, inversedBy="centerHistory")
+     */
+    private ?Person $person = null;
+
+    /**
+     * @ORM\Column(type="date_immutable", nullable=false)
+     */
+    private ?DateTimeImmutable $startDate = null;
+
+    public function __construct(?Person $person = null, ?Center $center = null, ?DateTimeImmutable $startDate = null)
+    {
+        $this->person = $person;
+        $this->center = $center;
+        $this->startDate = $startDate;
+    }
+
+    public function getCenter(): ?Center
+    {
+        return $this->center;
+    }
+
+    public function getEndDate(): ?DateTimeImmutable
+    {
+        return $this->endDate;
+    }
+
+    public function getId(): ?int
+    {
+        return $this->id;
+    }
+
+    public function getPerson(): ?Person
+    {
+        return $this->person;
+    }
+
+    public function getStartDate(): ?DateTimeImmutable
+    {
+        return $this->startDate;
+    }
+
+    public function setCenter(?Center $center): self
+    {
+        $this->center = $center;
+
+        return $this;
+    }
+
+    public function setEndDate(?DateTimeImmutable $endDate): self
+    {
+        $this->endDate = $endDate;
+
+        return $this;
+    }
+
+    public function setPerson(?Person $person): self
+    {
+        $this->person = $person;
+
+        return $this;
+    }
+
+    public function setStartDate(?DateTimeImmutable $startDate): self
+    {
+        $this->startDate = $startDate;
+
+        return $this;
+    }
+}

src/Bundle/ChillPersonBundle/Entity/SocialWork/Evaluation.php

@@ -49,9 +49,8 @@ class Evaluation
     /**
      * @ORM\ManyToMany(
      *     targetEntity=SocialAction::class,
-     *     inversedBy="evaluations"
+     *     mappedBy="evaluations"
      * )
-     * @ORM\JoinTable(name="chill_person_social_work_evaluation_action")
      */
     private Collection $socialActions;
 

src/Bundle/ChillPersonBundle/Export/AbstractAccompanyingPeriodExportElement.php

@@ -25,23 +25,17 @@ class AbstractAccompanyingPeriodExportElement
      */
     protected function addJoinAccompanyingPeriod(QueryBuilder $query): void
     {
-        if (false === $this->havingAccompanyingPeriodInJoin($query)) {
-            if (false === in_array('person', $query->getAllAliases(), true)) {
-                throw new LogicException("the alias 'person' does not exists in "
-                    . 'query builder');
-            }
+        if (false === in_array('person', $query->getAllAliases(), true)) {
+            throw new LogicException("the alias 'person' does not exists in "
+                . 'query builder');
+        }
 
-            $query->join('person.accompanyingPeriods', 'accompanying_period');
+        if (!in_array('acppart', $query->getAllAliases(), true)) {
+            $query->join('person.accompanyingPeriodParticipations', 'acppart');
+        }
+
+        if (!in_array('acp', $query->getAllAliases(), true)) {
+            $query->join('acppart.accompanyingPeriod', 'acp');
         }
     }
-
-    /**
-     * Return true if "accompanying_period" alias is present in the query alises.
-     */
-    protected function havingAccompanyingPeriodInJoin(QueryBuilder $query): bool
-    {
-        $joins = $query->getDQLPart('join') ?? [];
-
-        return in_array('accompanying_period', $query->getAllAliases(), true);
-    }
 }

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

@@ -17,6 +17,7 @@ use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Chill\PersonBundle\Export\Declarations;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
+use function in_array;
 
 class AdministrativeLocationAggregator implements AggregatorInterface
 {
@@ -40,18 +41,11 @@ class AdministrativeLocationAggregator implements AggregatorInterface
     public function alterQuery(QueryBuilder $qb, $data)
     {
         if (!in_array('acploc', $qb->getAllAliases(), true)) {
-            $qb->join('acp.administrativeLocation', 'acploc');
+            $qb->leftJoin('acp.administrativeLocation', 'acploc');
         }
 
         $qb->addSelect('IDENTITY(acp.administrativeLocation) AS location_aggregator');
-
-        $groupBy = $qb->getDQLPart('groupBy');
-
-        if (!empty($groupBy)) {
-            $qb->addGroupBy('location_aggregator');
-        } else {
-            $qb->groupBy('location_aggregator');
-        }
+        $qb->addGroupBy('location_aggregator');
     }
 
     public function applyOn(): string
@@ -71,6 +65,10 @@ class AdministrativeLocationAggregator implements AggregatorInterface
                 return 'Administrative location';
             }
 
+            if (null === $value) {
+                return '';
+            }
+
             $l = $this->locationRepository->find($value);
 
             return $l->getName() . ' (' . $this->translatableStringHelper->localize($l->getLocationType()->getTitle()) . ')';

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

@@ -13,23 +13,22 @@ namespace Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators;
 
 use Chill\MainBundle\Export\AggregatorInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
-use Chill\PersonBundle\Entity\AccompanyingPeriod\ClosingMotive;
 use Chill\PersonBundle\Export\Declarations;
-use Doctrine\ORM\EntityManagerInterface;
+use Chill\PersonBundle\Repository\AccompanyingPeriod\ClosingMotiveRepositoryInterface;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
 
 class ClosingMotiveAggregator implements AggregatorInterface
 {
-    private EntityManagerInterface $em;
+    private ClosingMotiveRepositoryInterface $motiveRepository;
 
     private TranslatableStringHelper $translatableStringHelper;
 
     public function __construct(
-        EntityManagerInterface $em,
+        ClosingMotiveRepositoryInterface $motiveRepository,
         TranslatableStringHelper $translatableStringHelper
     ) {
-        $this->motiveRepository = $em->getRepository(ClosingMotive::class);
+        $this->motiveRepository = $motiveRepository;
         $this->translatableStringHelper = $translatableStringHelper;
     }
 
@@ -40,19 +39,8 @@ class ClosingMotiveAggregator implements AggregatorInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!in_array('acpmotive', $qb->getAllAliases(), true)) {
-            $qb->join('acp.closingMotive', 'acpmotive');
-        }
-
         $qb->addSelect('IDENTITY(acp.closingMotive) AS closingmotive_aggregator');
-
-        $groupBy = $qb->getDQLPart('groupBy');
-
-        if (!empty($groupBy)) {
-            $qb->addGroupBy('closingmotive_aggregator');
-        } else {
-            $qb->groupBy('closingmotive_aggregator');
-        }
+        $qb->addGroupBy('closingmotive_aggregator');
     }
 
     public function applyOn(): string
@@ -72,6 +60,10 @@ class ClosingMotiveAggregator implements AggregatorInterface
                 return 'Closing motive';
             }
 
+            if (null === $value) {
+                return '';
+            }
+
             $cm = $this->motiveRepository->find($value);
 
             return $this->translatableStringHelper->localize(

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

@@ -35,14 +35,7 @@ class ConfidentialAggregator implements AggregatorInterface
     public function alterQuery(QueryBuilder $qb, $data)
     {
         $qb->addSelect('acp.confidential AS confidential_aggregator');
-
-        $groupBy = $qb->getDQLPart('groupBy');
-
-        if (!empty($groupBy)) {
-            $qb->addGroupBy('confidential_aggregator');
-        } else {
-            $qb->groupBy('confidential_aggregator');
-        }
+        $qb->addGroupBy('confidential_aggregator');
     }
 
     public function applyOn(): string

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

@@ -44,15 +44,8 @@ final class DurationAggregator implements AggregatorInterface
         // et ajouter une fonction custom qui calcule plus précisément les intervals, comme doctrineum/date-interval
         // https://packagist.org/packages/doctrineum/date-interval#3.1.0 (mais composer fait un conflit de dépendance)
 
-        $groupBy = $qb->getDQLPart('groupBy');
-
-        if (!empty($groupBy)) {
-            $qb->addGroupBy('duration_aggregator');
-        } else {
-            $qb->groupBy('duration_aggregator');
-        }
-
-        $qb->orderBy('duration_aggregator');
+        $qb->addGroupBy('duration_aggregator');
+        $qb->addOrderBy('duration_aggregator');
     }
 
     public function applyOn(): string

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

@@ -35,14 +35,7 @@ class EmergencyAggregator implements AggregatorInterface
     public function alterQuery(QueryBuilder $qb, $data)
     {
         $qb->addSelect('acp.emergency AS emergency_aggregator');
-
-        $groupBy = $qb->getDQLPart('groupBy');
-
-        if (!empty($groupBy)) {
-            $qb->addGroupBy('emergency_aggregator');
-        } else {
-            $qb->groupBy('emergency_aggregator');
-        }
+        $qb->addGroupBy('emergency_aggregator');
     }
 
     public function applyOn(): string

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

@@ -41,22 +41,15 @@ final class EvaluationAggregator implements AggregatorInterface
     public function alterQuery(QueryBuilder $qb, $data)
     {
         if (!in_array('acpw', $qb->getAllAliases(), true)) {
-            $qb->join('acp.works', 'acpw');
+            $qb->leftJoin('acp.works', 'acpw');
         }
 
         if (!in_array('workeval', $qb->getAllAliases(), true)) {
-            $qb->join('acpw.accompanyingPeriodWorkEvaluations', 'workeval');
+            $qb->leftJoin('acpw.accompanyingPeriodWorkEvaluations', 'workeval');
         }
 
         $qb->addSelect('IDENTITY(workeval.evaluation) AS evaluation_aggregator');
-
-        $groupby = $qb->getDQLPart('groupBy');
-
-        if (!empty($groupBy)) {
-            $qb->addGroupBy('evaluation_aggregator');
-        } else {
-            $qb->groupBy('evaluation_aggregator');
-        }
+        $qb->addGroupBy('evaluation_aggregator');
     }
 
     public function applyOn(): string
@@ -76,6 +69,10 @@ final class EvaluationAggregator implements AggregatorInterface
                 return 'Evaluation';
             }
 
+            if (null === $value) {
+                return '';
+            }
+
             $e = $this->evaluationRepository->find($value);
 
             return $this->translatableStringHelper->localize(

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

@@ -1,96 +1,185 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators;
 
+use Chill\MainBundle\Entity\Address;
+use Chill\MainBundle\Entity\GeographicalUnit;
+use Chill\MainBundle\Entity\GeographicalUnitLayer;
 use Chill\MainBundle\Export\AggregatorInterface;
+use Chill\MainBundle\Form\Type\ChillDateType;
+use Chill\MainBundle\Repository\GeographicalUnitLayerRepositoryInterface;
+use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
+use Chill\PersonBundle\Entity\Household\PersonHouseholdAddress;
 use Chill\PersonBundle\Export\Declarations;
-use Doctrine\ORM\EntityManagerInterface;
-use Doctrine\ORM\EntityRepository;
+use DateTimeImmutable;
+use Doctrine\ORM\Query\Expr\Join;
 use Doctrine\ORM\QueryBuilder;
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\FormBuilderInterface;
+use UnexpectedValueException;
+use function in_array;
 
 final class GeographicalUnitStatAggregator implements AggregatorInterface
 {
-    /*
-    private EntityRepository $repository;
+    private GeographicalUnitLayerRepositoryInterface $geographicalUnitLayerRepository;
+
+    private TranslatableStringHelperInterface $translatableStringHelper;
 
     public function __construct(
-        EntityManagerInterface $em
+        GeographicalUnitLayerRepositoryInterface $geographicalUnitLayerRepository,
+        TranslatableStringHelperInterface $translatableStringHelper
     ) {
-        $this->repository = $em->getRepository(...::class);
-    }
-    */
-
-    /**
-     * @inheritDoc
-     */
-    public function getLabels($key, array $values, $data)
-    {
-        return function ($value): string {
-            if ('_header' === $value) {
-                return 'Geographical unit';
-            }
-
-            $g = $this->repository->find($value);
-
-            return $g; //...
-        };
+        $this->geographicalUnitLayerRepository = $geographicalUnitLayerRepository;
+        $this->translatableStringHelper = $translatableStringHelper;
     }
 
-    /**
-     * @inheritDoc
-     */
-    public function getQueryKeys($data): array
-    {
-        return ['geographicalunitstat_aggregator'];
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function buildForm(FormBuilderInterface $builder)
-    {
-        // TODO: Implement buildForm() method.
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function getTitle(): string
-    {
-        return 'Group by geographical unit';
-    }
-
-    /**
-     * @inheritDoc
-     */
     public function addRole(): ?string
     {
         return null;
     }
 
-    /**
-     * @inheritDoc
-     */
     public function alterQuery(QueryBuilder $qb, $data)
     {
+        if (!in_array('acp_geog_agg_location_history', $qb->getAllAliases(), true)) {
+            $qb->leftJoin('acp.locationHistories', 'acp_geog_agg_location_history');
 
-        //$qb->addSelect('... AS geographicalunitstat_aggregator');
+            $qb->andWhere(
+                $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'
+                    )
+                )
+            );
 
-        $groupby = $qb->getDQLPart('groupBy');
-
-        if (!empty($groupBy)) {
-            $qb->addGroupBy('geographicalunitstat_aggregator');
-        } else {
-            $qb->groupBy('geographicalunitstat_aggregator');
+            $qb->setParameter('acp_geog_aggregator_date', $data['date_calc']);
         }
+
+        // link between location history and person
+        if (!in_array('acp_geog_agg_address_person_location', $qb->getAllAliases(), true)) {
+            $qb->leftJoin(
+                PersonHouseholdAddress::class,
+                'acp_geog_agg_address_person_location',
+                Join::WITH,
+                $qb->expr()->andX(
+                    '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')
+                    )
+                )
+            );
+
+            $qb->setParameter('acp_geog_aggregator_date', $data['date_calc']);
+        }
+
+        // we finally find an address
+        if (!in_array('acp_geog_agg_address', $qb->getAllAliases(), true)) {
+            $qb->leftJoin(
+                Address::class,
+                'acp_geog_agg_address',
+                Join::WITH,
+                'COALESCE(IDENTITY(acp_geog_agg_address_person_location.address), IDENTITY(acp_geog_agg_location_history.addressLocation)) = acp_geog_agg_address.id'
+            );
+        }
+
+        // and we do a join with units
+        $qb->leftJoin(
+            GeographicalUnit::class,
+            'acp_geog_units',
+            Join::WITH,
+            'ST_CONTAINS(acp_geog_units.geom, acp_geog_agg_address.point) = TRUE'
+        );
+
+        $qb->andWhere($qb->expr()->eq('acp_geog_units.layer', ':acp_geog_unit_layer'));
+
+        $qb->setParameter('acp_geog_unit_layer', $data['level']);
+
+        // we add group by
+        $qb
+            ->addSelect('acp_geog_units.unitName AS acp_geog_agg_unitname')
+            ->addSelect('acp_geog_units.unitRefId AS acp_geog_agg_unitrefid')
+            ->addGroupBy('acp_geog_agg_unitname')
+            ->addGroupBy('acp_geog_agg_unitrefid');
     }
 
-    /**
-     * @inheritDoc
-     */
     public function applyOn(): string
     {
         return Declarations::ACP_TYPE;
     }
-}
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        $builder
+            ->add('date_calc', ChillDateType::class, [
+                'label' => 'Compute geographical location at date',
+                'required' => true,
+                'data' => new DateTimeImmutable('today'),
+                'input' => 'datetime_immutable',
+            ])
+            ->add('level', EntityType::class, [
+                'label' => 'Geographical layer',
+                'placeholder' => 'Select a geographical layer',
+                'class' => GeographicalUnitLayer::class,
+                'choices' => $this->geographicalUnitLayerRepository->findAllHavingUnits(),
+                'choice_label' => function (GeographicalUnitLayer $item) {
+                    return $this->translatableStringHelper->localize($item->getName());
+                },
+            ]);
+    }
+
+    public function getLabels($key, array $values, $data)
+    {
+        switch ($key) {
+            case 'acp_geog_agg_unitname':
+                return static function ($value): string {
+                    if ('_header' === $value) {
+                        return 'acp_geog_agg_unitname';
+                    }
+
+                    if (null === $value) {
+                        return '';
+                    }
+
+                    return $value;
+                };
+
+            case 'acp_geog_agg_unitrefid':
+                return static function ($value): string {
+                    if ('_header' === $value) {
+                        return 'acp_geog_agg_unitrefid';
+                    }
+
+                    if (null === $value) {
+                        return '';
+                    }
+
+                    return $value;
+                };
+
+            default:
+                throw new UnexpectedValueException('this value should not happens');
+        }
+    }
+
+    public function getQueryKeys($data): array
+    {
+        return ['acp_geog_agg_unitname', 'acp_geog_agg_unitrefid'];
+    }
+
+    public function getTitle(): string
+    {
+        return 'Group by geographical unit';
+    }
+}

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

@@ -35,14 +35,7 @@ class IntensityAggregator implements AggregatorInterface
     public function alterQuery(QueryBuilder $qb, $data)
     {
         $qb->addSelect('acp.intensity AS intensity_aggregator');
-
-        $groupBy = $qb->getDQLPart('groupBy');
-
-        if (!empty($groupBy)) {
-            $qb->addGroupBy('intensity_aggregator');
-        } else {
-            $qb->groupBy('intensity_aggregator');
-        }
+        $qb->addGroupBy('intensity_aggregator');
     }
 
     public function applyOn(): string

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

@@ -17,6 +17,7 @@ use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Chill\PersonBundle\Export\Declarations;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
+use function in_array;
 
 final class JobAggregator implements AggregatorInterface
 {
@@ -40,18 +41,11 @@ final class JobAggregator implements AggregatorInterface
     public function alterQuery(QueryBuilder $qb, $data)
     {
         if (!in_array('acpjob', $qb->getAllAliases(), true)) {
-            $qb->join('acp.job', 'acpjob');
+            $qb->leftJoin('acp.job', 'acpjob');
         }
 
         $qb->addSelect('IDENTITY(acp.job) AS job_aggregator');
-
-        $groupBy = $qb->getDQLPart('groupBy');
-
-        if (!empty($groupBy)) {
-            $qb->addGroupBy('job_aggregator');
-        } else {
-            $qb->groupBy('job_aggregator');
-        }
+        $qb->addGroupBy('job_aggregator');
     }
 
     public function applyOn(): string
@@ -71,6 +65,10 @@ final class JobAggregator implements AggregatorInterface
                 return 'Job';
             }
 
+            if (null === $value) {
+                return '';
+            }
+
             $j = $this->jobRepository->find($value);
 
             return $this->translatableStringHelper->localize(

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

@@ -19,6 +19,7 @@ use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
+use function in_array;
 
 final class OriginAggregator implements AggregatorInterface
 {
@@ -42,18 +43,11 @@ final class OriginAggregator implements AggregatorInterface
     public function alterQuery(QueryBuilder $qb, $data)
     {
         if (!in_array('acporigin', $qb->getAllAliases(), true)) {
-            $qb->join('acp.origin', 'acporigin');
+            $qb->leftJoin('acp.origin', 'acporigin');
         }
 
-        $qb->addSelect('o.id AS origin_aggregator');
-
-        $groupby = $qb->getDQLPart('groupBy');
-
-        if (!empty($groupBy)) {
-            $qb->addGroupBy('origin_aggregator');
-        } else {
-            $qb->groupBy('origin_aggregator');
-        }
+        $qb->addSelect('acporigin.id AS origin_aggregator');
+        $qb->addGroupBy('origin_aggregator');
     }
 
     public function applyOn(): string
@@ -73,6 +67,10 @@ final class OriginAggregator implements AggregatorInterface
                 return 'Origin';
             }
 
+            if (null === $value) {
+                return '';
+            }
+
             $o = $this->repository->find($value);
 
             return $this->translatableStringHelper->localize(

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

@@ -17,6 +17,7 @@ use Chill\MainBundle\Templating\Entity\UserRender;
 use Chill\PersonBundle\Export\Declarations;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
+use function in_array;
 
 final class ReferrerAggregator implements AggregatorInterface
 {
@@ -40,18 +41,11 @@ final class ReferrerAggregator implements AggregatorInterface
     public function alterQuery(QueryBuilder $qb, $data)
     {
         if (!in_array('acpuser', $qb->getAllAliases(), true)) {
-            $qb->join('acp.user', 'acpuser');
+            $qb->leftJoin('acp.user', 'acpuser');
         }
 
         $qb->addSelect('acpuser.id AS referrer_aggregator');
-
-        $groupBy = $qb->getDQLPart('groupBy');
-
-        if (!empty($groupBy)) {
-            $qb->addGroupBy('referrer_aggregator');
-        } else {
-            $qb->groupBy('referrer_aggregator');
-        }
+        $qb->addGroupBy('referrer_aggregator');
     }
 
     public function applyOn(): string
@@ -71,6 +65,10 @@ final class ReferrerAggregator implements AggregatorInterface
                 return 'Referrer';
             }
 
+            if (null === $value) {
+                return '';
+            }
+
             $r = $this->userRepository->find($value);
 
             return $this->userRender->renderString($r, []);

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

@@ -0,0 +1,120 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators;
+
+use Chill\MainBundle\Export\AggregatorInterface;
+use Chill\MainBundle\Form\Type\ChillDateType;
+use Chill\MainBundle\Repository\ScopeRepositoryInterface;
+use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
+use Chill\PersonBundle\Export\Declarations;
+use DateTimeImmutable;
+use Doctrine\ORM\QueryBuilder;
+use LogicException;
+use Symfony\Component\Form\FormBuilderInterface;
+
+class ReferrerScopeAggregator implements AggregatorInterface
+{
+    private const SCOPE_KEY = 'acp_agg_refscope_user_history_ref_scope_name';
+
+    private ScopeRepositoryInterface $scopeRepository;
+
+    private TranslatableStringHelperInterface $translatableStringHelper;
+
+    public function __construct(
+        ScopeRepositoryInterface $scopeRepository,
+        TranslatableStringHelperInterface $translatableStringHelper
+    ) {
+        $this->scopeRepository = $scopeRepository;
+        $this->translatableStringHelper = $translatableStringHelper;
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        $userHistory = 'acp_agg_refscope_user_history';
+        $ref = 'acp_agg_refscope_user_history_ref';
+        $scopeName = self::SCOPE_KEY;
+        $dateCalc = 'acp_agg_refscope_user_history_date_calc';
+
+        $qb
+            ->leftJoin('acp.userHistories', $userHistory)
+            ->leftJoin($userHistory . '.user', $ref)
+            ->andWhere(
+                $qb->expr()->orX(
+                    $qb->expr()->isNull($userHistory),
+                    $qb->expr()->andX(
+                        $qb->expr()->lte($userHistory . '.startDate', ':' . $dateCalc),
+                        $qb->expr()->orX(
+                            $qb->expr()->isNull($userHistory . '.endDate'),
+                            $qb->expr()->lt($userHistory . '.endDate', ':' . $dateCalc)
+                        )
+                    )
+                )
+            )
+            ->setParameter($dateCalc, $data['date_calc']);
+
+        // add groups
+        $qb
+            ->addSelect('IDENTITY(' . $ref . '.mainScope) AS ' . $scopeName)
+            ->addGroupBy($scopeName);
+    }
+
+    public function applyOn()
+    {
+        return Declarations::ACP_TYPE;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        $builder->add('date_calc', ChillDateType::class, [
+            'input' => 'datetime_immutable',
+            'data' => new DateTimeImmutable('now'),
+            'label' => 'export.aggregator.course.by_user_scope.Computation date for referrer',
+            'required' => true,
+        ]);
+    }
+
+    public function getLabels($key, array $values, $data)
+    {
+        return function ($value) {
+            if ('_header' === $value) {
+                return 'export.aggregator.course.by_user_scope.Referrer\'s scope';
+            }
+
+            if (null === $value) {
+                return '';
+            }
+
+            $scope = $this->scopeRepository->find($value);
+
+            if (null === $scope) {
+                throw new LogicException('no scope found with this id: ' . $value);
+            }
+
+            return $this->translatableStringHelper->localize($scope->getName());
+        };
+    }
+
+    public function getQueryKeys($data)
+    {
+        return [self::SCOPE_KEY];
+    }
+
+    public function getTitle()
+    {
+        return 'export.aggregator.course.by_user_scope.Group course by referrer\'s scope';
+    }
+}

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

@@ -57,15 +57,7 @@ final class RequestorAggregator implements AggregatorInterface
             END ) AS requestor_aggregator
         ");
 
-        $groupBy = $qb->getDQLPart('groupBy');
-
-        if (!empty($groupBy)) {
-            $qb->addGroupBy('requestor_aggregator');
-        } else {
-            $qb->groupBy('requestor_aggregator');
-        }
-
-        // TODO 'order by' does not works !
+        $qb->addGroupBy('requestor_aggregator');
     }
 
     public function applyOn(): string

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

@@ -17,6 +17,7 @@ use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Chill\PersonBundle\Export\Declarations;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
+use function in_array;
 
 final class ScopeAggregator implements AggregatorInterface
 {
@@ -40,18 +41,11 @@ final class ScopeAggregator implements AggregatorInterface
     public function alterQuery(QueryBuilder $qb, $data)
     {
         if (!in_array('acpscope', $qb->getAllAliases(), true)) {
-            $qb->join('acp.scopes', 'acpscope');
+            $qb->leftJoin('acp.scopes', 'acpscope');
         }
 
         $qb->addSelect('acpscope.id as scope_aggregator');
-
-        $groupBy = $qb->getDQLPart('groupBy');
-
-        if (!empty($groupBy)) {
-            $qb->addGroupBy('scope_aggregator');
-        } else {
-            $qb->groupBy('scope_aggregator');
-        }
+        $qb->addGroupBy('scope_aggregator');
     }
 
     public function applyOn(): string
@@ -71,6 +65,10 @@ final class ScopeAggregator implements AggregatorInterface
                 return 'Scope';
             }
 
+            if (null === $value) {
+                return '';
+            }
+
             $s = $this->scopeRepository->find($value);
 
             return $this->translatableStringHelper->localize(
@@ -86,6 +84,6 @@ final class ScopeAggregator implements AggregatorInterface
 
     public function getTitle(): string
     {
-        return 'Group by user scope';
+        return 'Group course by scope';
     }
 }

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

@@ -41,18 +41,12 @@ final class SocialActionAggregator implements AggregatorInterface
     public function alterQuery(QueryBuilder $qb, $data)
     {
         if (!in_array('acpw', $qb->getAllAliases(), true)) {
+            // here, we will only see accompanying period linked with a socialAction
             $qb->join('acp.works', 'acpw');
         }
 
-        $qb->addSelect('IDENTITY(acpw.socialAction) AS socialaction_aggregator'); // DISTINCT ??
-
-        $groupby = $qb->getDQLPart('groupBy');
-
-        if (!empty($groupBy)) {
-            $qb->addGroupBy('socialaction_aggregator');
-        } else {
-            $qb->groupBy('socialaction_aggregator');
-        }
+        $qb->addSelect('IDENTITY(acpw.socialAction) AS socialaction_aggregator');
+        $qb->addGroupBy('socialaction_aggregator');
     }
 
     public function applyOn(): string
@@ -72,6 +66,10 @@ final class SocialActionAggregator implements AggregatorInterface
                 return 'Social action';
             }
 
+            if (null === $value) {
+                return '';
+            }
+
             $sa = $this->actionRepository->find($value);
 
             return $this->actionRender->renderString($sa, []);

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

@@ -17,6 +17,7 @@ use Chill\PersonBundle\Repository\SocialWork\SocialIssueRepository;
 use Chill\PersonBundle\Templating\Entity\SocialIssueRender;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
+use function in_array;
 
 final class SocialIssueAggregator implements AggregatorInterface
 {
@@ -40,18 +41,12 @@ final class SocialIssueAggregator implements AggregatorInterface
     public function alterQuery(QueryBuilder $qb, $data)
     {
         if (!in_array('acpsocialissue', $qb->getAllAliases(), true)) {
+            // we will see accompanying period linked with social issues
             $qb->join('acp.socialIssues', 'acpsocialissue');
         }
-        
+
         $qb->addSelect('acpsocialissue.id as socialissue_aggregator');
-
-        $groupBy = $qb->getDQLPart('groupBy');
-
-        if (!empty($groupBy)) {
-            $qb->addGroupBy('socialissue_aggregator');
-        } else {
-            $qb->groupBy('socialissue_aggregator');
-        }
+        $qb->addGroupBy('socialissue_aggregator');
     }
 
     public function applyOn(): string

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

@@ -41,15 +41,9 @@ final class StepAggregator implements AggregatorInterface //, FilterInterface
     public function alterQuery(QueryBuilder $qb, $data)
     {
         $qb->addSelect('acp.step AS step_aggregator');
+        $qb->addGroupBy('step_aggregator');
 
-        $groupBy = $qb->getDQLPart('groupBy');
-
-        if (!empty($groupBy)) {
-            $qb->addGroupBy('step_aggregator');
-        } else {
-            $qb->groupBy('step_aggregator');
-        }
-
+        /*
         // add date in where clause
         $where = $qb->getDQLPart('where');
 
@@ -69,6 +63,7 @@ final class StepAggregator implements AggregatorInterface //, FilterInterface
 
         $qb->add('where', $where);
         $qb->setParameter('ondate', $data['on_date'], Types::DATE_MUTABLE);
+         */
     }
 
     public function applyOn(): string

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

@@ -39,15 +39,8 @@ class EvaluationTypeAggregator implements AggregatorInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        $qb->addSelect('IDENTITY(eval.evaluation) AS evaluationtype_aggregator');
-
-        $groupBy = $qb->getDQLPart('groupBy');
-
-        if (!empty($groupBy)) {
-            $qb->addGroupBy('evaluationtype_aggregator');
-        } else {
-            $qb->groupBy('evaluationtype_aggregator');
-        }
+        $qb->addSelect('IDENTITY(workeval.evaluation) AS eval_evaluationtype_aggregator');
+        $qb->addGroupBy('eval_evaluationtype_aggregator');
     }
 
     public function applyOn(): string
@@ -67,6 +60,10 @@ class EvaluationTypeAggregator implements AggregatorInterface
                 return 'Evaluation type';
             }
 
+            if (null === $value) {
+                return '';
+            }
+
             $ev = $this->evaluationRepository->find($value);
 
             return $this->translatableStringHelper->localize($ev->getTitle());
@@ -75,7 +72,7 @@ class EvaluationTypeAggregator implements AggregatorInterface
 
     public function getQueryKeys($data): array
     {
-        return ['evaluationtype_aggregator'];
+        return ['eval_evaluationtype_aggregator'];
     }
 
     public function getTitle(): string

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

@@ -16,7 +16,7 @@ use Chill\MainBundle\Form\Type\ChillDateType;
 use Chill\PersonBundle\Export\Declarations;
 use DateTime;
 use Doctrine\DBAL\Types\Types;
-use Doctrine\ORM\Query\Expr\Andx;
+use Doctrine\ORM\Query\Expr;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
@@ -39,39 +39,23 @@ class ChildrenNumberAggregator implements AggregatorInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!in_array('composition', $qb->getAllAliases(), true)) {
-            $qb->join('household.compositions', 'composition');
+        if (!in_array('composition_children', $qb->getAllAliases(), true)) {
+            $clause = $qb->expr()->andX(
+                $qb->expr()->lte('composition_children.startDate', ':ondate_composition_children'),
+                $qb->expr()->orX(
+                    $qb->expr()->gt('composition_children.endDate', ':ondate_composition_children'),
+                    $qb->expr()->isNull('composition_children.endDate')
+                )
+            );
+
+            $qb->leftJoin('household.compositions', 'composition_children', Expr\Join::WITH, $clause);
         }
 
-        $qb->addSelect('composition.numberOfChildren AS childrennumber_aggregator');
+        $qb
+            ->addSelect('composition_children.numberOfChildren AS childrennumber_aggregator')
+            ->addGroupBy('childrennumber_aggregator');
 
-        $groupBy = $qb->getDQLPart('groupBy');
-
-        if (!empty($groupBy)) {
-            $qb->addGroupBy('childrennumber_aggregator');
-        } else {
-            $qb->groupBy('childrennumber_aggregator');
-        }
-
-        // add date in where clause
-        $where = $qb->getDQLPart('where');
-
-        $clause = $qb->expr()->andX(
-            $qb->expr()->lte('composition.startDate', ':ondate'),
-            $qb->expr()->orX(
-                $qb->expr()->gt('composition.endDate', ':ondate'),
-                $qb->expr()->isNull('composition.endDate')
-            )
-        );
-
-        if ($where instanceof Andx) {
-            $where->add($clause);
-        } else {
-            $where = $qb->expr()->andX($clause);
-        }
-
-        $qb->add('where', $where);
-        $qb->setParameter('ondate', $data['on_date'], Types::DATE_MUTABLE);
+        $qb->setParameter('ondate_composition_children', $data['on_date'], Types::DATE_MUTABLE);
     }
 
     public function applyOn(): string
@@ -88,17 +72,16 @@ class ChildrenNumberAggregator implements AggregatorInterface
 
     public function getLabels($key, array $values, $data)
     {
-        return function ($value): string {
+        return static function ($value): string {
             if ('_header' === $value) {
                 return 'Number of children';
             }
 
-            return $this->translator->trans(
-                'household_composition.numberOfChildren children in household',
-                [
-                    'numberOfChildren' => $value,
-                ]
-            );
+            if (null === $value) {
+                return '';
+            }
+
+            return $value;
         };
     }
 

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

@@ -18,7 +18,7 @@ use Chill\PersonBundle\Export\Declarations;
 use Chill\PersonBundle\Repository\Household\HouseholdCompositionTypeRepository;
 use DateTime;
 use Doctrine\DBAL\Types\Types;
-use Doctrine\ORM\Query\Expr\Andx;
+use Doctrine\ORM\Query\Expr;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
 use function in_array;
@@ -44,39 +44,23 @@ class CompositionAggregator implements AggregatorInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!in_array('composition', $qb->getAllAliases(), true)) {
-            $qb->join('household.compositions', 'composition');
+        if (!in_array('composition_type', $qb->getAllAliases(), true)) {
+            $clause = $qb->expr()->andX(
+                $qb->expr()->lte('composition_type.startDate', ':ondate_composition_type'),
+                $qb->expr()->orX(
+                    $qb->expr()->gt('composition_type.endDate', ':ondate_composition_type'),
+                    $qb->expr()->isNull('composition_type.endDate')
+                )
+            );
+
+            $qb->leftJoin('household.compositions', 'composition_type', Expr\Join::WITH, $clause);
         }
 
-        $qb->addSelect('IDENTITY(composition.householdCompositionType) AS composition_aggregator');
+        $qb
+            ->addSelect('IDENTITY(composition_type.householdCompositionType) AS composition_aggregator')
+            ->addGroupBy('composition_aggregator');
 
-        $groupBy = $qb->getDQLPart('groupBy');
-
-        if (!empty($groupBy)) {
-            $qb->addGroupBy('composition_aggregator');
-        } else {
-            $qb->groupBy('composition_aggregator');
-        }
-
-        // add date in where clause
-        $where = $qb->getDQLPart('where');
-
-        $clause = $qb->expr()->andX(
-            $qb->expr()->lte('composition.startDate', ':ondate'),
-            $qb->expr()->orX(
-                $qb->expr()->gt('composition.endDate', ':ondate'),
-                $qb->expr()->isNull('composition.endDate')
-            )
-        );
-
-        if ($where instanceof Andx) {
-            $where->add($clause);
-        } else {
-            $where = $qb->expr()->andX($clause);
-        }
-
-        $qb->add('where', $where);
-        $qb->setParameter('ondate', $data['on_date'], Types::DATE_MUTABLE);
+        $qb->setParameter('ondate_composition_type', $data['on_date'], Types::DATE_MUTABLE);
     }
 
     public function applyOn(): string
@@ -98,6 +82,10 @@ class CompositionAggregator implements AggregatorInterface
                 return 'Composition';
             }
 
+            if (null === $value) {
+                return '';
+            }
+
             $c = $this->typeRepository->find($value);
 
             return $this->translatableStringHelper->localize(

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

@@ -62,6 +62,9 @@ final class GenderAggregator implements AggregatorInterface
                 case Person::BOTH_GENDER:
                     return $this->translator->trans('both');
 
+                case Person::NO_INFORMATION:
+                    return $this->translator->trans('unknown');
+
                 case null:
                     return $this->translator->trans('Not given');
 

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

@@ -0,0 +1,152 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Export\Aggregator\PersonAggregators;
+
+use Chill\MainBundle\Entity\GeographicalUnit;
+use Chill\MainBundle\Entity\GeographicalUnitLayer;
+use Chill\MainBundle\Export\AggregatorInterface;
+use Chill\MainBundle\Form\Type\ChillDateType;
+use Chill\MainBundle\Repository\GeographicalUnitLayerRepositoryInterface;
+use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
+use Chill\PersonBundle\Export\Declarations;
+use DateTimeImmutable;
+use Doctrine\ORM\Query\Expr\Join;
+use Doctrine\ORM\QueryBuilder;
+use LogicException;
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
+use Symfony\Component\Form\FormBuilderInterface;
+
+class GeographicalUnitAggregator implements AggregatorInterface
+{
+    private GeographicalUnitLayerRepositoryInterface $geographicalUnitLayerRepository;
+
+    private TranslatableStringHelperInterface $translatableStringHelper;
+
+    public function __construct(
+        GeographicalUnitLayerRepositoryInterface $geographicalUnitLayerRepository,
+        TranslatableStringHelperInterface $translatableStringHelper
+    ) {
+        $this->geographicalUnitLayerRepository = $geographicalUnitLayerRepository;
+        $this->translatableStringHelper = $translatableStringHelper;
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data): void
+    {
+        $qb
+            ->leftJoin('person.householdAddresses', 'person_geog_agg_current_household_address')
+            ->leftJoin('person_geog_agg_current_household_address.address', 'person_geog_agg_address')
+            ->leftJoin(GeographicalUnit::class, 'person_geog_agg_geog_unit', Join::WITH, 'ST_CONTAINS(person_geog_agg_geog_unit.geom, person_geog_agg_address.point) = TRUE')
+            ->andWhere(
+                $qb->expr()->orX(
+                    $qb->expr()->isNull('person_geog_agg_current_household_address'),
+                    $qb->expr()->andX(
+                        $qb->expr()->lte('person_geog_agg_current_household_address.validFrom', ':person_geog_agg_date'),
+                        $qb->expr()->orX(
+                            $qb->expr()->isNull('person_geog_agg_current_household_address.validTo'),
+                            $qb->expr()->gt('person_geog_agg_current_household_address.validTo', ':person_geog_agg_date')
+                        )
+                    )
+                )
+            )
+            ->andWhere(
+                $qb->expr()->orX(
+                    $qb->expr()->isNull('person_geog_agg_geog_unit'),
+                    $qb->expr()->in('person_geog_agg_geog_unit.layer', ':person_geog_agg_layers')
+                )
+            )
+            ->setParameter('person_geog_agg_date', $data['date_calc'])
+            ->setParameter('person_geog_agg_layers', $data['level'])
+            ->addSelect('person_geog_agg_geog_unit.unitName AS geog_unit_name')
+            ->addSelect('person_geog_agg_geog_unit.unitRefId AS geog_unit_key')
+            ->addGroupBy('geog_unit_name')
+            ->addGroupBy('geog_unit_key');
+    }
+
+    public function applyOn()
+    {
+        return Declarations::PERSON_TYPE;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        $builder
+            ->add('date_calc', ChillDateType::class, [
+                'label' => 'Address valid at this date',
+                'required' => true,
+                'data' => new DateTimeImmutable('today'),
+                'input' => 'datetime_immutable',
+            ])
+            ->add('level', EntityType::class, [
+                'label' => 'Geographical layer',
+                'placeholder' => 'Select a geographical layer',
+                'class' => GeographicalUnitLayer::class,
+                'choices' => $this->geographicalUnitLayerRepository->findAllHavingUnits(),
+                'choice_label' => function (GeographicalUnitLayer $item) {
+                    return $this->translatableStringHelper->localize($item->getName());
+                },
+            ]);
+    }
+
+    public static function getDefaultAlias(): string
+    {
+        return 'person_geog_agg';
+    }
+
+    public function getLabels($key, array $values, $data)
+    {
+        switch ($key) {
+            case 'geog_unit_name':
+                return static function ($value): string {
+                    if ('_header' === $value) {
+                        return 'acp_geog_agg_unitname';
+                    }
+
+                    if (null === $value) {
+                        return '';
+                    }
+
+                    return $value;
+                };
+
+            case 'geog_unit_key':
+                return static function ($value): string {
+                    if ('_header' === $value) {
+                        return 'acp_geog_agg_unitrefid';
+                    }
+
+                    if (null === $value) {
+                        return '';
+                    }
+
+                    return $value;
+                };
+
+            default:
+                throw new LogicException('key not supported');
+        }
+    }
+
+    public function getQueryKeys($data)
+    {
+        return ['geog_unit_name', 'geog_unit_key'];
+    }
+
+    public function getTitle()
+    {
+        return 'Group people by geographical unit based on his address';
+    }
+}

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

@@ -16,12 +16,15 @@ use Chill\MainBundle\Export\ExportElementValidatedInterface;
 use Chill\MainBundle\Form\Type\ChillDateType;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Chill\PersonBundle\Entity\Household\HouseholdMember;
+use Chill\PersonBundle\Export\Declarations;
 use Chill\PersonBundle\Repository\Household\PositionRepository;
 use DateTime;
+use Doctrine\ORM\Query\Expr;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
+use function in_array;
 
 final class HouseholdPositionAggregator implements AggregatorInterface, ExportElementValidatedInterface
 {
@@ -31,8 +34,11 @@ final class HouseholdPositionAggregator implements AggregatorInterface, ExportEl
 
     private TranslatorInterface $translator;
 
-    public function __construct(TranslatorInterface $translator, TranslatableStringHelper $translatableStringHelper, PositionRepository $positionRepository)
-    {
+    public function __construct(
+        TranslatorInterface $translator,
+        TranslatableStringHelper $translatableStringHelper,
+        PositionRepository $positionRepository
+    ) {
         $this->translator = $translator;
         $this->positionRepository = $positionRepository;
         $this->translatableStringHelper = $translatableStringHelper;
@@ -45,28 +51,25 @@ final class HouseholdPositionAggregator implements AggregatorInterface, ExportEl
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        $qb->resetDQLPart('from');
-        $qb->from(HouseholdMember::class, 'member');
-
-        if (!in_array('memberperson', $qb->getAllAliases(), true)) {
-            $qb->join('member.person', 'memberperson');
+        if (!in_array('householdmember', $qb->getAllAliases(), true)) {
+            $qb->join(HouseholdMember::class, 'householdmember', Expr\Join::WITH, 'householdmember.person = person');
         }
 
-        if (!in_array('membercenter', $qb->getAllAliases(), true)) {
-            $qb->join('memberperson.center', 'membercenter');
+        if (!in_array('center', $qb->getAllAliases(), true)) {
+            $qb->join('person.center', 'center');
         }
 
         $qb->andWhere($qb->expr()->andX(
-            $qb->expr()->lte('member.startDate', ':date'),
+            $qb->expr()->lte('householdmember.startDate', ':date'),
             $qb->expr()->orX(
-                $qb->expr()->isNull('member.endDate'),
-                $qb->expr()->gte('member.endDate', ':date')
+                $qb->expr()->isNull('householdmember.endDate'),
+                $qb->expr()->gte('householdmember.endDate', ':date')
             )
         ));
 
         $qb->setParameter('date', $data['date_position']);
 
-        $qb->addSelect('IDENTITY(member.position) AS household_position_aggregator');
+        $qb->addSelect('IDENTITY(householdmember.position) AS household_position_aggregator');
 
         $groupBy = $qb->getDQLPart('groupBy');
 
@@ -79,7 +82,7 @@ final class HouseholdPositionAggregator implements AggregatorInterface, ExportEl
 
     public function applyOn()
     {
-        return 'person';
+        return Declarations::PERSON_TYPE;
     }
 
     public function buildForm(FormBuilderInterface $builder)

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

@@ -17,6 +17,7 @@ use Chill\PersonBundle\Export\Declarations;
 use Chill\PersonBundle\Repository\MaritalStatusRepository;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
+use function in_array;
 
 final class MaritalStatusAggregator implements AggregatorInterface
 {
@@ -59,6 +60,7 @@ final class MaritalStatusAggregator implements AggregatorInterface
 
     public function buildForm(FormBuilderInterface $builder)
     {
+        // no form
     }
 
     public function getLabels($key, array $values, $data)

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

@@ -17,6 +17,7 @@ use Chill\PersonBundle\Repository\SocialWork\SocialActionRepository;
 use Chill\PersonBundle\Templating\Entity\SocialActionRender;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
+use function in_array;
 
 final class ActionTypeAggregator implements AggregatorInterface
 {
@@ -40,18 +41,11 @@ final class ActionTypeAggregator implements AggregatorInterface
     public function alterQuery(QueryBuilder $qb, $data)
     {
         if (!in_array('acpwsocialaction', $qb->getAllAliases(), true)) {
-            $qb->join('acpw.socialAction', 'acpwsocialaction');
+            $qb->leftJoin('acpw.socialAction', 'acpwsocialaction');
         }
 
         $qb->addSelect('acpwsocialaction.id as action_type_aggregator');
-
-        $groupBy = $qb->getDQLPart('groupBy');
-
-        if (!empty($groupBy)) {
-            $qb->addGroupBy('action_type_aggregator');
-        } else {
-            $qb->groupBy('action_type_aggregator');
-        }
+        $qb->addGroupBy('action_type_aggregator');
     }
 
     public function applyOn()
@@ -71,6 +65,10 @@ final class ActionTypeAggregator implements AggregatorInterface
                 return 'Social Action Type';
             }
 
+            if (null === $value) {
+                return '';
+            }
+
             $sa = $this->socialActionRepository->find($value);
 
             return $this->actionRender->renderString($sa, []);

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

@@ -17,6 +17,7 @@ use Chill\PersonBundle\Export\Declarations;
 use Chill\PersonBundle\Repository\SocialWork\GoalRepository;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
+use function in_array;
 
 final class GoalAggregator implements AggregatorInterface
 {
@@ -38,21 +39,14 @@ final class GoalAggregator implements AggregatorInterface
     public function alterQuery(QueryBuilder $qb, $data)
     {
         if (!in_array('goal', $qb->getAllAliases(), true)) {
-            $qb->join('acpw.goals', 'goal');
+            $qb->leftJoin('acpw.goals', 'goal');
         }
 
-        $qb->addSelect('goal.id as goal_aggregator');
-
-        $groupBy = $qb->getDQLPart('groupBy');
-
-        if (!empty($groupBy)) {
-            $qb->addGroupBy('goal_aggregator');
-        } else {
-            $qb->groupBy('goal_aggregator');
-        }
+        $qb->addSelect('IDENTITY(goal.goal) as acpw_goal_aggregator');
+        $qb->addGroupBy('acpw_goal_aggregator');
     }
 
-    public function applyOn()
+    public function applyOn(): string
     {
         return Declarations::SOCIAL_WORK_ACTION_TYPE;
     }
@@ -69,18 +63,24 @@ final class GoalAggregator implements AggregatorInterface
                 return 'Goal Type';
             }
 
+            if (null === $value) {
+                return '';
+            }
+
             $g = $this->goalRepository->find($value);
 
-            return $this->translatableStringHelper->localize($g->getTitle());
+            return $this->translatableStringHelper->localize(
+                $g->getTitle()
+            );
         };
     }
 
-    public function getQueryKeys($data)
+    public function getQueryKeys($data): array
     {
-        return ['goal_aggregator'];
+        return ['acpw_goal_aggregator'];
     }
 
-    public function getTitle()
+    public function getTitle(): string
     {
         return 'Group social work actions by goal';
     }

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

@@ -0,0 +1,120 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Export\Aggregator\SocialWorkAggregators;
+
+use Chill\MainBundle\Export\AggregatorInterface;
+use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Chill\PersonBundle\Export\Declarations;
+use Chill\PersonBundle\Repository\SocialWork\GoalRepository;
+use Chill\PersonBundle\Repository\SocialWork\ResultRepository;
+use Doctrine\ORM\QueryBuilder;
+use LogicException;
+use Symfony\Component\Form\FormBuilderInterface;
+use function in_array;
+
+class GoalResultAggregator implements AggregatorInterface
+{
+    private GoalRepository $goalRepository;
+
+    private ResultRepository $resultRepository;
+
+    private TranslatableStringHelper $translatableStringHelper;
+
+    public function __construct(
+        ResultRepository $resultRepository,
+        GoalRepository $goalRepository,
+        TranslatableStringHelper $translatableStringHelper
+    ) {
+        $this->resultRepository = $resultRepository;
+        $this->goalRepository = $goalRepository;
+        $this->translatableStringHelper = $translatableStringHelper;
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        if (!in_array('goal', $qb->getAllAliases(), true)) {
+            $qb->leftJoin('acpw.goals', 'goal');
+        }
+
+        if (!in_array('goalresult', $qb->getAllAliases(), true)) {
+            $qb->leftJoin('goal.results', 'goalresult');
+        }
+
+        $qb->addSelect('IDENTITY(goal.goal) as goal_aggregator');
+        $qb->addSelect('goalresult.id as result_aggregator');
+        $qb->addGroupBy('goal_aggregator')->addGroupBy('result_aggregator');
+    }
+
+    public function applyOn(): string
+    {
+        return Declarations::SOCIAL_WORK_ACTION_TYPE;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        // no form
+    }
+
+    public function getLabels($key, array $values, $data)
+    {
+        return function ($value) use ($key): string {
+            if (null === $value) {
+                return '';
+            }
+
+            switch ($key) {
+                case 'goal_aggregator':
+                    if ('_header' === $value) {
+                        return 'Goal Type';
+                    }
+
+                    $g = $this->goalRepository->find($value);
+
+                    return $this->translatableStringHelper->localize(
+                        $g->getTitle()
+                    );
+
+                case 'result_aggregator':
+                    if ('_header' === $value) {
+                        return 'Result Type';
+                    }
+
+                    $r = $this->resultRepository->find($value);
+
+                    return $this->translatableStringHelper->localize(
+                        $r->getTitle()
+                    );
+
+                default:
+                    throw new LogicException();
+            }
+        };
+    }
+
+    public function getQueryKeys($data): array
+    {
+        return [
+            'goal_aggregator',
+            'result_aggregator',
+        ];
+    }
+
+    public function getTitle(): string
+    {
+        return 'Group social work actions by goal and result';
+    }
+}

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

@@ -17,6 +17,7 @@ use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Chill\PersonBundle\Export\Declarations;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
+use function in_array;
 
 final class JobAggregator implements AggregatorInterface
 {
@@ -40,18 +41,11 @@ final class JobAggregator implements AggregatorInterface
     public function alterQuery(QueryBuilder $qb, $data)
     {
         if (!in_array('acpwuser', $qb->getAllAliases(), true)) {
-            $qb->join('acpw.referrers', 'acpwuser');
+            $qb->leftJoin('acpw.referrers', 'acpwuser');
         }
 
-        $qb->addSelect('IDENTITY(acpwuser.userJob) as job_aggregator');
-
-        $groupBy = $qb->getDQLPart('groupBy');
-
-        if (!empty($groupBy)) {
-            $qb->addGroupBy('job_aggregator');
-        } else {
-            $qb->groupBy('job_aggregator');
-        }
+        $qb->addSelect('IDENTITY(acpwuser.userJob) as job_aggregator')
+            ->addGroupBy('job_aggregator');
     }
 
     public function applyOn(): string
@@ -71,6 +65,10 @@ final class JobAggregator implements AggregatorInterface
                 return 'Job';
             }
 
+            if (null === $value) {
+                return '';
+            }
+
             $j = $this->jobRepository->find($value);
 
             return $this->translatableStringHelper->localize(

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

@@ -17,6 +17,7 @@ use Chill\MainBundle\Templating\Entity\UserRender;
 use Chill\PersonBundle\Export\Declarations;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
+use function in_array;
 
 final class ReferrerAggregator implements AggregatorInterface
 {
@@ -40,18 +41,11 @@ final class ReferrerAggregator implements AggregatorInterface
     public function alterQuery(QueryBuilder $qb, $data)
     {
         if (!in_array('acpwuser', $qb->getAllAliases(), true)) {
-            $qb->join('acpw.referrers', 'acpwuser');
+            $qb->leftJoin('acpw.referrers', 'acpwuser');
         }
 
         $qb->addSelect('acpwuser.id AS referrer_aggregator');
-
-        $groupBy = $qb->getDQLPart('groupBy');
-
-        if (!empty($groupBy)) {
-            $qb->addGroupBy('referrer_aggregator');
-        } else {
-            $qb->groupBy('referrer_aggregator');
-        }
+        $qb->addGroupBy('referrer_aggregator');
     }
 
     public function applyOn(): string
@@ -71,6 +65,10 @@ final class ReferrerAggregator implements AggregatorInterface
                 return 'Referrer';
             }
 
+            if (null === $value) {
+                return '';
+            }
+
             $r = $this->userRepository->find($value);
 
             return $this->userRender->renderString($r, []);

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

@@ -17,6 +17,7 @@ use Chill\PersonBundle\Export\Declarations;
 use Chill\PersonBundle\Repository\SocialWork\ResultRepository;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
+use function in_array;
 
 final class ResultAggregator implements AggregatorInterface
 {
@@ -37,30 +38,15 @@ final class ResultAggregator implements AggregatorInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!in_array('acpwresult', $qb->getAllAliases(), true)) {
-            $qb->join('acpw.results', 'acpwresult');
+        if (!in_array('result', $qb->getAllAliases(), true)) {
+            $qb->leftJoin('acpw.results', 'result');
         }
 
-        if (!in_array('goal', $qb->getAllAliases(), true)) {
-            $qb->join('acpw.goals', 'goal');
-        }
-
-        if (!in_array('goalresult', $qb->getAllAliases(), true)) {
-            $qb->join('goal.results', 'goalresult');
-        }
-
-        $qb->addSelect('acpwresult.id, IDENTITY(goal.results) as result_aggregator');
-
-        $groupBy = $qb->getDQLPart('groupBy');
-
-        if (!empty($groupBy)) {
-            $qb->addGroupBy('result_aggregator');
-        } else {
-            $qb->groupBy('result_aggregator');
-        }
+        $qb->addSelect('result.id AS acpw_result_aggregator');
+        $qb->addGroupBy('acpw_result_aggregator');
     }
 
-    public function applyOn()
+    public function applyOn(): string
     {
         return Declarations::SOCIAL_WORK_ACTION_TYPE;
     }
@@ -77,18 +63,24 @@ final class ResultAggregator implements AggregatorInterface
                 return 'Result Type';
             }
 
-            $g = $this->resultRepository->find($value);
+            if (null === $value) {
+                return '';
+            }
 
-            return $this->translatableStringHelper->localize($g->getTitle());
+            $r = $this->resultRepository->find($value);
+
+            return $this->translatableStringHelper->localize(
+                $r->getTitle()
+            );
         };
     }
 
-    public function getQueryKeys($data)
+    public function getQueryKeys($data): array
     {
-        return ['result_aggregator'];
+        return ['acpw_result_aggregator'];
     }
 
-    public function getTitle()
+    public function getTitle(): string
     {
         return 'Group social work actions by result';
     }

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

@@ -17,6 +17,7 @@ use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Chill\PersonBundle\Export\Declarations;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
+use function in_array;
 
 final class ScopeAggregator implements AggregatorInterface
 {
@@ -40,18 +41,11 @@ final class ScopeAggregator implements AggregatorInterface
     public function alterQuery(QueryBuilder $qb, $data)
     {
         if (!in_array('acpwuser', $qb->getAllAliases(), true)) {
-            $qb->join('acpw.referrers', 'acpwuser');
+            $qb->leftJoin('acpw.referrers', 'acpwuser');
         }
 
         $qb->addSelect('IDENTITY(acpwuser.mainScope) as scope_aggregator');
-
-        $groupBy = $qb->getDQLPart('groupBy');
-
-        if (!empty($groupBy)) {
-            $qb->addGroupBy('scope_aggregator');
-        } else {
-            $qb->groupBy('scope_aggregator');
-        }
+        $qb->addGroupBy('scope_aggregator');
     }
 
     public function applyOn(): string
@@ -71,6 +65,10 @@ final class ScopeAggregator implements AggregatorInterface
                 return 'Scope';
             }
 
+            if (null === $value) {
+                return '';
+            }
+
             $s = $this->scopeRepository->find($value);
 
             return $this->translatableStringHelper->localize(

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

@@ -15,6 +15,8 @@ use Chill\MainBundle\Export\ExportInterface;
 use Chill\MainBundle\Export\FormatterInterface;
 use Chill\MainBundle\Export\GroupedExportInterface;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Entity\AccompanyingPeriodParticipation;
+use Chill\PersonBundle\Entity\Person\PersonCenterHistory;
 use Chill\PersonBundle\Export\Declarations;
 use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
 use Doctrine\ORM\EntityManagerInterface;
@@ -90,9 +92,24 @@ class CountAccompanyingCourse implements ExportInterface, GroupedExportInterface
 
     public function initiateQuery(array $requiredModifiers, array $acl, array $data = []): QueryBuilder
     {
+        $centers = array_map(static function ($el) {
+            return $el['center'];
+        }, $acl);
+
         $qb = $this->repository->createQueryBuilder('acp');
 
-        $qb->select('COUNT(acp.id) AS export_result');
+        $qb
+            ->andWhere(
+                $qb->expr()->exists(
+                    'SELECT 1 FROM ' . AccompanyingPeriodParticipation::class . ' acl_count_part
+                    JOIN ' . PersonCenterHistory::class . ' acl_count_person_history WITH IDENTITY(acl_count_person_history.person) = IDENTITY(acl_count_part.person)
+                    WHERE acl_count_part.accompanyingPeriod = acp.id AND acl_count_person_history.center IN (:authorized_centers)
+                    '
+                )
+            )
+            ->setParameter('authorized_centers', $centers);
+
+        $qb->select('COUNT(DISTINCT acp.id) AS export_result');
 
         return $qb;
     }

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

@@ -15,12 +15,15 @@ use Chill\MainBundle\Export\ExportInterface;
 use Chill\MainBundle\Export\FormatterInterface;
 use Chill\MainBundle\Export\GroupedExportInterface;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Entity\AccompanyingPeriodParticipation;
+use Chill\PersonBundle\Entity\Person\PersonCenterHistory;
 use Chill\PersonBundle\Export\Declarations;
 use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\Query;
 use Symfony\Component\Form\FormBuilderInterface;
+use function in_array;
 
 class CountEvaluation implements ExportInterface, GroupedExportInterface
 {
@@ -88,6 +91,10 @@ class CountEvaluation implements ExportInterface, GroupedExportInterface
 
     public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
     {
+        $centers = array_map(static function ($el) {
+            return $el['center'];
+        }, $acl);
+
         $qb = $this->repository->createQueryBuilder('acp');
 
         if (!in_array('acpw', $qb->getAllAliases(), true)) {
@@ -98,7 +105,18 @@ class CountEvaluation implements ExportInterface, GroupedExportInterface
             $qb->join('acpw.accompanyingPeriodWorkEvaluations', 'workeval');
         }
 
-        $qb->select('COUNT(workeval.id) AS export_result');
+        $qb
+            ->andWhere(
+                $qb->expr()->exists(
+                    'SELECT 1 FROM ' . AccompanyingPeriodParticipation::class . ' acl_count_part
+                    JOIN ' . PersonCenterHistory::class . ' acl_count_person_history WITH IDENTITY(acl_count_person_history.person) = IDENTITY(acl_count_part.person)
+                    WHERE acl_count_part.accompanyingPeriod = acp.id AND acl_count_person_history.center IN (:authorized_centers)
+                    '
+                )
+            )
+            ->setParameter('authorized_centers', $centers);
+
+        $qb->select('COUNT(DISTINCT workeval.id) AS export_result');
 
         return $qb;
     }
@@ -112,8 +130,8 @@ class CountEvaluation implements ExportInterface, GroupedExportInterface
     {
         return [
             Declarations::EVAL_TYPE,
-            //Declarations::ACP_TYPE,
-            //Declarations::SOCIAL_WORK_ACTION_TYPE,
+            Declarations::SOCIAL_WORK_ACTION_TYPE,
+            Declarations::ACP_TYPE,
         ];
     }
 }

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

@@ -15,6 +15,9 @@ use Chill\MainBundle\Export\ExportInterface;
 use Chill\MainBundle\Export\FormatterInterface;
 use Chill\MainBundle\Export\GroupedExportInterface;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Entity\AccompanyingPeriodParticipation;
+use Chill\PersonBundle\Entity\Household\HouseholdMember;
+use Chill\PersonBundle\Entity\Person\PersonCenterHistory;
 use Chill\PersonBundle\Export\Declarations;
 use Chill\PersonBundle\Security\Authorization\HouseholdVoter;
 use Doctrine\ORM\EntityManagerInterface;
@@ -88,26 +91,29 @@ class CountHousehold implements ExportInterface, GroupedExportInterface
 
     public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
     {
-        $qb = $this->repository->createQueryBuilder('acp');
+        $centers = array_map(static function ($el) {
+            return $el['center'];
+        }, $acl);
 
-        if (!in_array('acppart', $qb->getAllAliases(), true)) {
-            $qb->join('acp.participations', 'acppart');
-        }
+        $qb = $this->repository
+            ->createQueryBuilder('acp')
+            ->join('acp.participations', 'acppart')
+            // little optimization: we remove joins and make a direct join between participations and household members
+            ->join(HouseholdMember::class, 'member', Query\Expr\Join::WITH, 'IDENTITY(acppart.person) = IDENTITY(member.person)')
+            ->join('member.household', 'household');
 
-        if (!in_array('partperson', $qb->getAllAliases(), true)) {
-            $qb->join('acppart.person', 'partperson');
-        }
+        $qb
+            ->andWhere(
+                $qb->expr()->exists(
+                    'SELECT 1 FROM ' . AccompanyingPeriodParticipation::class . ' acl_count_part
+                    JOIN ' . PersonCenterHistory::class . ' acl_count_person_history WITH IDENTITY(acl_count_person_history.person) = IDENTITY(acl_count_part.person)
+                    WHERE acl_count_part.accompanyingPeriod = acp.id AND acl_count_person_history.center IN (:authorized_centers)
+                    '
+                )
+            )
+            ->setParameter('authorized_centers', $centers);
 
-        if (!in_array('member', $qb->getAllAliases(), true)) {
-            $qb->join('partperson.householdParticipations', 'member');
-        }
-
-        if (!in_array('household', $qb->getAllAliases(), true)) {
-            $qb->join('member.household', 'household');
-        }
-
-
-        $qb->select('COUNT(DISTINCT member.household) AS export_result');
+        $qb->select('COUNT(DISTINCT household.id) AS export_result');
 
         return $qb;
     }
@@ -121,7 +127,7 @@ class CountHousehold implements ExportInterface, GroupedExportInterface
     {
         return [
             Declarations::HOUSEHOLD_TYPE,
-            //Declarations::ACP_TYPE
+            Declarations::ACP_TYPE,
         ];
     }
 }

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

@@ -14,6 +14,7 @@ namespace Chill\PersonBundle\Export\Export;
 use Chill\MainBundle\Export\ExportInterface;
 use Chill\MainBundle\Export\FormatterInterface;
 use Chill\MainBundle\Export\GroupedExportInterface;
+use Chill\PersonBundle\Entity\Person\PersonCenterHistory;
 use Chill\PersonBundle\Export\Declarations;
 use Chill\PersonBundle\Repository\PersonRepository;
 use Chill\PersonBundle\Security\Authorization\PersonVoter;
@@ -100,8 +101,11 @@ class CountPerson implements ExportInterface, GroupedExportInterface
         $qb = $this->personRepository->createQueryBuilder('person');
 
         $qb->select('COUNT(person.id) AS export_result')
-            ->join('person.center', 'center')
-            ->andWhere('center IN (:authorized_centers)')
+            ->andWhere(
+                $qb->expr()->exists(
+                    'SELECT 1 FROM ' . PersonCenterHistory::class . ' pch WHERE pch.person = person.id AND pch.center IN (:authorized_centers)'
+                )
+            )
             ->setParameter('authorized_centers', $centers);
 
         return $qb;

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

@@ -15,12 +15,14 @@ use Chill\MainBundle\Export\ExportInterface;
 use Chill\MainBundle\Export\FormatterInterface;
 use Chill\MainBundle\Export\GroupedExportInterface;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Entity\Person\PersonCenterHistory;
 use Chill\PersonBundle\Export\Declarations;
 use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\Query;
 use Symfony\Component\Form\FormBuilderInterface;
+use function in_array;
 
 class CountPersonWithAccompanyingCourse implements ExportInterface, GroupedExportInterface
 {
@@ -88,6 +90,10 @@ class CountPersonWithAccompanyingCourse implements ExportInterface, GroupedExpor
 
     public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
     {
+        $centers = array_map(static function ($el) {
+            return $el['center'];
+        }, $acl);
+
         $qb = $this->repository->createQueryBuilder('acp');
 
         if (!in_array('acppart', $qb->getAllAliases(), true)) {
@@ -95,10 +101,16 @@ class CountPersonWithAccompanyingCourse implements ExportInterface, GroupedExpor
         }
 
         if (!in_array('partperson', $qb->getAllAliases(), true)) {
-            $qb->join('acppart.person', 'partperson');
+            $qb->join('acppart.person', 'person');
         }
 
-        $qb->select('COUNT(DISTINCT partperson.id) AS export_result');
+        $qb->andWhere(
+            $qb->expr()->exists(
+                'SELECT 1 FROM ' . PersonCenterHistory::class . ' pch WHERE pch.person = person.id AND pch.center IN (:authorized_centers)'
+            )
+        )->setParameter('authorized_centers', $centers);
+
+        $qb->select('COUNT(DISTINCT person.id) AS export_result');
 
         return $qb;
     }
@@ -111,8 +123,8 @@ class CountPersonWithAccompanyingCourse implements ExportInterface, GroupedExpor
     public function supportsModifiers(): array
     {
         return [
-            Declarations::ACP_TYPE,
             Declarations::PERSON_TYPE,
+            Declarations::ACP_TYPE,
         ];
     }
 }

src/Bundle/ChillPersonBundle/Export/Export/CountSocialWorkActions.php

@@ -15,6 +15,8 @@ use Chill\MainBundle\Export\ExportInterface;
 use Chill\MainBundle\Export\FormatterInterface;
 use Chill\MainBundle\Export\GroupedExportInterface;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Entity\AccompanyingPeriodParticipation;
+use Chill\PersonBundle\Entity\Person\PersonCenterHistory;
 use Chill\PersonBundle\Export\Declarations;
 use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
 use Doctrine\ORM\EntityManagerInterface;
@@ -90,13 +92,25 @@ class CountSocialWorkActions implements ExportInterface, GroupedExportInterface
 
     public function initiateQuery(array $requiredModifiers, array $acl, array $data = []): QueryBuilder
     {
-        $qb = $this->repository->createQueryBuilder('acp');
+        $centers = array_map(static function ($el) {
+            return $el['center'];
+        }, $acl);
 
-        if (!in_array('acpw', $qb->getAllAliases(), true)) {
-            $qb->join('acp.works', 'acpw');
-        }
+        $qb = $this->repository->createQueryBuilder('acp')
+            ->join('acp.works', 'acpw');
 
-        $qb->select('COUNT(acpw.id) as export_result');
+        $qb
+            ->andWhere(
+                $qb->expr()->exists(
+                    'SELECT 1 FROM ' . AccompanyingPeriodParticipation::class . ' acl_count_part
+                    JOIN ' . PersonCenterHistory::class . ' acl_count_person_history WITH IDENTITY(acl_count_person_history.person) = IDENTITY(acl_count_part.person)
+                    WHERE acl_count_part.accompanyingPeriod = acp.id AND acl_count_person_history.center IN (:authorized_centers)
+                    '
+                )
+            )
+            ->setParameter('authorized_centers', $centers);
+
+        $qb->select('COUNT(DISTINCT acpw.id) as export_result');
 
         return $qb;
     }
@@ -110,6 +124,7 @@ class CountSocialWorkActions implements ExportInterface, GroupedExportInterface
     {
         return [
             Declarations::SOCIAL_WORK_ACTION_TYPE,
+            Declarations::ACP_TYPE,
         ];
     }
 }

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

@@ -24,7 +24,6 @@ use Symfony\Component\HttpFoundation\BinaryFileResponse;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\ResponseHeaderBag;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
-use Symfony\Component\Security\Core\Role\Role;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
 

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

@@ -16,6 +16,8 @@ use Chill\MainBundle\Export\FormatterInterface;
 use Chill\MainBundle\Export\GroupedExportInterface;
 use Chill\MainBundle\Form\Type\ChillDateType;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Entity\AccompanyingPeriodParticipation;
+use Chill\PersonBundle\Entity\Person\PersonCenterHistory;
 use Chill\PersonBundle\Export\Declarations;
 use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
 use DateTime;
@@ -94,15 +96,26 @@ class StatAccompanyingCourseDuration implements ExportInterface, GroupedExportIn
 
     public function initiateQuery(array $requiredModifiers, array $acl, array $data = []): QueryBuilder
     {
+        $centers = array_map(static function ($el) {
+            return $el['center'];
+        }, $acl);
+
         $qb = $this->repository->createQueryBuilder('acp');
 
+        $qb
+            ->andWhere(
+                $qb->expr()->exists(
+                    'SELECT 1 FROM ' . AccompanyingPeriodParticipation::class . ' acl_count_part
+                    JOIN ' . PersonCenterHistory::class . ' acl_count_person_history WITH IDENTITY(acl_count_person_history.person) = IDENTITY(acl_count_part.person)
+                    WHERE acl_count_part.accompanyingPeriod = acp.id AND acl_count_person_history.center IN (:authorized_centers)
+                    '
+                )
+            )
+            ->setParameter('authorized_centers', $centers);
+
         $qb
             ->select('AVG(
-                ( CASE
-                    WHEN acp.closingDate IS NOT NULL
-                    THEN acp.closingDate
-                    ELSE :force_closingDate
-                END ) - acp.openingDate
+                COALESCE(acp.closingDate, :force_closingDate) - acp.openingDate
             ) AS export_result')
             ->setParameter('force_closingDate', $data['closingdate']);
 

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

@@ -16,7 +16,6 @@ use Chill\MainBundle\Form\Type\ChillDateType;
 use Chill\PersonBundle\Export\Declarations;
 use DateTime;
 use Doctrine\DBAL\Types\Types;
-use Doctrine\ORM\Query\Expr\Andx;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
 
@@ -29,24 +28,9 @@ class ActiveOneDayBetweenDatesFilter implements FilterInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        $where = $qb->getDQLPart('where');
+        $clause = "OVERLAPSI (acp.openingDate, acp.closingDate), (:datefrom, :dateto) = 'TRUE'";
 
-        $clause = $qb->expr()->orX(
-            $qb->expr()->lt('(acp.openingDate + 1)', ':dateto'),
-            $qb->expr()->andX(
-                $qb->expr()->lt('acp.openingDate', ':datefrom'),
-                $qb->expr()->isNull('acp.closingDate')
-            ),
-            $qb->expr()->gt('(acp.closingDate - 1)', ':datefrom')
-        );
-
-        if ($where instanceof Andx) {
-            $where->add($clause);
-        } else {
-            $where = $qb->expr()->andX($clause);
-        }
-
-        $qb->add('where', $where);
+        $qb->andWhere($clause);
         $qb->setParameter('datefrom', $data['date_from'], Types::DATE_MUTABLE);
         $qb->setParameter('dateto', $data['date_to'], Types::DATE_MUTABLE);
     }

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

@@ -1,103 +0,0 @@
-<?php
-
-/**
- * Chill is a software for social workers
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-declare(strict_types=1);
-
-namespace Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters;
-
-use Chill\ActivityBundle\Entity\ActivityType;
-use Chill\MainBundle\Export\FilterInterface;
-use Chill\MainBundle\Templating\TranslatableStringHelper;
-use Chill\PersonBundle\Export\Declarations;
-use Doctrine\ORM\Query\Expr\Andx;
-use Doctrine\ORM\QueryBuilder;
-use Symfony\Bridge\Doctrine\Form\Type\EntityType;
-use Symfony\Component\Form\FormBuilderInterface;
-
-/**
- * TODO merge with ActivityTypeFilter in ChillActivity (!?).
- */
-class ActivityTypeFilter implements FilterInterface
-{
-    private TranslatableStringHelper $translatableStringHelper;
-
-    public function __construct(TranslatableStringHelper $translatableStringHelper)
-    {
-        $this->translatableStringHelper = $translatableStringHelper;
-    }
-
-    public function addRole(): ?string
-    {
-        return null;
-    }
-
-    public function alterQuery(QueryBuilder $qb, $data)
-    {
-        // One2many between activity and accompanyingperiod is not reversed !
-        // we replace indicator 'from' clause by 'act', and put 'acp' in a join
-
-        $qb->resetDQLPart('from');
-        $qb->from('ChillActivityBundle:Activity', 'activity');
-
-        if (!in_array('actacp', $qb->getAllAliases(), true)) {
-            $qb->join('activity.accompanyingPeriod', 'actacp');
-        }
-
-        if (!in_array('acttype', $qb->getAllAliases(), true)) {
-            $qb->join('activity.activityType', 'acttype');
-        }
-
-        $where = $qb->getDQLPart('where');
-        $clause = $qb->expr()->in('acttype.id', ':activitytypes');
-
-        if ($where instanceof Andx) {
-            $where->add($clause);
-        } else {
-            $where = $qb->expr()->andX($clause);
-        }
-
-        $qb->add('where', $where);
-        $qb->setParameter('activitytypes', $data['accepted_activitytypes']);
-    }
-
-    public function applyOn()
-    {
-        return Declarations::ACP_TYPE;
-    }
-
-    public function buildForm(FormBuilderInterface $builder)
-    {
-        $builder->add('accepted_activitytypes', EntityType::class, [
-            'class' => ActivityType::class,
-            'choice_label' => function (ActivityType $aty) {
-                return $this->translatableStringHelper->localize($aty->getName());
-            },
-            'multiple' => true,
-            'expanded' => true,
-        ]);
-    }
-
-    public function describeAction($data, $format = 'string'): array
-    {
-        $types = [];
-
-        foreach ($data['accepted_activitytypes'] as $aty) {
-            $types[] = $this->translatableStringHelper->localize($aty->getName());
-        }
-
-        return ['Filtered by activity types: only %activitytypes%', [
-            '%activitytypes%' => implode(', ou ', $types),
-        ]];
-    }
-
-    public function getTitle(): string
-    {
-        return 'Filter accompanying course by activity type';
-    }
-}

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

@@ -20,6 +20,7 @@ use Doctrine\ORM\Query\Expr\Andx;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Security\Core\Security;
+use function in_array;
 
 class CurrentUserScopeFilter implements FilterInterface
 {

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

@@ -19,6 +19,7 @@ use Doctrine\ORM\Query\Expr\Andx;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\FormBuilderInterface;
+use function in_array;
 
 class EvaluationFilter implements FilterInterface
 {

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

@@ -11,29 +11,42 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters;
 
+use Chill\MainBundle\Entity\Address;
 use Chill\MainBundle\Entity\GeographicalUnit;
 use Chill\MainBundle\Export\FilterInterface;
 use Chill\MainBundle\Form\Type\ChillDateType;
+use Chill\MainBundle\Repository\GeographicalUnitRepositoryInterface;
+use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Entity\Household\PersonHouseholdAddress;
 use Chill\PersonBundle\Export\Declarations;
-use DateTime;
-use Doctrine\DBAL\Types\Types;
-use Doctrine\ORM\Query\Expr\Andx;
+use DateTimeImmutable;
+use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\FormBuilderInterface;
 
 /**
- * e) par zone géographique.
- *
- *   Paramètre:
- *    * Date
- *    * Choix unique entre: territoire, epci, canton, commune, secteur d'intervention
- *    * une fois le premier choix effectué, l'utilisateur choisi parmi les zones (choix multiple)
- *
- *   Le filtre retiendra les parcours localisé dans un des territoires cochés, à la date indiquée en paramètre.
+ * Filter accompanying period by geographical zone.
  */
 class GeographicalUnitStatFilter implements FilterInterface
 {
+    private EntityManagerInterface $em;
+
+    private GeographicalUnitRepositoryInterface $geographicalUnitRepository;
+
+    private TranslatableStringHelperInterface $translatableStringHelper;
+
+    public function __construct(
+        EntityManagerInterface $em,
+        GeographicalUnitRepositoryInterface $geographicalUnitRepository,
+        TranslatableStringHelperInterface $translatableStringHelper
+    ) {
+        $this->em = $em;
+        $this->geographicalUnitRepository = $geographicalUnitRepository;
+        $this->translatableStringHelper = $translatableStringHelper;
+    }
+
     public function addRole(): ?string
     {
         return null;
@@ -41,18 +54,31 @@ class GeographicalUnitStatFilter implements FilterInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        $where = $qb->getDQLPart('where');
-        $clause = $qb->expr()->eq(1, 1);
+        $subQueryDql =
+            'SELECT
+                1
+            FROM ' . AccompanyingPeriod\AccompanyingPeriodLocationHistory::class . ' acp_geog_filter_location_history
+            LEFT JOIN ' . PersonHouseholdAddress::class . ' acp_geog_filter_address_person_location
+                WITH IDENTITY(acp_geog_filter_location_history.personLocation) = IDENTITY(acp_geog_filter_address_person_location.person)
+            LEFT JOIN ' . Address::class . ' acp_geog_filter_address
+                WITH COALESCE(IDENTITY(acp_geog_filter_address_person_location.address), IDENTITY(acp_geog_filter_location_history.addressLocation)) = acp_geog_filter_address.id
+            LEFT JOIN ' . GeographicalUnit::class . ' acp_geog_filter_units WITH ST_CONTAINS(acp_geog_units.geom, acp_geog_filter_address.point) = TRUE
+            WHERE
+                (acp_geog_filter_location_history.startDate <= :acp_geog_filter_date AND (
+                    acp_geog_filter_location_history.endDate IS NULL OR acp_geog_filter_location_history.endDate < :acp_geog_filter_date
+                ))
+                AND
+                (acp_geog_filter_address_person_location.validFrom < :acp_geog_filter_date AND (
+                    acp_geog_filter_address_person_location.validTo IS NULL OR acp_geog_filter_address_person_location.validTo < :acp_geog_filter_date
+                ))
+                AND acp_geog_filter_units IN (:acp_geog_filter_units)
+                AND acp_geog_filter_location_history.period = acp.id
+            ';
 
-        if ($where instanceof Andx) {
-            $where->add($clause);
-        } else {
-            $where = $qb->expr()->andX($clause);
-        }
-
-        $qb->add('where', $where);
-        $qb->setParameter('date', $data['date'], Types::DATE_MUTABLE);
-        $qb->setParameter('loctype', $data['accepted_loctype']);
+        $qb
+            ->andWhere($qb->expr()->exists($subQueryDql))
+            ->setParameter('acp_geog_filter_date', $data['date_calc'])
+            ->setParameter('acp_geog_filter_units', $data['units']);
     }
 
     public function applyOn(): string
@@ -63,23 +89,40 @@ class GeographicalUnitStatFilter implements FilterInterface
     public function buildForm(FormBuilderInterface $builder)
     {
         $builder
-            ->add('date', ChillDateType::class, [
-                'data' => new DateTime(),
+            ->add('date_calc', ChillDateType::class, [
+                'label' => 'Compute geographical location at date',
+                'required' => true,
+                'data' => new DateTimeImmutable('today'),
+                'input' => 'datetime_immutable',
             ])
-            ->add('accepted_loctype', EntityType::class, [
+            ->add('units', EntityType::class, [
+                'label' => 'Geographical unit',
+                'placeholder' => 'Select a geographical unit',
                 'class' => GeographicalUnit::class,
-                'choice_label' => static function (GeographicalUnit $u) {
-                    return $u->getUnitName();
+                'choices' => $this->geographicalUnitRepository->findAll(),
+                'choice_label' => function (GeographicalUnit $item) {
+                    return $this->translatableStringHelper->localize($item->getLayer()->getName()) . ' > ' . $item->getUnitName();
                 },
+                'attr' => [
+                    'class' => 'select2',
+                ],
                 'multiple' => true,
-                'expanded' => true,
             ]);
     }
 
     public function describeAction($data, $format = 'string'): array
     {
-        return ['Filtered by geographic unit: only %date%', [
-            '%date%' => $data['date']->format('d-m-Y'),
+        return ['Filtered by geographic unit: computed at %date%, only in %units%', [
+            '%date%' => $data['date_calc']->format('d-m-Y'),
+            '%units' => implode(
+                ', ',
+                array_map(
+                    function (GeographicalUnit $item) {
+                        return $this->translatableStringHelper->localize($item->getLayer()->getName()) . ' > ' . $item->getUnitName();
+                    },
+                    $data['units']
+                )
+            ),
         ]];
     }
 

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

@@ -16,7 +16,6 @@ use Chill\MainBundle\Form\Type\ChillDateType;
 use Chill\PersonBundle\Export\Declarations;
 use DateTime;
 use Doctrine\DBAL\Types\Types;
-use Doctrine\ORM\Query\Expr\Andx;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
 
@@ -29,20 +28,12 @@ class OpenBetweenDatesFilter implements FilterInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        $where = $qb->getDQLPart('where');
-
         $clause = $qb->expr()->andX(
-            $qb->expr()->lt('acp.openingDate', ':datefrom'),
-            $qb->expr()->gt('acp.closingDate', ':dateto')
+            $qb->expr()->gte('acp.openingDate', ':datefrom'),
+            $qb->expr()->lte('acp.openingDate', ':dateto')
         );
 
-        if ($where instanceof Andx) {
-            $where->add($clause);
-        } else {
-            $where = $qb->expr()->andX($clause);
-        }
-
-        $qb->add('where', $where);
+        $qb->andWhere($clause);
         $qb->setParameter('datefrom', $data['date_from'], Types::DATE_MUTABLE);
         $qb->setParameter('dateto', $data['date_to'], Types::DATE_MUTABLE);
     }

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

@@ -20,6 +20,7 @@ use Exception;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
+use function in_array;
 
 final class RequestorFilter implements FilterInterface
 {
@@ -55,7 +56,6 @@ final class RequestorFilter implements FilterInterface
 
         switch ($data['accepted_choices']) {
             case 'participation':
-
                 if (!in_array('acppart', $qb->getAllAliases(), true)) {
                     $qb->join('acp.participations', 'acppart');
                 }
@@ -70,10 +70,6 @@ final class RequestorFilter implements FilterInterface
             case 'other_person':
                 $expr = $this->em->getExpressionBuilder();
 
-                if (!in_array('acppart', $qb->getAllAliases(), true)) {
-                    $qb->join('acp.participations', 'acppart');
-                }
-
                 $clause = $expr->andX(
                     $expr->isNotNull('acp.requestorPerson'),
                     $expr->notIn(
@@ -85,6 +81,7 @@ final class RequestorFilter implements FilterInterface
                             ->join('acp2.participations', 'acppart2')
                             ->select('identity(acp2.requestorPerson)')
                             ->where($expr->eq('acp2.requestorPerson', 'acppart2.person'))
+                            ->andWhere('acp2.id = acp.id')
                             ->getDQL()
                     )
                 );

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

@@ -21,6 +21,7 @@ use Doctrine\ORM\QueryBuilder;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
+use function in_array;
 
 class SocialIssueFilter implements FilterInterface
 {

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

@@ -18,7 +18,7 @@ use Chill\PersonBundle\Entity\Household\HouseholdCompositionType;
 use Chill\PersonBundle\Export\Declarations;
 use DateTime;
 use Doctrine\DBAL\Types\Types;
-use Doctrine\ORM\Query\Expr\Andx;
+use Doctrine\ORM\Query\Expr;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\FormBuilderInterface;
@@ -41,32 +41,24 @@ class CompositionFilter implements FilterInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!in_array('composition', $qb->getAllAliases(), true)) {
-            $qb->join('household.compositions', 'composition');
+        if (!in_array('composition_type_filter', $qb->getAllAliases(), true)) {
+            $clause =
+                $qb->expr()->andX(
+                    $qb->expr()->lte('composition_type_filter.startDate', ':ondate_composition_type_filter'),
+                    $qb->expr()->orX(
+                        $qb->expr()->gt('composition_type_filter.endDate', ':ondate_composition_type_filter'),
+                        $qb->expr()->isNull('composition_type_filter.endDate')
+                    )
+                );
+
+            $qb->join('household.compositions', 'composition', Expr\Join::WITH, $clause);
         }
 
-        $where = $qb->getDQLPart('where');
+        $whereClause = $qb->expr()->in('composition_type_filter.householdCompositionType', ':compositions');
 
-        $clause = $qb->expr()->andX(
-            $qb->expr()->in('composition.householdCompositionType', ':compositions'),
-            $qb->expr()->andX(
-                $qb->expr()->lte('composition.startDate', ':ondate'),
-                $qb->expr()->orX(
-                    $qb->expr()->gt('composition.endDate', ':ondate'),
-                    $qb->expr()->isNull('composition.endDate')
-                )
-            )
-        );
-
-        if ($where instanceof Andx) {
-            $where->add($clause);
-        } else {
-            $where = $qb->expr()->andX($clause);
-        }
-
-        $qb->add('where', $where);
+        $qb->andWhere($whereClause);
         $qb->setParameter('compositions', $data['accepted_composition']);
-        $qb->setParameter('ondate', $data['on_date'], Types::DATE_MUTABLE);
+        $qb->setParameter('ondate_composition_type_filter', $data['on_date'], Types::DATE_MUTABLE);
     }
 
     public function applyOn(): string

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

@@ -32,8 +32,8 @@ class AccompanyingPeriodClosingFilter extends AbstractAccompanyingPeriodExportEl
         $this->addJoinAccompanyingPeriod($qb);
 
         $clause = $qb->expr()->andX(
-            $qb->expr()->lte('accompanying_period.closingDate', ':date_to'),
-            $qb->expr()->gte('accompanying_period.closingDate', ':date_from')
+            $qb->expr()->lte('acp.closingDate', ':date_to'),
+            $qb->expr()->gte('acp.closingDate', ':date_from')
         );
 
         $qb->andWhere($clause);

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

@@ -34,12 +34,12 @@ class AccompanyingPeriodFilter extends AbstractAccompanyingPeriodExportElement i
         $clause = $qb->expr()->andX();
 
         $clause->add(
-            $qb->expr()->lte('accompanying_period.openingDate', ':date_to')
+            $qb->expr()->lte('acp.openingDate', ':date_to')
         );
         $clause->add(
             $qb->expr()->orX(
-                $qb->expr()->gte('accompanying_period.closingDate', ':date_from'),
-                $qb->expr()->isNull('accompanying_period.closingDate')
+                $qb->expr()->gte('acp.closingDate', ':date_from'),
+                $qb->expr()->isNull('acp.closingDate')
             )
         );
 

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

@@ -32,8 +32,8 @@ class AccompanyingPeriodOpeningFilter extends AbstractAccompanyingPeriodExportEl
         $this->addJoinAccompanyingPeriod($qb);
 
         $clause = $qb->expr()->andX(
-            $qb->expr()->lte('accompanying_period.openingDate', ':date_to'),
-            $qb->expr()->gte('accompanying_period.openingDate', ':date_from')
+            $qb->expr()->lte('acp.openingDate', ':date_to'),
+            $qb->expr()->gte('acp.openingDate', ':date_from')
         );
 
         $qb->andWhere($clause);

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

@@ -15,7 +15,8 @@ use Chill\MainBundle\Export\ExportElementValidatedInterface;
 use Chill\MainBundle\Export\FilterInterface;
 use Chill\MainBundle\Form\Type\ChillDateType;
 use Chill\PersonBundle\Export\Declarations;
-use DateTime;
+use DateInterval;
+use DateTimeImmutable;
 use Doctrine\ORM\Query\Expr;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\Extension\Core\Type\IntegerType;
@@ -34,17 +35,20 @@ class AgeFilter implements ExportElementValidatedInterface, FilterInterface
         $where = $qb->getDQLPart('where');
 
         $min = null !== $data['min_age'] ? $data['min_age'] : 0;
-        $max = null !== $data['max_age'] ? $data['max_age'] : 200;
+        $max = null !== $data['max_age'] ? $data['max_age'] : 3000;
         $calc = $data['date_calc'];
 
+        $minDate = $calc->sub(new DateInterval('P' . $max . 'Y'));
+        $maxDate = $calc->sub(new DateInterval('P' . $min . 'Y'));
+
         $clause = $qb->expr()->andX(
             $qb->expr()->gte(
-                'DATE_DIFF(:calc_date, person.birthdate)/365',
-                ':min_age'
+                'person.birthdate',
+                ':min_date'
             ),
             $qb->expr()->lte(
-                'DATE_DIFF(:calc_date, person.birthdate)/365',
-                ':max_age'
+                'person.birthdate',
+                ':max_date'
             )
         );
 
@@ -55,9 +59,8 @@ class AgeFilter implements ExportElementValidatedInterface, FilterInterface
         }
 
         $qb->add('where', $where);
-        $qb->setParameter('min_age', $min);
-        $qb->setParameter('max_age', $max);
-        $qb->setParameter('calc_date', $calc);
+        $qb->setParameter('min_date', $minDate);
+        $qb->setParameter('max_date', $maxDate);
     }
 
     public function applyOn()
@@ -77,7 +80,8 @@ class AgeFilter implements ExportElementValidatedInterface, FilterInterface
 
         $builder->add('date_calc', ChillDateType::class, [
             'label' => 'Calculate age in relation to this date',
-            'data' => new DateTime('now'),
+            'data' => new DateTimeImmutable('now'),
+            'input' => 'datetime_immutable',
         ]);
     }
 

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

@@ -39,10 +39,10 @@ class DeadOrAliveFilter implements FilterInterface
                 $qb->expr()->andX(
                     $qb->expr()->isNull('person.deathdate'),
                     $qb->expr()->lte(
-                       'person.birthdate',
-                       ':date_calc'
-                   )
-                ),
+                        'person.birthdate',
+                        ':date_calc'
+                    )
+               ),
                 $qb->expr()->andX(
                     $qb->expr()->isNotNull('person.deathdate'),
                     $qb->expr()->gt(
@@ -108,6 +108,6 @@ class DeadOrAliveFilter implements FilterInterface
 
     public function getTitle()
     {
-        return 'Filtered by person\'s that are alive or have deceased at a certain date';
+        return "Filter by person's that are alive or have deceased at a certain date";
     }
 }

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

@@ -0,0 +1,123 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Export\Filter\PersonFilters;
+
+use Chill\MainBundle\Entity\GeographicalUnit;
+use Chill\MainBundle\Form\Type\ChillDateType;
+use Chill\MainBundle\Repository\GeographicalUnitRepositoryInterface;
+use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
+use Chill\PersonBundle\Entity\Household\PersonHouseholdAddress;
+use Chill\PersonBundle\Export\Declarations;
+use DateTimeImmutable;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
+use Symfony\Component\Form\FormBuilderInterface;
+
+class GeographicalUnitFilter implements \Chill\MainBundle\Export\FilterInterface
+{
+    private GeographicalUnitRepositoryInterface $geographicalUnitRepository;
+
+    private TranslatableStringHelperInterface $translatableStringHelper;
+
+    public function __construct(
+        GeographicalUnitRepositoryInterface $geographicalUnitRepository,
+        TranslatableStringHelperInterface $translatableStringHelper
+    ) {
+        $this->geographicalUnitRepository = $geographicalUnitRepository;
+        $this->translatableStringHelper = $translatableStringHelper;
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        $subQuery =
+            'SELECT 1
+            FROM ' . PersonHouseholdAddress::class . ' person_filter_geog_person_household_address
+            JOIN person_filter_geog_person_household_address.address person_filter_geog_address
+            JOIN ' . GeographicalUnit::class . ' person_filter_geog_unit
+                WITH ST_CONTAINS(person_filter_geog_unit.geom, person_filter_geog_address.point) = TRUE
+            WHERE
+                person_filter_geog_person_household_address.validFrom <= :person_filter_geog_date
+                AND
+                    (person_filter_geog_person_household_address.validTo IS NULL
+                    OR person_filter_geog_person_household_address.validTo > :person_filter_geog_date)
+                AND
+                    person_filter_geog_unit IN (:person_filter_geog_units)
+                AND
+                    person_filter_geog_person_household_address.person = person
+            ';
+
+        $qb
+            ->andWhere(
+                $qb->expr()->exists($subQuery)
+            )
+            ->setParameter('person_filter_geog_date', $data['date_calc'])
+            ->setParameter('person_filter_geog_units', $data['units']);
+    }
+
+    public function applyOn()
+    {
+        return Declarations::PERSON_TYPE;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        $builder
+            ->add('date_calc', ChillDateType::class, [
+                'label' => 'Compute geographical location at date',
+                'required' => true,
+                'data' => new DateTimeImmutable('today'),
+                'input' => 'datetime_immutable',
+            ])
+            ->add('units', EntityType::class, [
+                'label' => 'Geographical unit',
+                'placeholder' => 'Select a geographical unit',
+                'class' => GeographicalUnit::class,
+                'choices' => $this->geographicalUnitRepository->findAll(),
+                'choice_label' => function (GeographicalUnit $item) {
+                    return $this->translatableStringHelper->localize($item->getLayer()->getName()) . ' > ' . $item->getUnitName();
+                },
+                'attr' => [
+                    'class' => 'select2',
+                ],
+                'multiple' => true,
+            ]);
+    }
+
+    public function describeAction($data, $format = 'string')
+    {
+        return [
+            'exports.by_person.Filtered by person\'s geographical unit (based on address) computed at datecalc, only units',
+            [
+                'datecalc' => $data['date_calc']->format('Y-m-d'),
+                'units' => implode(
+                    ', ',
+                    array_map(
+                            function (GeographicalUnit $item) {
+                                return $this->translatableStringHelper->localize($item->getLayer()->getName()) . ' > ' . $item->getUnitName();
+                            },
+                            $data['units']->toArray()
+                        )
+                ),
+            ],
+        ];
+    }
+
+    public function getTitle(): string
+    {
+        return 'Filter by person\'s geographical unit (based on address)';
+    }
+}

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

@@ -11,18 +11,14 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Export\Filter\PersonFilters;
 
-use Chill\MainBundle\Entity\UserJob;
 use Chill\MainBundle\Export\FilterInterface;
 use Chill\MainBundle\Form\Type\ChillDateType;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
-use Chill\PersonBundle\Entity\Household\HouseholdCompositionType;
 use Chill\PersonBundle\Entity\MaritalStatus;
 use Chill\PersonBundle\Export\Declarations;
 use DateTime;
 use Doctrine\ORM\Query\Expr\Andx;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
-use Symfony\Component\Form\Extension\Core\Type\DateType;
-use Symfony\Contracts\Translation\TranslatorInterface;
 
 class MaritalStatusFilter implements FilterInterface
 {
@@ -77,7 +73,7 @@ class MaritalStatusFilter implements FilterInterface
                 );
             },
             'multiple' => true,
-            'expanded' => true
+            'expanded' => true,
         ]);
 
         $builder->add('calc_date', ChillDateType::class, [

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

@@ -14,6 +14,7 @@ namespace Chill\PersonBundle\Export\Filter\PersonFilters;
 use Chill\MainBundle\Export\FilterInterface;
 use Chill\MainBundle\Form\Type\ChillDateType;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Chill\PersonBundle\Entity\Person\ResidentialAddress;
 use Chill\PersonBundle\Export\Declarations;
 use Chill\ThirdPartyBundle\Entity\ThirdPartyCategory;
 use DateTime;
@@ -21,6 +22,7 @@ use Doctrine\ORM\Query\Expr;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\FormBuilderInterface;
+use function in_array;
 
 class ResidentialAddressAtThirdpartyFilter implements FilterInterface
 {
@@ -38,15 +40,12 @@ class ResidentialAddressAtThirdpartyFilter implements FilterInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        $qb->resetDQLPart('from');
-        $qb->from('ChillPersonBundle:Person\ResidentialAddress', 'resaddr');
-
-        if (!in_array('resaddrperson', $qb->getAllAliases(), true)) {
-            $qb->join('resaddr.person', 'resaddrperson');
+        if (!in_array('resaddr', $qb->getAllAliases(), true)) {
+            $qb->join(ResidentialAddress::class, 'resaddr', Expr\Join::WITH, 'resaddr.person = person');
         }
 
-        if (!in_array('resaddrcenter', $qb->getAllAliases(), true)) {
-            $qb->join('resaddrperson.center', 'resaddrcenter');
+        if (!in_array('center', $qb->getAllAliases(), true)) {
+            $qb->join('person.center', 'center');
         }
 
         if (!in_array('tparty', $qb->getAllAliases(), true)) {
@@ -58,10 +57,17 @@ class ResidentialAddressAtThirdpartyFilter implements FilterInterface
         }
 
         $where = $qb->getDQLPart('where');
+
         $clause = $qb->expr()->andX(
             $qb->expr()->isNotNull('resaddr.hostThirdParty'),
-            $qb->expr()->between(':date', 'resaddr.startDate', 'resaddr.endDate'),
-            $qb->expr()->in('tpartycat.id', ':type')
+            $qb->expr()->in('tpartycat.id', ':type'),
+            $qb->expr()->orX(
+                $qb->expr()->between(':date', 'resaddr.startDate', 'resaddr.endDate'),
+                $qb->expr()->andX(
+                    $qb->expr()->lte('resaddr.startDate', ':date'),
+                    $qb->expr()->isNull('resaddr.endDate')
+                )
+            )
         );
 
         if ($where instanceof Expr\Andx) {
@@ -108,6 +114,6 @@ class ResidentialAddressAtThirdpartyFilter implements FilterInterface
 
     public function getTitle()
     {
-        return 'Filtered by person\'s who have a residential address located at a thirdparty of type';
+        return "Filter by person's who have a residential address located at a thirdparty of type";
     }
 }

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

@@ -12,9 +12,14 @@ declare(strict_types=1);
 namespace Chill\PersonBundle\Export\Filter\PersonFilters;
 
 use Chill\MainBundle\Export\FilterInterface;
+use Chill\MainBundle\Form\Type\ChillDateType;
+use Chill\PersonBundle\Entity\Person\ResidentialAddress;
 use Chill\PersonBundle\Export\Declarations;
+use DateTime;
+use Doctrine\ORM\Query\Expr;
 use Doctrine\ORM\Query\Expr\Andx;
 use Doctrine\ORM\QueryBuilder;
+use function in_array;
 
 class ResidentialAddressAtUserFilter implements FilterInterface
 {
@@ -25,19 +30,26 @@ class ResidentialAddressAtUserFilter implements FilterInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        $qb->resetDQLPart('from');
-        $qb->from('ChillPersonBundle:Person\ResidentialAddress', 'resaddr');
-
-        if (!in_array('resaddrperson', $qb->getAllAliases(), true)) {
-            $qb->join('resaddr.person', 'resaddrperson');
+        if (!in_array('resaddr', $qb->getAllAliases(), true)) {
+            $qb->join(ResidentialAddress::class, 'resaddr', Expr\Join::WITH, 'resaddr.person = person');
         }
 
-        if (!in_array('resaddrcenter', $qb->getAllAliases(), true)) {
-            $qb->join('resaddrperson.center', 'resaddrcenter');
+        if (!in_array('center', $qb->getAllAliases(), true)) {
+            $qb->join('person.center', 'center');
         }
 
         $where = $qb->getDQLPart('where');
-        $clause = $qb->expr()->isNotNull('resaddr.hostPerson');
+
+        $clause = $qb->expr()->andX(
+            $qb->expr()->isNotNull('resaddr.hostPerson'),
+            $qb->expr()->orX(
+                $qb->expr()->between(':date', 'resaddr.startDate', 'resaddr.endDate'),
+                $qb->expr()->andX(
+                    $qb->expr()->lte('resaddr.startDate', ':date'),
+                    $qb->expr()->isNull('resaddr.endDate')
+                )
+            )
+        );
 
         if ($where instanceof Andx) {
             $where->add($clause);
@@ -45,6 +57,7 @@ class ResidentialAddressAtUserFilter implements FilterInterface
             $where = $qb->expr()->andX($clause);
         }
 
+        $qb->setParameter('date', $data['date_calc']);
         $qb->add('where', $where);
     }
 
@@ -55,16 +68,19 @@ class ResidentialAddressAtUserFilter implements FilterInterface
 
     public function buildForm(\Symfony\Component\Form\FormBuilderInterface $builder)
     {
-        // No form needed unless validity date should be added ( not specified in doc as a parameter ).
+        $builder->add('date_calc', ChillDateType::class, [
+            'label' => 'Date during which residential address was valid',
+            'data' => new DateTime('now'),
+        ]);
     }
 
     public function describeAction($data, $format = 'string')
     {
-        return ['Filtered by person\'s who have a residential address located at another user'];
+        return ["Filtered by person's who have a residential address located at another user"];
     }
 
     public function getTitle()
     {
-        return 'Filtered by person\'s who have a residential address located at another user';
+        return "Filter by person's who have a residential address located at another user";
     }
 }

src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/JobFilter.php

@@ -20,6 +20,7 @@ use Doctrine\ORM\QueryBuilder;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
+use function in_array;
 
 class JobFilter implements FilterInterface
 {

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

@@ -19,6 +19,7 @@ use Doctrine\ORM\Query\Expr\Andx;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\FormBuilderInterface;
+use function in_array;
 
 class ReferrerFilter implements FilterInterface
 {

src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/ScopeFilter.php

@@ -20,6 +20,7 @@ use Doctrine\ORM\QueryBuilder;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
+use function in_array;
 
 class ScopeFilter implements FilterInterface
 {

src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/SocialWorkTypeFilter.php

@@ -14,34 +14,35 @@ namespace Chill\PersonBundle\Export\Filter\SocialWorkFilters;
 use Chill\MainBundle\Export\FilterInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Chill\PersonBundle\Entity\SocialWork\Goal;
+use Chill\PersonBundle\Entity\SocialWork\Result;
 use Chill\PersonBundle\Entity\SocialWork\SocialAction;
 use Chill\PersonBundle\Export\Declarations;
-use Chill\PersonBundle\Repository\SocialWork\SocialActionRepository;
 use Chill\PersonBundle\Templating\Entity\SocialActionRender;
+use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Query\Expr\Andx;
 use Doctrine\ORM\QueryBuilder;
-use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\Form\CallbackTransformer;
+use Symfony\Component\Form\Extension\Core\Type\HiddenType;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\Form\FormEvent;
-use Symfony\Component\Form\FormEvents;
-use Symfony\Component\Form\FormInterface;
+use function count;
+use function in_array;
 
 class SocialWorkTypeFilter implements FilterInterface
 {
-    private SocialActionRender $socialActionRender;
+    private EntityManagerInterface $em;
 
-    private SocialActionRepository $socialActionRepository;
+    private SocialActionRender $socialActionRender;
 
     private TranslatableStringHelper $translatableStringHelper;
 
     public function __construct(
         SocialActionRender $socialActionRender,
         TranslatableStringHelper $translatableStringHelper,
-        SocialActionRepository $socialActionRepository
+        EntityManagerInterface $em
     ) {
         $this->socialActionRender = $socialActionRender;
         $this->translatableStringHelper = $translatableStringHelper;
-        $this->socialActionRepository = $socialActionRepository;
+        $this->em = $em;
     }
 
     public function addRole(): ?string
@@ -52,16 +53,44 @@ class SocialWorkTypeFilter implements FilterInterface
     public function alterQuery(QueryBuilder $qb, $data)
     {
         $where = $qb->getDQLPart('where');
-        $clause = $qb->expr()->in('r', ':referrers');
 
-        if ($where instanceof Andx) {
-            $where->add($clause);
-        } else {
-            $where = $qb->expr()->andX($clause);
+        if (count($data['actionType']) > 0) {
+            $clause = $qb->expr()->in('acpw.socialAction', ':actionType');
+
+            if ($where instanceof Andx) {
+                $where->add($clause);
+            } else {
+                $where = $qb->expr()->andX($clause);
+            }
+
+            $qb->setParameter('actionType', $data['actionType']);
+        }
+
+        if (count($data['goal']) > 0) {
+            if (!in_array('goal', $qb->getAllAliases(), true)) {
+                $qb->join('acpw.goals', 'goal');
+            }
+
+            $where->add(
+                $qb->expr()->in('goal.id', ':goals')
+            );
+
+            $qb->setParameter('goals', $data['goal']);
+        }
+
+        if (count($data['result']) > 0) {
+            if (!in_array('result', $qb->getAllAliases(), true)) {
+                $qb->join('acpw.results', 'result');
+            }
+
+            $where->add(
+                $qb->expr()->in('result.id', ':results')
+            );
+
+            $qb->setParameter('results', $data['result']);
         }
 
         $qb->add('where', $where);
-        $qb->setParameter('referrers', $data['referrers']);
     }
 
     public function applyOn(): string
@@ -71,74 +100,87 @@ class SocialWorkTypeFilter implements FilterInterface
 
     public function buildForm(FormBuilderInterface $builder)
     {
-        $socialActions = $this->socialActionRepository->findAll();
-
-        $builder->add('actionType', ChoiceType::class, [
-            'choices' => $socialActions,
-            'choice_label' => function (SocialAction $sa) {
-                return $this->socialActionRender->renderString($sa, []);
-            },
-            'multiple' => true,
-            'expanded' => true,
-        ]);
-
-        /*
-        $refreshGoals = function (FormInterface $form, SocialAction $actionType = null) {
-
-            $goals = null === $actionType ? [] : $actionType->getGoals();
-
-            $form->add('goal', ChoiceType::class, [
-                'placeholder' => '',
-                'choices' => $goals,
-                'choice_label' => function (Goal $g) {
-                    return $this->translatableStringHelper->localize($g->getTitle());
-                },
-            ]);
-        };
-
-        $builder->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) use ($refreshGoals) {
-            $data = $event->getData();
-            dump($data);
-
-            $refreshGoals($event->getForm(), $data);
-        });
-
-        $builder->get('actionType')->addEventListener(
-            FormEvents::POST_SUBMIT,
-            function (FormEvent $event) use ($refreshGoals) {
-                $actionType = $event->getForm()->getData();
-                dump($actionType);
-                $refreshGoals($event->getForm()->getParent(), $actionType);
-            }
-        );
-         */
+        $builder
+            ->add('actionType', HiddenType::class)
+            ->get('actionType')
+            ->addModelTransformer(
+                $this->iterableToIdTransformer(SocialAction::class)
+            );
+        $builder
+            ->add('goal', HiddenType::class)
+            ->get('goal')
+            ->addModelTransformer(
+                $this->iterableToIdTransformer(Goal::class)
+            );
+        $builder
+            ->add('result', HiddenType::class)
+            ->get('result')
+            ->addModelTransformer(
+                $this->iterableToIdTransformer(Result::class)
+            );
     }
 
     public function describeAction($data, $format = 'string'): array
     {
         $actionTypes = [];
-        $objectives = [];
+        $goals = [];
         $results = [];
 
         foreach ($data['actionType'] as $at) {
-            $actionTypes[] = $at->getTitle();
+            $actionTypes[] = $this->translatableStringHelper->localize(
+                $at->getTitle()
+            );
         }
 
-        foreach ($data['objectives'] as $o) {
-            $objectives[] = $o->getTitle();
+        foreach ($data['goal'] as $g) {
+            $goals[] = $this->translatableStringHelper->localize(
+                $g->getTitle()
+            );
         }
 
-        foreach ($data['results'] as $r) {
-            $results[] = $r->getTitle();
+        foreach ($data['result'] as $r) {
+            $results[] = $this->translatableStringHelper->localize(
+                $r->getTitle()
+            );
         }
 
-        return ['Filtered by referrers: only %actionTypes%', [
-            '%actionTypes%' => implode(', ou ', $actionTypes),
+        return ['Filtered actions by type, goals and results: %selected%', [
+            '%selected%' => implode(', ', array_merge($actionTypes, $goals, $results)),
         ]];
     }
 
     public function getTitle(): string
     {
-        return 'Filter by type of action, objectives and results';
+        return 'Filter by type of action, goals and results';
+    }
+
+    private function iterableToIdTransformer(string $entity): CallbackTransformer
+    {
+        return new CallbackTransformer(
+            static function (?iterable $asIterable): string {
+                if (null === $asIterable) {
+                    return '';
+                }
+                $ids = [];
+
+                foreach ($asIterable as $value) {
+                    $ids[] = $value->getId();
+                }
+
+                return implode(',', $ids);
+            },
+            function (?string $asString) use ($entity): array {
+                if (null === $asString) {
+                    return [];
+                }
+
+                return array_map(
+                    fn (string $id) => $this->em
+                        ->getRepository($entity)
+                        ->findOneBy(['id' => (int) $id]),
+                    explode(',', $asString)
+                );
+            }
+        );
     }
 }

src/Bundle/ChillPersonBundle/Form/SocialWork/EvaluationType.php

@@ -16,6 +16,7 @@ use Chill\MainBundle\Form\Type\TranslatableStringFormType;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Chill\PersonBundle\Entity\SocialWork\Evaluation;
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\UrlType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
@@ -40,6 +41,10 @@ class EvaluationType extends AbstractType
             ->add('title', TranslatableStringFormType::class, [
                 'label' => 'Nom',
             ])
+            ->add('url', UrlType::class, [
+                'label' => 'evaluation.url',
+                'required' => false,
+            ])
             ->add('delay', DateIntervalType::class, [
                 'label' => 'evaluation.delay',
                 'required' => false,

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

@@ -16,7 +16,7 @@ use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\Query\ResultSetMappingBuilder;
 
-final class ClosingMotiveRepository
+final class ClosingMotiveRepository implements ClosingMotiveRepositoryInterface
 {
     private EntityManagerInterface $entityManager;
 
@@ -28,6 +28,32 @@ final class ClosingMotiveRepository
         $this->repository = $entityManager->getRepository(ClosingMotive::class);
     }
 
+    public function find($id): ?ClosingMotive
+    {
+        return $this->repository->find($id);
+    }
+
+    /**
+     * @return array|ClosingMotive[]
+     */
+    public function findAll(): array
+    {
+        return $this->repository->findAll();
+    }
+
+    /**
+     * @return array|ClosingMotive[]
+     */
+    public function findBy(array $criteria, ?array $orderBy = null, ?int $limit = null, ?int $offset = null): array
+    {
+        return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
+    }
+
+    public function findOneBy(array $criteria): ?ClosingMotive
+    {
+        return $this->findOneBy($criteria);
+    }
+
     /**
      * @return mixed
      */
@@ -54,4 +80,9 @@ final class ClosingMotiveRepository
             ->createNativeQuery($sql, $rsm)
             ->getResult();
     }
+
+    public function getClassName(): string
+    {
+        return ClosingMotive::class;
+    }
 }

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

@@ -0,0 +1,22 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Repository\AccompanyingPeriod;
+
+use Doctrine\Persistence\ObjectRepository;
+
+interface ClosingMotiveRepositoryInterface extends ObjectRepository
+{
+    /**
+     * @return mixed
+     */
+    public function getActiveClosingMotive(bool $onlyLeaf = true);
+}

src/Bundle/ChillPersonBundle/Repository/Person/PersonCenterHistoryInterface.php

@@ -0,0 +1,18 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Repository\Person;
+
+use Doctrine\Persistence\ObjectRepository;
+
+interface PersonCenterHistoryInterface extends ObjectRepository
+{
+}

src/Bundle/ChillPersonBundle/Repository/Person/PersonCenterHistoryRepository.php

@@ -0,0 +1,57 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Repository\Person;
+
+use Chill\PersonBundle\Entity\Person\PersonCenterHistory;
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\EntityRepository;
+
+class PersonCenterHistoryRepository implements PersonCenterHistoryInterface
+{
+    private EntityRepository $repository;
+
+    public function __construct(EntityManagerInterface $em)
+    {
+        $this->repository = $em->getRepository($this->getClassName());
+    }
+
+    public function find($id): ?PersonCenterHistory
+    {
+        return $this->repository->find($id);
+    }
+
+    /**
+     * @return array|PersonCenterHistory[]
+     */
+    public function findAll(): array
+    {
+        return $this->repository->findAll();
+    }
+
+    /**
+     * @return array|PersonCenterHistory[]
+     */
+    public function findBy(array $criteria, ?array $orderBy = null, ?int $limit = null, ?int $offset = null): array
+    {
+        return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
+    }
+
+    public function findOneBy(array $criteria): ?PersonCenterHistory
+    {
+        return $this->repository->findOneBy($criteria);
+    }
+
+    public function getClassName(): string
+    {
+        return PersonCenterHistory::class;
+    }
+}

src/Bundle/ChillPersonBundle/Repository/PersonACLAwareRepository.php

@@ -15,7 +15,7 @@ use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Repository\CountryRepository;
 use Chill\MainBundle\Search\ParsingException;
 use Chill\MainBundle\Search\SearchApiQuery;
-use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
+use Chill\MainBundle\Security\Authorization\AuthorizationHelperInterface;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Security\Authorization\PersonVoter;
 use DateTimeInterface;
@@ -34,7 +34,7 @@ use function implode;
 
 final class PersonACLAwareRepository implements PersonACLAwareRepositoryInterface
 {
-    private AuthorizationHelper $authorizationHelper;
+    private AuthorizationHelperInterface $authorizationHelper;
 
     private CountryRepository $countryRepository;
 
@@ -46,7 +46,7 @@ final class PersonACLAwareRepository implements PersonACLAwareRepositoryInterfac
         Security $security,
         EntityManagerInterface $em,
         CountryRepository $countryRepository,
-        AuthorizationHelper $authorizationHelper
+        AuthorizationHelperInterface $authorizationHelper
     ) {
         $this->security = $security;
         $this->em = $em;
@@ -310,9 +310,10 @@ final class PersonACLAwareRepository implements PersonACLAwareRepositoryInterfac
         }
 
         return $query
+            ->setFromClause($query->getFromClause() . ' JOIN view_chill_person_person_center_history_current vcppchc ON vcppchc.person_id = person.id', $query->getFromParams())
             ->andWhereClause(
                 strtr(
-                    'person.center_id IN ({{ center_ids }})',
+                    'vcppchc.center_id IN ({{ center_ids }})',
                     [
                         '{{ center_ids }}' => implode(
                             ', ',

src/Bundle/ChillPersonBundle/Resources/public/vuejs/ExportFormActionGoalResult/App.vue

@@ -0,0 +1,381 @@
+<template>
+   <teleport to="#export_filters_social_work_type_filter_form">
+      
+      <fieldset class="mb-3" id="actionType">
+         <div class="row">
+            <legend class="col-sm-4 col-form-label">{{ $t('action.label')}}</legend>
+            <div class="col-sm-8">
+      
+               <VueMultiselect
+                  v-model="action"
+                  :options="actions.options"
+                  @select="selectAction"
+                  @remove="unselectAction"
+                  :multiple="true"
+                  :close-on-select="false"
+                  :placeholder="$t('action.placeholder')"
+                  label="text"
+                  track-by="id"
+                  :searchable="true"
+               ></VueMultiselect>
+               
+            </div>
+         </div>
+      </fieldset>
+   
+      <fieldset class="mb-3" id="goal">
+         <div class="row">
+            <legend class="col-sm-4 col-form-label">{{ $t('goal.label')}}</legend>
+            <div class="col-sm-8">
+            
+               <VueMultiselect
+                  v-model="goal"
+                  :options="goals.options"
+                  @select="selectGoal"
+                  @remove="unselectGoal"
+                  :multiple="true"
+                  :close-on-select="false"
+                  :placeholder="$t('goal.placeholder')"
+                  label="title"
+                  :custom-label="transTitle"
+                  track-by="id"
+                  :searchable="true"
+               ></VueMultiselect>
+         
+            </div>
+         </div>
+      </fieldset>
+   
+      <fieldset class="mb-3" id="result">
+         <div class="row">
+            <legend class="col-sm-4 col-form-label">{{ $t('result.label')}}</legend>
+            <div class="col-sm-8">
+            
+               <VueMultiselect
+                  v-model="result"
+                  :options="results.options"
+                  @select="selectResult"
+                  @remove="unselectResult"
+                  :multiple="true"
+                  :close-on-select="false"
+                  :placeholder="$t('result.placeholder')"
+                  label="title"
+                  :custom-label="transTitle"
+                  track-by="id"
+                  :searchable="true"
+               ></VueMultiselect>
+         
+            </div>
+         </div>
+      </fieldset>
+   
+   </teleport>
+</template>
+
+<script>
+import VueMultiselect from 'vue-multiselect';
+import { getSocialActions, getGoalByAction, getResultByAction, getResultByGoal } from './api';
+
+export default {
+   name: "App",
+   components: {
+      VueMultiselect
+   },
+   i18n: {
+      messages: {
+         fr: {
+            action: {
+               label: 'Types d\'actions',
+               placeholder: 'Choisissez une ou plusieurs actions',
+            },
+            goal: {
+               label: 'Objectifs',
+               placeholder: 'Choisissez un ou plusieurs objectifs',
+            },
+            result: {
+               label: 'Résultats',
+               placeholder: 'Choisissez un ou plusieurs résultats',
+            }
+         }
+      }
+   },
+   data() {
+      return {
+         actions: {
+            options: [], // array with multiselect options
+            value: [],   // array with selected values
+            hiddenField: document.getElementById(
+               'export_filters_social_work_type_filter_form_actionType'),
+         },
+         goals: {
+            options: [],
+            value: [],
+            hiddenField: document.getElementById(
+               'export_filters_social_work_type_filter_form_goal'),
+         },
+         results: {
+            options: [],
+            value: [],
+            hiddenField: document.getElementById(
+               'export_filters_social_work_type_filter_form_result'),
+         },
+      }
+   },
+   computed: {
+      action: {
+         get() {
+            return this.actions.value;
+         },
+         set(value) {
+            this.actions.value = value;
+            this.rebuildHiddenFieldValues('actions');
+         }
+      },
+      goal: {
+         get() {
+            return this.goals.value;
+         },
+         set(value) {
+            this.goals.value = value;
+            this.rebuildHiddenFieldValues('goals');
+         }
+      },
+      result: {
+         get() {
+            return this.results.value;
+         },
+         set(value) {
+            this.results.value = value;
+            this.rebuildHiddenFieldValues('results');
+         }
+      },
+   },
+   mounted() {
+      this.getSocialActionsList();
+      
+      this.actions.hiddenField.value = '';
+      this.goals.hiddenField.value = '';
+      this.results.hiddenField.value = '';
+   
+      //console.log(this.actions.hiddenField, this.goals.hiddenField, this.results.hiddenField);
+   },
+   methods: {
+      async getSocialActionsList() {
+         this.actions.options = await getSocialActions();
+      },
+   
+      /**
+       * Select/unselect in Action Multiselect
+       * @param value
+       */
+      selectAction(value) {
+         //console.log('----'); console.log('select action', value.id);
+         let children = this.getChildrensFromParent(value);
+         this.addSelectedElement('actions', children);
+         
+         let parentAndChildren = [...[value], ...children];
+         parentAndChildren.forEach(elem => {
+            getGoalByAction(elem.id).then(response => new Promise((resolve, reject) => {
+               this.addElementInData('goals', response.results);
+               resolve();
+            })).catch;
+            getResultByAction(elem.id).then(response => new Promise((resolve, reject) => {
+               this.addElementInData('results', response.results);
+               resolve();
+            })).catch;
+         });
+      },
+      
+      unselectAction(value) {
+         //console.log('----'); console.log('unselect action', value.id);
+         getGoalByAction(value.id).then(response => new Promise((resolve, reject) => {
+            [ this.goals.options, this.goals.value ] = this.removeElementInData('goals', response.results);
+            resolve();
+         })).catch;
+         getResultByAction(value.id).then(response => new Promise((resolve, reject) => {
+            [ this.results.options, this.results.value ] = this.removeElementInData('results', response.results);
+            resolve();
+         })).catch;
+      },
+   
+      /**
+       * Select/unselect in Goal Multiselect
+       * @param value
+       */
+      selectGoal(value) {
+         //console.log('----'); console.log('select goal', value.id);
+         getResultByGoal(value.id).then(response => new Promise((resolve, reject) => {
+            this.addElementInData('results', response.results);
+            resolve();
+         })).catch;
+      },
+      
+      unselectGoal(value) {
+         //console.log('----'); console.log('unselect goal', value.id);
+         getResultByGoal(value.id).then(response => new Promise((resolve, reject) => {
+            [ this.results.options, this.results.value ] = this.removeElementInData('results', response.results);
+            resolve();
+         })).catch;
+      },
+   
+      /**
+       * Select/unselect in Result Multiselect
+       * @param value
+       */
+      selectResult(value) {
+         //console.log('----'); console.log('select result', value.id);
+      },
+      
+      unselectResult(value) {
+         //console.log('----'); console.log('unselect result', value.id);
+      },
+   
+      /**
+       * Choose parent action will involve retaining the "children" actions.
+       * @param value
+       * @return array
+       */
+      getChildrensFromParent(value) {
+         if (null === value.parent) {
+            let excludeParent = this.actions.options.filter(o => o.parent !== null);
+            let children = excludeParent.filter(o => o.parent.id === value.id);
+            //console.log("get childrens", children.map(e => e.id));
+            return children;
+         }
+         return [];
+      },
+   
+      /**
+       * Add response elements in data target
+       * @param target string -> 'actions', 'goals' or 'results'
+       * @param response array of objects with fetch results
+       */
+      addElementInData(target, response) {
+         let data = this[target];
+         let dump = [];
+         response.forEach(elem => {
+            let found = data.options.some(e => e.id === elem.id);
+            if (!found) {
+               data.options.push(elem);
+               dump.push(elem.id);
+            }
+         })
+         if (dump.length > 0) {
+            //console.log('push ' + dump.length + ' elems in', target, dump);
+         }
+      },
+   
+      /**
+       * Remove response elements from data target
+       * @param target string -> 'actions', 'goals' or 'results'
+       * @param response array of objects with fetch results
+       * @returns data.<target>.options
+       */
+      removeElementInData(target, response) {
+         let data = this[target];
+         let dump = [];
+         response.forEach(elem => {
+            let found = data.options.some(e => e.id === elem.id);
+            if (found) {
+               data.options = data.options.filter(e => e.id !== elem.id);
+               dump.push(elem.id);
+               
+               this.removeSelectedElement(target, elem);
+            }
+         })
+         if (dump.length > 0) {
+            //console.log('remove ' + dump.length + ' elems from ' + target + ' options', dump);
+         }
+         return [ data.options, data.value ];
+      },
+   
+      /**
+       *
+       * @param target
+       * @param elements
+       */
+      addSelectedElement(target, elements) {
+         let data = this[target];
+         let dump = [];
+         elements.forEach(elem => {
+            let selected = data.value.some(e => e.id === elem.id);
+            if (!selected) {
+               
+               data.value.push(elem);
+               dump.push(elem.id);
+   
+               // add in hiddenField
+               this.rebuildHiddenFieldValues(target);
+            }
+         });
+         if (dump.length > 0) {
+            //console.log('add ' + dump.length + ' selected elems in', target, dump);
+         }
+      },
+   
+      /**
+       * Remove element from selected and from hiddenField
+       * @param target
+       * @param elem
+       */
+      removeSelectedElement(target, elem) {
+         let data = this[target];
+         let selected = data.value.some(e => e.id === elem.id);
+         if (selected) {
+      
+            // remove from selected
+            data.value = data.value.filter(e => e.id !== elem.id);
+            //console.log('remove ' + elem.id + ' from selected ' + target);
+      
+            // remove from hiddenField
+            this.rebuildHiddenFieldValues(target);
+      
+            // in any cases, remove should be recursive
+            this.unselectToNextField(target, elem);
+         }
+      },
+      
+      /**
+       * When unselect Action, it could remove elements in goals multiselect.
+       * In that case, we have to unselect Goal to remove elements in results too.
+       * @param target
+       * @param elem
+       */
+      unselectToNextField(target, elem) {
+         if (target === 'goals') {
+            //console.log('!!!! target is goal: unselect goal', elem.id);
+            this.unselectGoal(elem);
+            //console.log('!!!! done');
+         }
+      },
+   
+      /**
+       * Rebuild values serie (string) in target HiddenField
+       * @param target
+       */
+      rebuildHiddenFieldValues(target) {
+         let data = this[target];
+         //console.log('rebuild hiddenFields ' + target + ' values :');
+         data.hiddenField.value = ''; // reset
+         data.value.forEach(elem => {
+            data.hiddenField.value = this.addIdToValue(data.hiddenField.value, elem.id);
+         })
+         //console.log(data.hiddenField);
+      },
+      
+      addIdToValue(string, id) {
+         let array = string ? string.split(',') : [];
+         array.push(id.toString());
+         let str = array.join();
+         return str;
+      },
+      
+      transTitle ({ title }) {
+         return title.fr //TODO multilang
+      },
+   },
+}
+</script>
+
+<style scoped>
+</style>

src/Bundle/ChillPersonBundle/Resources/public/vuejs/ExportFormActionGoalResult/api.js

@@ -0,0 +1,41 @@
+import { fetchResults } from 'ChillMainAssets/lib/api/apiMethods';
+
+const getSocialActions = () => fetchResults(
+    '/api/1.0/person/social/social-action.json', {
+        item_per_page: 200
+    }
+);
+
+const getGoalByAction = (id) => {
+    let url = `/api/1.0/person/social-work/goal/by-social-action/${id}.json`;
+    return fetch(url)
+        .then(response => {
+            if (response.ok) { return response.json(); }
+            throw Error('Error with request resource response');
+        });
+};
+
+const getResultByAction = (id) => {
+    let url = `/api/1.0/person/social-work/result/by-social-action/${id}.json`;
+    return fetch(url)
+        .then(response => {
+            if (response.ok) { return response.json(); }
+            throw Error('Error with request resource response');
+        });
+};
+
+const getResultByGoal = (id) => {
+    let url = `/api/1.0/person/social-work/result/by-goal/${id}.json`;
+    return fetch(url)
+        .then(response => {
+            if (response.ok) { return response.json(); }
+            throw Error('Error with request resource response');
+        });
+};
+
+export {
+    getSocialActions,
+    getGoalByAction,
+    getResultByAction,
+    getResultByGoal,
+}

src/Bundle/ChillPersonBundle/Resources/public/vuejs/ExportFormActionGoalResult/index.js

@@ -0,0 +1,13 @@
+import { createApp } from "vue";
+import { _createI18n } from 'ChillMainAssets/vuejs/_js/i18n';
+import App from './App.vue';
+
+const i18n = _createI18n({});
+
+const app = createApp({
+    template: `<app></app>`,
+})
+.use(i18n)
+.component('app', App)
+.mount('#export_export')
+;

src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/api.js

@@ -5,8 +5,10 @@ import {makeFetch} from 'ChillMainAssets/lib/api/apiMethods.ts';
  * @function getFetch
  * @param url
  * @returns {Promise<Response>}
+ * @deprecated use makeFetch instead
  */
 const getFetch = (url) => {
+    console.error('deprecated method');
     return makeFetch('GET', url, null)
 }
 
@@ -51,8 +53,10 @@ const getHouseholdByPerson = (person) => {
     if (person.current_household_id === null) {
         throw 'Currently the person has not household!'
     }
-    return getFetch(
-        `/api/1.0/person/household/${person.current_household_id}.json`)
+    return makeFetch(
+        'GET',
+        `/api/1.0/person/household/${person.current_household_id}.json`
+    );
 }
 
 /**
@@ -62,8 +66,10 @@ const getHouseholdByPerson = (person) => {
  */
 const getCoursesByPerson = (person) => {
     //console.log('getCoursesByPerson', person._id)
-    return getFetch(
-        `/api/1.0/person/accompanying-course/by-person/${person._id}.json`)
+    return makeFetch(
+        'GET',
+        `/api/1.0/person/accompanying-course/by-person/${person._id}.json`
+    );
 }
 
 /**
@@ -73,8 +79,10 @@ const getCoursesByPerson = (person) => {
  */
 const getRelationshipsByPerson = (person) => {
     //console.log('getRelationshipsByPerson', person.id)
-    return getFetch(
-        `/api/1.0/relations/relationship/by-person/${person._id}.json`)
+    return makeFetch(
+        'GET',
+        `/api/1.0/relations/relationship/by-person/${person._id}.json`
+    );
 }
 
 /**
@@ -82,7 +90,7 @@ const getRelationshipsByPerson = (person) => {
  * @returns {Promise<Response>}
  */
 const getRelationsList = () => {
-    return getFetch(`/api/1.0/relations/relation.json`)
+    return makeFetch('GET', `/api/1.0/relations/relation.json`);
 }
 
 /**

src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig

@@ -180,7 +180,7 @@
               {% if members|length > 0 %}
                 <div class="flex-table list-household-members">
                   {% for m in members %}
-                    {% if m.position.shareHousehold %}
+                    {% if m.position is null or m.position.shareHousehold %}
                       {% include '@ChillPerson/Household/_render_member.html.twig' with {
                           'member': m,
                           'customButtons': { 'before': _self.customButtons(m, household) }

src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodVoter.php

@@ -11,6 +11,7 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Security\Authorization;
 
+use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Security\Authorization\AbstractChillVoter;
 use Chill\MainBundle\Security\Authorization\VoterHelperFactoryInterface;
@@ -119,6 +120,7 @@ class AccompanyingPeriodVoter extends AbstractChillVoter implements ProvideRoleH
             ->addCheckFor(null, [self::CREATE, self::REASSIGN_BULK])
             ->addCheckFor(AccompanyingPeriod::class, [self::TOGGLE_CONFIDENTIAL, ...self::ALL])
             ->addCheckFor(Person::class, [self::SEE, self::CREATE])
+            ->addCheckFor(Center::class, [self::STATS])
             ->build();
     }
 

src/Bundle/ChillPersonBundle/Security/Authorization/HouseholdVoter.php

@@ -11,6 +11,10 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Security\Authorization;
 
+use Chill\MainBundle\Entity\Center;
+use Chill\MainBundle\Security\Authorization\VoterHelperFactoryInterface;
+use Chill\MainBundle\Security\Authorization\VoterHelperInterface;
+use Chill\MainBundle\Security\ProvideRoleHierarchyInterface;
 use Chill\PersonBundle\Entity\Household\Household;
 use Chill\PersonBundle\Entity\Household\HouseholdMember;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
@@ -19,7 +23,7 @@ use Symfony\Component\Security\Core\Security;
 use UnexpectedValueException;
 use function in_array;
 
-class HouseholdVoter extends Voter
+class HouseholdVoter extends Voter implements ProvideRoleHierarchyInterface
 {
     public const EDIT = 'CHILL_PERSON_HOUSEHOLD_EDIT';
 
@@ -36,17 +40,39 @@ class HouseholdVoter extends Voter
         self::EDIT, self::SEE,
     ];
 
+    private VoterHelperInterface $helper;
+
     private Security $security;
 
-    public function __construct(Security $security)
+    public function __construct(Security $security, VoterHelperFactoryInterface $voterHelperFactory)
     {
         $this->security = $security;
+        $this->helper = $voterHelperFactory
+            ->generate(self::class)
+            ->addCheckFor(Center::class, [self::STATS])
+            ->build();
+    }
+
+    public function getRoles(): array
+    {
+        return [self::STATS];
+    }
+
+    public function getRolesWithHierarchy(): array
+    {
+        return ['Person' => $this->getRoles()];
+    }
+
+    public function getRolesWithoutScope(): array
+    {
+        return $this->getRoles();
     }
 
     protected function supports($attribute, $subject)
     {
-        return $subject instanceof Household
-            && in_array($attribute, self::ALL, true);
+        return ($subject instanceof Household
+            && in_array($attribute, self::ALL, true))
+            || $this->helper->supports($attribute, $subject);
     }
 
     protected function voteOnAttribute($attribute, $subject, TokenInterface $token): bool
@@ -58,6 +84,9 @@ class HouseholdVoter extends Voter
             case self::EDIT:
                 return $this->checkAssociatedMembersRole($subject, PersonVoter::UPDATE);
 
+            case self::STATS:
+                return $this->voteOnAttribute($attribute, $subject, $token);
+
             default:
                 throw new UnexpectedValueException('attribute not supported');
         }

src/Bundle/ChillPersonBundle/Tests/Entity/PersonTest.php

@@ -11,6 +11,7 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Tests\Entity;
 
+use Chill\MainBundle\Entity\Center;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\Household\Household;
 use Chill\PersonBundle\Entity\Household\HouseholdMember;
@@ -191,4 +192,29 @@ final class PersonTest extends \PHPUnit\Framework\TestCase
 
         $this->assertEquals($r['result'], Person::ERROR_ADDIND_PERIOD_AFTER_AN_OPEN_PERIOD);
     }
+
+    public function testSetCenter()
+    {
+        $person = new Person();
+        $centerA = new Center();
+        $centerB = new Center();
+
+        $this->assertCount(0, $person->getCenterHistory());
+        $this->assertNull($person->getCenter());
+        $this->assertNull($person->getCenterCurrent());
+
+        $person->setCenter($centerA);
+
+        $this->assertCount(1, $person->getCenterHistory());
+        $this->assertSame($centerA, $person->getCenter());
+        $this->assertInstanceOf(Person\PersonCenterCurrent::class, $person->getCenterCurrent());
+        $this->assertSame($centerA, $person->getCenterCurrent()->getCenter());
+
+        $person->setCenter($centerB);
+
+        $this->assertCount(2, $person->getCenterHistory());
+        $this->assertSame($centerB, $person->getCenter());
+        $this->assertInstanceOf(Person\PersonCenterCurrent::class, $person->getCenterCurrent());
+        $this->assertSame($centerB, $person->getCenterCurrent()->getCenter());
+    }
 }

src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/AdministrativeLocationAggregatorTest.php

@@ -0,0 +1,61 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Tests\Export\Aggregator\AccompanyingCourseAggregators;
+
+use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\AdministrativeLocationAggregator;
+use Doctrine\ORM\EntityManagerInterface;
+
+/**
+ * @internal
+ * @coversNothing
+ */
+final class AdministrativeLocationAggregatorTest extends AbstractAggregatorTest
+{
+    private AdministrativeLocationAggregator $aggregator;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+
+        $this->aggregator = self::$container->get('chill.person.export.aggregator_administrative_location');
+    }
+
+    public function getAggregator()
+    {
+        return $this->aggregator;
+    }
+
+    public function getFormData(): array
+    {
+        return [
+            [],
+        ];
+    }
+
+    public function getQueryBuilders(): array
+    {
+        if (null === self::$kernel) {
+            self::bootKernel();
+        }
+
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        return [
+            $em->createQueryBuilder()
+                ->select('count(acp.id)')
+                ->from(AccompanyingPeriod::class, 'acp')
+                ->join('acp.administrativeLocation', 'acploc'),
+        ];
+    }
+}

src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ClosingMotiveAggregatorTest.php

@@ -0,0 +1,61 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Tests\Export\Aggregator\AccompanyingCourseAggregators;
+
+use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\ClosingMotiveAggregator;
+use Doctrine\ORM\EntityManagerInterface;
+
+/**
+ * @internal
+ * @coversNothing
+ */
+final class ClosingMotiveAggregatorTest extends AbstractAggregatorTest
+{
+    private ClosingMotiveAggregator $aggregator;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+
+        $this->aggregator = self::$container->get('chill.person.export.aggregator_closingmotive');
+    }
+
+    public function getAggregator()
+    {
+        return $this->aggregator;
+    }
+
+    public function getFormData(): array
+    {
+        return [
+            [],
+        ];
+    }
+
+    public function getQueryBuilders(): array
+    {
+        if (null === self::$kernel) {
+            self::bootKernel();
+        }
+
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        return [
+            $em->createQueryBuilder()
+                ->select('count(acp.id)')
+                ->from(AccompanyingPeriod::class, 'acp')
+                ->join('acp.closingMotive', 'acpmotive'),
+        ];
+    }
+}

src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ConfidentialAggregatorTest.php

@@ -0,0 +1,60 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Tests\Export\Aggregator\AccompanyingCourseAggregators;
+
+use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\ConfidentialAggregator;
+use Doctrine\ORM\EntityManagerInterface;
+
+/**
+ * @internal
+ * @coversNothing
+ */
+final class ConfidentialAggregatorTest extends AbstractAggregatorTest
+{
+    private ConfidentialAggregator $aggregator;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+
+        $this->aggregator = self::$container->get('chill.person.export.aggregator_confidential');
+    }
+
+    public function getAggregator()
+    {
+        return $this->aggregator;
+    }
+
+    public function getFormData(): array
+    {
+        return [
+            [],
+        ];
+    }
+
+    public function getQueryBuilders(): array
+    {
+        if (null === self::$kernel) {
+            self::bootKernel();
+        }
+
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        return [
+            $em->createQueryBuilder()
+                ->select('count(acp.id)')
+                ->from(AccompanyingPeriod::class, 'acp'),
+        ];
+    }
+}

src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/DurationAggregatorTest.php

@@ -0,0 +1,60 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Tests\Export\Aggregator\AccompanyingCourseAggregators;
+
+use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\DurationAggregator;
+use Doctrine\ORM\EntityManagerInterface;
+
+/**
+ * @internal
+ * @coversNothing
+ */
+final class DurationAggregatorTest extends AbstractAggregatorTest
+{
+    private DurationAggregator $aggregator;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+
+        $this->aggregator = self::$container->get('chill.person.export.aggregator_duration');
+    }
+
+    public function getAggregator()
+    {
+        return $this->aggregator;
+    }
+
+    public function getFormData(): array
+    {
+        return [
+            [],
+        ];
+    }
+
+    public function getQueryBuilders(): array
+    {
+        if (null === self::$kernel) {
+            self::bootKernel();
+        }
+
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        return [
+            $em->createQueryBuilder()
+                ->select('count(acp.id)')
+                ->from(AccompanyingPeriod::class, 'acp'),
+        ];
+    }
+}

src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/EmergencyAggregatorTest.php

@@ -0,0 +1,60 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Tests\Export\Aggregator\AccompanyingCourseAggregators;
+
+use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\EmergencyAggregator;
+use Doctrine\ORM\EntityManagerInterface;
+
+/**
+ * @internal
+ * @coversNothing
+ */
+final class EmergencyAggregatorTest extends AbstractAggregatorTest
+{
+    private EmergencyAggregator $aggregator;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+
+        $this->aggregator = self::$container->get('chill.person.export.aggregator_emergency');
+    }
+
+    public function getAggregator()
+    {
+        return $this->aggregator;
+    }
+
+    public function getFormData(): array
+    {
+        return [
+            [],
+        ];
+    }
+
+    public function getQueryBuilders(): array
+    {
+        if (null === self::$kernel) {
+            self::bootKernel();
+        }
+
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        return [
+            $em->createQueryBuilder()
+                ->select('count(acp.id)')
+                ->from(AccompanyingPeriod::class, 'acp'),
+        ];
+    }
+}

src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/EvaluationAggregatorTest.php

@@ -0,0 +1,62 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Tests\Export\Aggregator\AccompanyingCourseAggregators;
+
+use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\EvaluationAggregator;
+use Doctrine\ORM\EntityManagerInterface;
+
+/**
+ * @internal
+ * @coversNothing
+ */
+final class EvaluationAggregatorTest extends AbstractAggregatorTest
+{
+    private EvaluationAggregator $aggregator;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+
+        $this->aggregator = self::$container->get('chill.person.export.aggregator_evaluation');
+    }
+
+    public function getAggregator()
+    {
+        return $this->aggregator;
+    }
+
+    public function getFormData(): array
+    {
+        return [
+            [],
+        ];
+    }
+
+    public function getQueryBuilders(): array
+    {
+        if (null === self::$kernel) {
+            self::bootKernel();
+        }
+
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        return [
+            $em->createQueryBuilder()
+                ->select('count(acp.id)')
+                ->from(AccompanyingPeriod::class, 'acp')
+                ->join('acp.works', 'acpw')
+                ->join('acpw.accompanyingPeriodWorkEvaluations', 'workeval'),
+        ];
+    }
+}

src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/GeographicalUnitStatAggregatorTest.php

@@ -0,0 +1,60 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Tests\Export\Aggregator\AccompanyingCourseAggregators;
+
+use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\GeographicalUnitStatAggregator;
+use Doctrine\ORM\EntityManagerInterface;
+
+/**
+ * @internal
+ * @coversNothing
+ */
+final class GeographicalUnitStatAggregatorTest extends AbstractAggregatorTest
+{
+    private GeographicalUnitStatAggregator $aggregator;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+
+        $this->aggregator = self::$container->get('chill.person.export.aggregator_geographicalunitstat');
+    }
+
+    public function getAggregator()
+    {
+        return $this->aggregator;
+    }
+
+    public function getFormData(): array
+    {
+        return [
+            [],
+        ];
+    }
+
+    public function getQueryBuilders(): array
+    {
+        if (null === self::$kernel) {
+            self::bootKernel();
+        }
+
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        return [
+            $em->createQueryBuilder()
+                ->select('count(acp.id)')
+                ->from(AccompanyingPeriod::class, 'acp'),
+        ];
+    }
+}

src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/IntensityAggregatorTest.php

@@ -0,0 +1,60 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Tests\Export\Aggregator\AccompanyingCourseAggregators;
+
+use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\IntensityAggregator;
+use Doctrine\ORM\EntityManagerInterface;
+
+/**
+ * @internal
+ * @coversNothing
+ */
+final class IntensityAggregatorTest extends AbstractAggregatorTest
+{
+    private IntensityAggregator $aggregator;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+
+        $this->aggregator = self::$container->get('chill.person.export.aggregator_intensity');
+    }
+
+    public function getAggregator()
+    {
+        return $this->aggregator;
+    }
+
+    public function getFormData(): array
+    {
+        return [
+            [],
+        ];
+    }
+
+    public function getQueryBuilders(): array
+    {
+        if (null === self::$kernel) {
+            self::bootKernel();
+        }
+
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        return [
+            $em->createQueryBuilder()
+                ->select('count(acp.id)')
+                ->from(AccompanyingPeriod::class, 'acp'),
+        ];
+    }
+}

src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/JobAggregatorTest.php

@@ -0,0 +1,61 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Tests\Export\Aggregator\AccompanyingCourseAggregators;
+
+use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\JobAggregator;
+use Doctrine\ORM\EntityManagerInterface;
+
+/**
+ * @internal
+ * @coversNothing
+ */
+final class JobAggregatorTest extends AbstractAggregatorTest
+{
+    private JobAggregator $aggregator;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+
+        $this->aggregator = self::$container->get('chill.person.export.aggregator_referrer_job');
+    }
+
+    public function getAggregator()
+    {
+        return $this->aggregator;
+    }
+
+    public function getFormData(): array
+    {
+        return [
+            [],
+        ];
+    }
+
+    public function getQueryBuilders(): array
+    {
+        if (null === self::$kernel) {
+            self::bootKernel();
+        }
+
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        return [
+            $em->createQueryBuilder()
+                ->select('count(acp.id)')
+                ->from(AccompanyingPeriod::class, 'acp')
+                ->join('acp.job', 'acpjob'),
+        ];
+    }
+}

src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/OriginAggregatorTest.php

@@ -0,0 +1,61 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Tests\Export\Aggregator\AccompanyingCourseAggregators;
+
+use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\OriginAggregator;
+use Doctrine\ORM\EntityManagerInterface;
+
+/**
+ * @internal
+ * @coversNothing
+ */
+final class OriginAggregatorTest extends AbstractAggregatorTest
+{
+    private OriginAggregator $aggregator;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+
+        $this->aggregator = self::$container->get('chill.person.export.aggregator_origin');
+    }
+
+    public function getAggregator()
+    {
+        return $this->aggregator;
+    }
+
+    public function getFormData(): array
+    {
+        return [
+            [],
+        ];
+    }
+
+    public function getQueryBuilders(): array
+    {
+        if (null === self::$kernel) {
+            self::bootKernel();
+        }
+
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        return [
+            $em->createQueryBuilder()
+                ->select('count(acp.id)')
+                ->from(AccompanyingPeriod::class, 'acp')
+                ->join('acp.origin', 'acporigin'),
+        ];
+    }
+}

src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ReferrerAggregatorTest.php

@@ -0,0 +1,61 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Tests\Export\Aggregator\AccompanyingCourseAggregators;
+
+use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\ReferrerAggregator;
+use Doctrine\ORM\EntityManagerInterface;
+
+/**
+ * @internal
+ * @coversNothing
+ */
+final class ReferrerAggregatorTest extends AbstractAggregatorTest
+{
+    private ReferrerAggregator $aggregator;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+
+        $this->aggregator = self::$container->get('chill.person.export.aggregator_referrer');
+    }
+
+    public function getAggregator()
+    {
+        return $this->aggregator;
+    }
+
+    public function getFormData(): array
+    {
+        return [
+            [],
+        ];
+    }
+
+    public function getQueryBuilders(): array
+    {
+        if (null === self::$kernel) {
+            self::bootKernel();
+        }
+
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        return [
+            $em->createQueryBuilder()
+                ->select('count(acp.id)')
+                ->from(AccompanyingPeriod::class, 'acp')
+                ->join('acp.user', 'acpuser'),
+        ];
+    }
+}

src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ReferrerScopeAggregatorTest.php

@@ -0,0 +1,73 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Export\Aggregator\AccompanyingCourseAggregators;
+
+use Chill\MainBundle\Entity\Scope;
+use Chill\MainBundle\Repository\ScopeRepositoryInterface;
+use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
+use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\ReferrerScopeAggregator;
+use DateTimeImmutable;
+use Doctrine\ORM\EntityManagerInterface;
+use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
+
+/**
+ * @internal
+ * @coversNothing
+ */
+final class ReferrerScopeAggregatorTest extends AbstractAggregatorTest
+{
+    use ProphecyTrait;
+
+    public function getAggregator()
+    {
+        $translatableStringHelper = $this->prophesize(TranslatableStringHelperInterface::class);
+        $translatableStringHelper->localize(Argument::type('array'))->willReturn('localized');
+
+        $scopeRepository = $this->prophesize(ScopeRepositoryInterface::class);
+        $scopeRepository->find(Argument::type('int'))->willReturn(
+            (new Scope())->setName(['fr' => 'scope'])
+        );
+
+        return new ReferrerScopeAggregator(
+            $scopeRepository->reveal(),
+            $translatableStringHelper->reveal()
+        );
+    }
+
+    public function getFormData()
+    {
+        return [
+            [
+                'date_calc' => new DateTimeImmutable('now'),
+            ],
+        ];
+    }
+
+    public function getQueryBuilders()
+    {
+        if (null === self::$kernel) {
+            self::bootKernel();
+        }
+
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        return [
+            $em->createQueryBuilder()
+                ->select('count(acp.id)')
+                ->from(AccompanyingPeriod::class, 'acp')
+                ->join('acp.scopes', 'acpscope'),
+        ];
+    }
+}

src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/RequestorAggregatorTest.php

@@ -0,0 +1,61 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Tests\Export\Aggregator\AccompanyingCourseAggregators;
+
+use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\RequestorAggregator;
+use Doctrine\ORM\EntityManagerInterface;
+
+/**
+ * @internal
+ * @coversNothing
+ */
+final class RequestorAggregatorTest extends AbstractAggregatorTest
+{
+    private RequestorAggregator $aggregator;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+
+        $this->aggregator = self::$container->get('chill.person.export.aggregator_requestor');
+    }
+
+    public function getAggregator()
+    {
+        return $this->aggregator;
+    }
+
+    public function getFormData(): array
+    {
+        return [
+            [],
+        ];
+    }
+
+    public function getQueryBuilders(): array
+    {
+        if (null === self::$kernel) {
+            self::bootKernel();
+        }
+
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        return [
+            $em->createQueryBuilder()
+                ->select('count(acp.id)')
+                ->from(AccompanyingPeriod::class, 'acp')
+                ->join('acp.participations', 'acppart'),
+        ];
+    }
+}

src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/ScopeAggregatorTest.php

@@ -0,0 +1,61 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Tests\Export\Aggregator\AccompanyingCourseAggregators;
+
+use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\ScopeAggregator;
+use Doctrine\ORM\EntityManagerInterface;
+
+/**
+ * @internal
+ * @coversNothing
+ */
+final class ScopeAggregatorTest extends AbstractAggregatorTest
+{
+    private ScopeAggregator $aggregator;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+
+        $this->aggregator = self::$container->get('chill.person.export.aggregator_referrer_scope');
+    }
+
+    public function getAggregator()
+    {
+        return $this->aggregator;
+    }
+
+    public function getFormData(): array
+    {
+        return [
+            [],
+        ];
+    }
+
+    public function getQueryBuilders(): array
+    {
+        if (null === self::$kernel) {
+            self::bootKernel();
+        }
+
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        return [
+            $em->createQueryBuilder()
+                ->select('count(acp.id)')
+                ->from(AccompanyingPeriod::class, 'acp')
+                ->join('acp.scopes', 'acpscope'),
+        ];
+    }
+}

src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/SocialActionAggregatorTest.php

@@ -0,0 +1,61 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Tests\Export\Aggregator\AccompanyingCourseAggregators;
+
+use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\SocialActionAggregator;
+use Doctrine\ORM\EntityManagerInterface;
+
+/**
+ * @internal
+ * @coversNothing
+ */
+final class SocialActionAggregatorTest extends AbstractAggregatorTest
+{
+    private SocialActionAggregator $aggregator;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+
+        $this->aggregator = self::$container->get('chill.person.export.aggregator_socialaction');
+    }
+
+    public function getAggregator()
+    {
+        return $this->aggregator;
+    }
+
+    public function getFormData(): array
+    {
+        return [
+            [],
+        ];
+    }
+
+    public function getQueryBuilders(): array
+    {
+        if (null === self::$kernel) {
+            self::bootKernel();
+        }
+
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        return [
+            $em->createQueryBuilder()
+                ->select('count(acp.id)')
+                ->from(AccompanyingPeriod::class, 'acp')
+                ->join('acp.works', 'acpw'),
+        ];
+    }
+}

src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/SocialIssueAggregatorTest.php

@@ -0,0 +1,61 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Tests\Export\Aggregator\AccompanyingCourseAggregators;
+
+use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\SocialIssueAggregator;
+use Doctrine\ORM\EntityManagerInterface;
+
+/**
+ * @internal
+ * @coversNothing
+ */
+final class SocialIssueAggregatorTest extends AbstractAggregatorTest
+{
+    private SocialIssueAggregator $aggregator;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+
+        $this->aggregator = self::$container->get('chill.person.export.aggregator_socialissue');
+    }
+
+    public function getAggregator()
+    {
+        return $this->aggregator;
+    }
+
+    public function getFormData(): array
+    {
+        return [
+            [],
+        ];
+    }
+
+    public function getQueryBuilders(): array
+    {
+        if (null === self::$kernel) {
+            self::bootKernel();
+        }
+
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        return [
+            $em->createQueryBuilder()
+                ->select('count(acp.id)')
+                ->from(AccompanyingPeriod::class, 'acp')
+                ->join('acp.socialIssues', 'acpsocialissue'),
+        ];
+    }
+}

src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingCourseAggregators/StepAggregatorTest.php

@@ -0,0 +1,63 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Tests\Export\Aggregator\AccompanyingCourseAggregators;
+
+use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators\StepAggregator;
+use DateTime;
+use Doctrine\ORM\EntityManagerInterface;
+
+/**
+ * @internal
+ * @coversNothing
+ */
+final class StepAggregatorTest extends AbstractAggregatorTest
+{
+    private StepAggregator $aggregator;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+
+        $this->aggregator = self::$container->get('chill.person.export.aggregator_step');
+    }
+
+    public function getAggregator()
+    {
+        return $this->aggregator;
+    }
+
+    public function getFormData(): array
+    {
+        return [
+            [
+                'on_date' => DateTime::createFromFormat('Y-m-d', '2022-01-01'),
+            ],
+        ];
+    }
+
+    public function getQueryBuilders(): array
+    {
+        if (null === self::$kernel) {
+            self::bootKernel();
+        }
+
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        return [
+            $em->createQueryBuilder()
+                ->select('count(acp.id)')
+                ->from(AccompanyingPeriod::class, 'acp'),
+        ];
+    }
+}

src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/EvaluationAggregators/EvaluationTypeAggregatorTest.php

@@ -0,0 +1,62 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Tests\Export\Aggregator\EvaluationAggregators;
+
+use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Export\Aggregator\EvaluationAggregators\EvaluationTypeAggregator;
+use Doctrine\ORM\EntityManagerInterface;
+
+/**
+ * @internal
+ * @coversNothing
+ */
+final class EvaluationTypeAggregatorTest extends AbstractAggregatorTest
+{
+    private EvaluationTypeAggregator $aggregator;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+
+        $this->aggregator = self::$container->get('chill.person.export.aggregator_evaluationtype');
+    }
+
+    public function getAggregator()
+    {
+        return $this->aggregator;
+    }
+
+    public function getFormData(): array
+    {
+        return [
+            [],
+        ];
+    }
+
+    public function getQueryBuilders(): array
+    {
+        if (null === self::$kernel) {
+            self::bootKernel();
+        }
+
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        return [
+            $em->createQueryBuilder()
+                ->select('count(acp.id)')
+                ->from(AccompanyingPeriod::class, 'acp')
+                ->join('acp.works', 'acpw')
+                ->join('acpw.accompanyingPeriodWorkEvaluations', 'workeval'),
+        ];
+    }
+}

src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/HouseholdAggregators/ChildrenNumberAggregatorTest.php

@@ -0,0 +1,68 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Tests\Export\Aggregator\HouseholdAggregators;
+
+use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Export\Aggregator\HouseholdAggregators\ChildrenNumberAggregator;
+use DateTime;
+use Doctrine\ORM\EntityManagerInterface;
+
+/**
+ * @internal
+ * @coversNothing
+ */
+final class ChildrenNumberAggregatorTest extends AbstractAggregatorTest
+{
+    private ChildrenNumberAggregator $aggregator;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+
+        $this->aggregator = self::$container->get('chill.person.export.aggregator_household_childrennumber');
+    }
+
+    public function getAggregator()
+    {
+        return $this->aggregator;
+    }
+
+    public function getFormData(): array
+    {
+        return [
+            [
+                'on_date' => DateTime::createFromFormat('Y-m-d', '2022-07-01'),
+            ],
+        ];
+    }
+
+    public function getQueryBuilders(): array
+    {
+        if (null === self::$kernel) {
+            self::bootKernel();
+        }
+
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        return [
+            $em->createQueryBuilder()
+                ->select('count(acp.id)')
+                ->from(AccompanyingPeriod::class, 'acp')
+                ->join('acp.participations', 'acppart')
+                ->join('acppart.person', 'partperson')
+                ->join('partperson.householdParticipations', 'member')
+                ->join('member.household', 'household')
+                ->join('household.compositions', 'composition'),
+        ];
+    }
+}

src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/HouseholdAggregators/CompositionAggregatorTest.php

@@ -0,0 +1,68 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Tests\Export\Aggregator\HouseholdAggregators;
+
+use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Export\Aggregator\HouseholdAggregators\CompositionAggregator;
+use DateTime;
+use Doctrine\ORM\EntityManagerInterface;
+
+/**
+ * @internal
+ * @coversNothing
+ */
+final class CompositionAggregatorTest extends AbstractAggregatorTest
+{
+    private CompositionAggregator $aggregator;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+
+        $this->aggregator = self::$container->get('chill.person.export.aggregator_household_composition');
+    }
+
+    public function getAggregator()
+    {
+        return $this->aggregator;
+    }
+
+    public function getFormData(): array
+    {
+        return [
+            [
+                'on_date' => DateTime::createFromFormat('Y-m-d', '2022-07-01'),
+            ],
+        ];
+    }
+
+    public function getQueryBuilders(): array
+    {
+        if (null === self::$kernel) {
+            self::bootKernel();
+        }
+
+        $em = self::$container->get(EntityManagerInterface::class);
+
+        return [
+            $em->createQueryBuilder()
+                ->select('count(acp.id)')
+                ->from(AccompanyingPeriod::class, 'acp')
+                ->join('acp.participations', 'acppart')
+                ->join('acppart.person', 'partperson')
+                ->join('partperson.householdParticipations', 'member')
+                ->join('member.household', 'household')
+                ->join('household.compositions', 'composition'),
+        ];
+    }
+}