merge exports branch into calendar branch

src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseController.php

@@ -177,7 +177,7 @@ class AccompanyingCourseController extends Controller
      */
     public function editAction(AccompanyingPeriod $accompanyingCourse): Response
     {
-        $this->denyAccessUnlessGranted(AccompanyingPeriodVoter::SEE, $accompanyingCourse);
+        $this->denyAccessUnlessGranted(AccompanyingPeriodVoter::EDIT, $accompanyingCourse);
 
         return $this->render('@ChillPerson/AccompanyingCourse/edit.html.twig', [
             'accompanyingCourse' => $accompanyingCourse,
@@ -215,7 +215,7 @@ class AccompanyingCourseController extends Controller
         // get persons without household
         $withoutHousehold = [];
 
-        foreach ($accompanyingCourse->getParticipations() as $p) {
+        foreach ($accompanyingCourse->getCurrentParticipations() as $p) {
             if (false === $p->getPerson()->isSharingHousehold()) {
                 $withoutHousehold[] = $p->getPerson();
             }

src/Bundle/ChillPersonBundle/Controller/HouseholdCompositionTypeController.php

@@ -0,0 +1,26 @@
+<?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\Controller;
+
+use Chill\MainBundle\CRUD\Controller\CRUDController;
+use Chill\MainBundle\Pagination\PaginatorInterface;
+use Symfony\Component\HttpFoundation\Request;
+
+class HouseholdCompositionTypeController extends CRUDController
+{
+    protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator)
+    {
+        $query->addOrderBy('e.id', 'ASC');
+
+        return parent::orderQuery($action, $query, $request, $paginator);
+    }
+}

src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php

@@ -75,7 +75,6 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
         $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__ . '/../config'));
         $loader->load('services.yaml');
         $loader->load('services/widgets.yaml');
-        $loader->load('services/exports.yaml');
         $loader->load('services/fixtures.yaml');
         $loader->load('services/controller.yaml');
         $loader->load('services/search.yaml');
@@ -95,9 +94,15 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
         $loader->load('services/doctrineEventListener.yaml');
         $loader->load('services/accompanyingPeriodConsistency.yaml');
 
+        $loader->load('services/exports_person.yaml');
+
         if ($container->getParameter('chill_person.accompanying_period') !== 'hidden') {
             $loader->load('services/exports_accompanying_period.yaml');
         }
+        $loader->load('services/exports_accompanying_course.yaml');
+        $loader->load('services/exports_social_actions.yaml');
+        $loader->load('services/exports_evaluation.yaml');
+        $loader->load('services/exports_household.yaml');
     }
 
     /**
@@ -227,6 +232,27 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
                         ],
                     ],
                 ],
+                [
+                    'class' => \Chill\PersonBundle\Entity\Household\HouseholdCompositionType::class,
+                    'name' => 'person_household_composition_type',
+                    'base_path' => '/admin/person/household/composition-type',
+                    'form_class' => \Chill\PersonBundle\Form\HouseholdCompositionTypeType::class,
+                    'controller' => \Chill\PersonBundle\Controller\HouseholdCompositionTypeController::class,
+                    'actions' => [
+                        'index' => [
+                            'role' => 'ROLE_ADMIN',
+                            'template' => '@ChillPerson/HouseholdCompositionType/index.html.twig',
+                        ],
+                        'new' => [
+                            'role' => 'ROLE_ADMIN',
+                            'template' => '@ChillPerson/HouseholdCompositionType/new.html.twig',
+                        ],
+                        'edit' => [
+                            'role' => 'ROLE_ADMIN',
+                            'template' => '@ChillPerson/HouseholdCompositionType/edit.html.twig',
+                        ],
+                    ],
+                ],
                 [
                     'class' => \Chill\PersonBundle\Entity\Relationships\Relation::class,
                     'name' => 'person_relation',

src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/Comment.php

@@ -36,49 +36,49 @@ class Comment implements TrackCreationInterface, TrackUpdateInterface
      * inversedBy="comments")
      * @ORM\JoinColumn(nullable=false, onDelete="CASCADE")
      */
-    private $accompanyingPeriod;
+    private ?AccompanyingPeriod $accompanyingPeriod;
 
     /**
      * @ORM\Column(type="text")
-     * @Groups({"read", "write"})
+     * @Groups({"read", "write", "docgen:read"})
      * @Assert\NotBlank
      * @Assert\NotNull
      */
-    private $content;
+    private ?string $content;
 
     /**
      * @ORM\Column(type="datetime")
-     * @Groups({"read"})
+     * @Groups({"read", "docgen:read"})
      */
-    private $createdAt;
+    private ?DateTimeInterface $createdAt;
 
     /**
      * @ORM\ManyToOne(targetEntity=User::class)
      * @ORM\JoinColumn(nullable=false)
-     * @Groups({"read"})
+     * @Groups({"read", "docgen:read"})
      */
-    private $creator;
+    private ?User $creator;
 
     /**
      * @ORM\Id
      * @ORM\GeneratedValue
      * @ORM\Column(type="integer")
-     * @Groups({"read"})
+     * @Groups({"read", "docgen:read"})
      */
-    private $id;
+    private ?int $id;
 
     /**
      * @ORM\Column(type="datetime")
      * @Groups({"read"})
      */
-    private $updatedAt;
+    private ?DateTimeInterface $updatedAt;
 
     /**
      * @ORM\ManyToOne(targetEntity=User::class)
      * @ORM\JoinColumn(nullable=false)
      * @Groups({"read"})
      */
-    private $updatedBy;
+    private ?User $updatedBy;
 
     public function getAccompanyingPeriod(): ?AccompanyingPeriod
     {

src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/Resource.php

@@ -47,7 +47,7 @@ class Resource
 
     /**
      * @ORM\Column(type="text", nullable=true)
-     * @Groups({"read"})
+     * @Groups({"read", "docgen:read"})
      */
     private ?string $comment = '';
 

src/Bundle/ChillPersonBundle/Entity/Household/Household.php

@@ -14,6 +14,7 @@ namespace Chill\PersonBundle\Entity\Household;
 use ArrayIterator;
 use Chill\MainBundle\Entity\Address;
 use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable;
+use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Validator\Constraints\Household\MaxHolder;
 use DateTime;
 use DateTimeImmutable;
@@ -354,7 +355,12 @@ class Household
         return $this->members;
     }
 
-    public function getMembersDuringMembership(HouseholdMember $membership)
+    /**
+     * get all the members during a given membership.
+     *
+     * @return Collection|HouseholdMember[]
+     */
+    public function getMembersDuringMembership(HouseholdMember $membership): Collection
     {
         return $this->getMembersOnRange(
             $membership->getStartDate(),
@@ -441,6 +447,28 @@ class Household
         return $this->getNonCurrentMembers($now)->matching($criteria);
     }
 
+    /**
+     * get all the unique persons during a given membership.
+     *
+     * same as @see(self::getMembersDuringMembership}, except that the collection is filtered to
+     * return unique members.
+     *
+     * @return Collection|Person[]
+     */
+    public function getPersonsDuringMembership(HouseholdMember $member): Collection
+    {
+        // make list unique
+        $membersByHash = [];
+
+        foreach ($this->getMembersDuringMembership($member) as $m) {
+            if (null !== $m && null !== $m->getPerson()) {
+                $membersByHash[spl_object_hash($m->getPerson())] = $m->getPerson();
+            }
+        }
+
+        return new ArrayCollection(array_values($membersByHash));
+    }
+
     public function getPreviousAddressOf(Address $address): ?Address
     {
         $iterator = new ArrayIterator($this->getAddressesOrdered());

src/Bundle/ChillPersonBundle/Entity/MaritalStatus.php

@@ -31,7 +31,6 @@ class MaritalStatus
     private ?string $id;
 
     /**
-     * @var string array
      * @ORM\Column(type="json")
      */
     private array $name;

src/Bundle/ChillPersonBundle/Entity/Person.php

@@ -1192,7 +1192,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
     }
 
     /**
-     * @deprecated Use @link{Person::getCurrentPersonAddress} or @link{Person::getCurrentHouseholdAddress} instead
+     * @deprecated Use @see{Person::getCurrentPersonAddress} or @see{Person::getCurrentHouseholdAddress} instead
      *
      * @throws Exception
      *

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

@@ -0,0 +1,87 @@
+<?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\Repository\LocationRepository;
+use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Chill\PersonBundle\Export\Declarations;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\FormBuilderInterface;
+
+class AdministrativeLocationAggregator implements AggregatorInterface
+{
+    private LocationRepository $locationRepository;
+
+    private TranslatableStringHelper $translatableStringHelper;
+
+    public function __construct(
+        LocationRepository $locationRepository,
+        TranslatableStringHelper $translatableStringHelper
+    ) {
+        $this->locationRepository = $locationRepository;
+        $this->translatableStringHelper = $translatableStringHelper;
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        $qb->join('acp.administrativeLocation', 'al');
+
+        $qb->addSelect('IDENTITY(acp.administrativeLocation) AS location_aggregator');
+
+        $groupBy = $qb->getDQLPart('groupBy');
+
+        if (!empty($groupBy)) {
+            $qb->addGroupBy('location_aggregator');
+        } else {
+            $qb->groupBy('location_aggregator');
+        }
+    }
+
+    public function applyOn(): string
+    {
+        return Declarations::ACP_TYPE;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        // no form
+    }
+
+    public function getLabels($key, array $values, $data)
+    {
+        return function ($value): string {
+            if ('_header' === $value) {
+                return 'Administrative location';
+            }
+
+            $l = $this->locationRepository->find($value);
+
+            return $l->getName() . ' (' . $this->translatableStringHelper->localize($l->getLocationType()->getTitle()) . ')';
+        };
+    }
+
+    public function getQueryKeys($data): array
+    {
+        return ['location_aggregator'];
+    }
+
+    public function getTitle()
+    {
+        return 'Group by administrative location';
+    }
+}

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

@@ -0,0 +1,90 @@
+<?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\Templating\TranslatableStringHelper;
+use Chill\PersonBundle\Entity\AccompanyingPeriod\ClosingMotive;
+use Chill\PersonBundle\Export\Declarations;
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\FormBuilderInterface;
+
+class ClosingMotiveAggregator implements AggregatorInterface
+{
+    private EntityManagerInterface $em;
+
+    private TranslatableStringHelper $translatableStringHelper;
+
+    public function __construct(
+        EntityManagerInterface $em,
+        TranslatableStringHelper $translatableStringHelper
+    ) {
+        $this->motiveRepository = $em->getRepository(ClosingMotive::class);
+        $this->translatableStringHelper = $translatableStringHelper;
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        $qb->join('acp.closingMotive', 'cm');
+
+        $qb->addSelect('IDENTITY(acp.closingMotive) AS closingmotive_aggregator');
+
+        $groupBy = $qb->getDQLPart('groupBy');
+
+        if (!empty($groupBy)) {
+            $qb->addGroupBy('closingmotive_aggregator');
+        } else {
+            $qb->groupBy('closingmotive_aggregator');
+        }
+    }
+
+    public function applyOn(): string
+    {
+        return Declarations::ACP_TYPE;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        // no form
+    }
+
+    public function getLabels($key, array $values, $data)
+    {
+        return function ($value): string {
+            if ('_header' === $value) {
+                return 'Closing motive';
+            }
+
+            $cm = $this->motiveRepository->find($value);
+
+            return $this->translatableStringHelper->localize(
+                $cm->getName()
+            );
+        };
+    }
+
+    public function getQueryKeys($data)
+    {
+        return ['closingmotive_aggregator'];
+    }
+
+    public function getTitle(): string
+    {
+        return 'Group by closing motive';
+    }
+}

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

@@ -0,0 +1,89 @@
+<?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\PersonBundle\Export\Declarations;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
+
+class ConfidentialAggregator implements AggregatorInterface
+{
+    private TranslatorInterface $translator;
+
+    public function __construct(
+        TranslatorInterface $translator
+    ) {
+        $this->translator = $translator;
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    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');
+        }
+    }
+
+    public function applyOn(): string
+    {
+        return Declarations::ACP_TYPE;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        // no form
+    }
+
+    public function getLabels($key, array $values, $data)
+    {
+        return function ($value): string {
+            if ('_header' === $value) {
+                return 'Confidentiality';
+            }
+
+            switch ($value) {
+                case true:
+                    return $this->translator->trans('is confidential');
+
+                case false:
+                    return $this->translator->trans('is not confidential');
+
+                default:
+                    throw new LogicException(sprintf('The value %s is not valid', $value));
+            }
+
+            return $value;
+        };
+    }
+
+    public function getQueryKeys($data): array
+    {
+        return ['confidential_aggregator'];
+    }
+
+    public function getTitle(): string
+    {
+        return 'Group by confidential';
+    }
+}

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

@@ -0,0 +1,96 @@
+<?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\PersonBundle\Export\Declarations;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
+
+final class DurationAggregator implements AggregatorInterface
+{
+    private TranslatorInterface $translator;
+
+    public function __construct(TranslatorInterface $translator)
+    {
+        $this->translator = $translator;
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        $qb->addSelect(
+            '
+            (acp.closingDate - acp.openingDate +15) *12/365
+            AS duration_aggregator'
+        );
+
+        // TODO Pour avoir un interval plus précis (nécessaire ?):
+        // adapter la fonction extract pour pouvoir l'utiliser avec des intervals: extract(month from interval)
+        // 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');
+    }
+
+    public function applyOn(): string
+    {
+        return Declarations::ACP_TYPE;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        // no form
+    }
+
+    public function getLabels($key, array $values, $data)
+    {
+        return function ($value): ?string {
+            if ('_header' === $value) {
+                return 'Rounded month duration';
+            }
+
+            if (null === $value) {
+                return $this->translator->trans('current duration'); // when closingDate is null
+            }
+
+            if (0 === $value) {
+                return $this->translator->trans('duration 0 month');
+            }
+
+            return $value . $this->translator->trans(' months');
+        };
+    }
+
+    public function getQueryKeys($data): array
+    {
+        return ['duration_aggregator'];
+    }
+
+    public function getTitle(): string
+    {
+        return 'Group by duration';
+    }
+}

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

@@ -0,0 +1,89 @@
+<?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\PersonBundle\Export\Declarations;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
+
+class EmergencyAggregator implements AggregatorInterface
+{
+    private TranslatorInterface $translator;
+
+    public function __construct(
+        TranslatorInterface $translator
+    ) {
+        $this->translator = $translator;
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    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');
+        }
+    }
+
+    public function applyOn(): string
+    {
+        return Declarations::ACP_TYPE;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        // no form
+    }
+
+    public function getLabels($key, array $values, $data)
+    {
+        return function ($value): string {
+            if ('_header' === $value) {
+                return 'Emergency';
+            }
+
+            switch ($value) {
+                case true:
+                    return $this->translator->trans('is emergency');
+
+                case false:
+                    return $this->translator->trans('is not emergency');
+
+                default:
+                    throw new LogicException(sprintf('The value %s is not valid', $value));
+            }
+
+            return $value;
+        };
+    }
+
+    public function getQueryKeys($data): array
+    {
+        return ['emergency_aggregator'];
+    }
+
+    public function getTitle(): string
+    {
+        return 'Group by emergency';
+    }
+}

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

@@ -0,0 +1,93 @@
+<?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\Templating\TranslatableStringHelper;
+use Chill\PersonBundle\Export\Declarations;
+use Chill\PersonBundle\Repository\SocialWork\EvaluationRepository;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\FormBuilderInterface;
+use function in_array;
+
+final class EvaluationAggregator implements AggregatorInterface
+{
+    private EvaluationRepository $evaluationRepository;
+
+    private TranslatableStringHelper $translatableStringHelper;
+
+    public function __construct(
+        EvaluationRepository $evaluationRepository,
+        TranslatableStringHelper $translatableStringHelper
+    ) {
+        $this->evaluationRepository = $evaluationRepository;
+        $this->translatableStringHelper = $translatableStringHelper;
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        if (!in_array('acpw', $qb->getAllAliases(), true)) {
+            $qb->join('acp.works', 'acpw');
+        }
+        $qb->join('acpw.accompanyingPeriodWorkEvaluations', 'we');
+
+        $qb->addSelect('IDENTITY(we.evaluation) AS evaluation_aggregator');
+
+        $groupby = $qb->getDQLPart('groupBy');
+
+        if (!empty($groupBy)) {
+            $qb->addGroupBy('evaluation_aggregator');
+        } else {
+            $qb->groupBy('evaluation_aggregator');
+        }
+    }
+
+    public function applyOn(): string
+    {
+        return Declarations::ACP_TYPE;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        // no form
+    }
+
+    public function getLabels($key, array $values, $data)
+    {
+        return function ($value): string {
+            if ('_header' === $value) {
+                return 'Evaluation';
+            }
+
+            $e = $this->evaluationRepository->find($value);
+
+            return $this->translatableStringHelper->localize(
+                $e->getTitle()
+            );
+        };
+    }
+
+    public function getQueryKeys($data): array
+    {
+        return ['evaluation_aggregator'];
+    }
+
+    public function getTitle(): string
+    {
+        return 'Group by evaluation';
+    }
+}

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

@@ -0,0 +1,87 @@
+<?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\PersonBundle\Export\Declarations;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
+
+class IntensityAggregator implements AggregatorInterface
+{
+    private TranslatorInterface $translator;
+
+    public function __construct(
+        TranslatorInterface $translator
+    ) {
+        $this->translator = $translator;
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    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');
+        }
+    }
+
+    public function applyOn(): string
+    {
+        return Declarations::ACP_TYPE;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        // no form
+    }
+
+    public function getLabels($key, array $values, $data)
+    {
+        return function ($value): string {
+            if ('_header' === $value) {
+                return 'Intensity';
+            }
+
+            switch ($value) {
+                case 'occasional':
+                    return $this->translator->trans('is occasional');
+
+                case 'regular':
+                    return $this->translator->trans('is regular');
+
+                default:
+                    throw new LogicException(sprintf('The value %s is not valid', $value));
+            }
+        };
+    }
+
+    public function getQueryKeys($data): array
+    {
+        return ['intensity_aggregator'];
+    }
+
+    public function getTitle(): string
+    {
+        return 'Group by intensity';
+    }
+}

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

@@ -0,0 +1,89 @@
+<?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\Repository\UserJobRepository;
+use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Chill\PersonBundle\Export\Declarations;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\FormBuilderInterface;
+
+final class JobAggregator implements AggregatorInterface
+{
+    private UserJobRepository $jobRepository;
+
+    private TranslatableStringHelper $translatableStringHelper;
+
+    public function __construct(
+        UserJobRepository $jobRepository,
+        TranslatableStringHelper $translatableStringHelper
+    ) {
+        $this->jobRepository = $jobRepository;
+        $this->translatableStringHelper = $translatableStringHelper;
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        $qb->join('acp.job', 'j');
+
+        $qb->addSelect('IDENTITY(acp.job) AS job_aggregator');
+
+        $groupBy = $qb->getDQLPart('groupBy');
+
+        if (!empty($groupBy)) {
+            $qb->addGroupBy('job_aggregator');
+        } else {
+            $qb->groupBy('job_aggregator');
+        }
+    }
+
+    public function applyOn(): string
+    {
+        return Declarations::ACP_TYPE;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        // no form
+    }
+
+    public function getLabels($key, array $values, $data)
+    {
+        return function ($value): string {
+            if ('_header' === $value) {
+                return 'Job';
+            }
+
+            $j = $this->jobRepository->find($value);
+
+            return $this->translatableStringHelper->localize(
+                $j->getLabel()
+            );
+        };
+    }
+
+    public function getQueryKeys($data): array
+    {
+        return ['job_aggregator'];
+    }
+
+    public function getTitle(): string
+    {
+        return 'Group by user job';
+    }
+}

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

@@ -0,0 +1,91 @@
+<?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\Templating\TranslatableStringHelper;
+use Chill\PersonBundle\Entity\AccompanyingPeriod\Origin;
+use Chill\PersonBundle\Export\Declarations;
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\EntityRepository;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\FormBuilderInterface;
+
+final class OriginAggregator implements AggregatorInterface
+{
+    private EntityRepository $repository;
+
+    private TranslatableStringHelper $translatableStringHelper;
+
+    public function __construct(
+        EntityManagerInterface $em,
+        TranslatableStringHelper $translatableStringHelper
+    ) {
+        $this->repository = $em->getRepository(Origin::class);
+        $this->translatableStringHelper = $translatableStringHelper;
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        $qb->join('acp.origin', 'o');
+
+        $qb->addSelect('o.id AS origin_aggregator');
+
+        $groupby = $qb->getDQLPart('groupBy');
+
+        if (!empty($groupBy)) {
+            $qb->addGroupBy('origin_aggregator');
+        } else {
+            $qb->groupBy('origin_aggregator');
+        }
+    }
+
+    public function applyOn(): string
+    {
+        return Declarations::ACP_TYPE;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        // no form
+    }
+
+    public function getLabels($key, array $values, $data)
+    {
+        return function ($value): string {
+            if ('_header' === $value) {
+                return 'Origin';
+            }
+
+            $o = $this->repository->find($value);
+
+            return $this->translatableStringHelper->localize(
+                $o->getLabel()
+            );
+        };
+    }
+
+    public function getQueryKeys($data): array
+    {
+        return ['origin_aggregator'];
+    }
+
+    public function getTitle(): string
+    {
+        return 'Group by origin';
+    }
+}

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

@@ -0,0 +1,87 @@
+<?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\Repository\UserRepository;
+use Chill\MainBundle\Templating\Entity\UserRender;
+use Chill\PersonBundle\Export\Declarations;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\FormBuilderInterface;
+
+final class ReferrerAggregator implements AggregatorInterface
+{
+    private UserRender $userRender;
+
+    private UserRepository $userRepository;
+
+    public function __construct(
+        UserRepository $userRepository,
+        UserRender $userRender
+    ) {
+        $this->userRepository = $userRepository;
+        $this->userRender = $userRender;
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        $qb->join('acp.user', 'u');
+
+        $qb->addSelect('u.id AS referrer_aggregator');
+
+        $groupBy = $qb->getDQLPart('groupBy');
+
+        if (!empty($groupBy)) {
+            $qb->addGroupBy('referrer_aggregator');
+        } else {
+            $qb->groupBy('referrer_aggregator');
+        }
+    }
+
+    public function applyOn(): string
+    {
+        return Declarations::ACP_TYPE;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        // no form
+    }
+
+    public function getLabels($key, array $values, $data)
+    {
+        return function ($value): string {
+            if ('_header' === $value) {
+                return 'Referrer';
+            }
+
+            $r = $this->userRepository->find($value);
+
+            return $this->userRender->renderString($r, []);
+        };
+    }
+
+    public function getQueryKeys($data): array
+    {
+        return ['referrer_aggregator'];
+    }
+
+    public function getTitle(): string
+    {
+        return 'Group by referrers';
+    }
+}

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

@@ -0,0 +1,101 @@
+<?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\PersonBundle\Export\Declarations;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
+use function in_array;
+
+final class RequestorAggregator implements AggregatorInterface
+{
+    private TranslatorInterface $translator;
+
+    public function __construct(
+        TranslatorInterface $translator
+    ) {
+        $this->translator = $translator;
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        if (!in_array('part', $qb->getAllAliases(), true)) {
+            $qb->join('acp.participations', 'part');
+        }
+
+        $qb->addSelect("
+            ( CASE
+                WHEN acp.requestorPerson IS NOT NULL
+                THEN
+                    ( CASE
+                        WHEN acp.requestorPerson = part.person
+                        THEN 'is person concerned'
+                        ELSE 'is other person'
+                    END )
+                ELSE
+                    ( CASE
+                        WHEN acp.requestorThirdParty IS NOT NULL
+                        THEN 'is thirdparty'
+                        ELSE 'no requestor'
+                    END )
+            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 !
+    }
+
+    public function applyOn(): string
+    {
+        return Declarations::ACP_TYPE;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        // no form
+    }
+
+    public function getLabels($key, array $values, $data)
+    {
+        return function ($value): string {
+            if ('_header' === $value) {
+                return 'Requestor';
+            }
+
+            return $this->translator->trans($value);
+        };
+    }
+
+    public function getQueryKeys($data): array
+    {
+        return ['requestor_aggregator'];
+    }
+
+    public function getTitle(): string
+    {
+        return 'Group by requestor';
+    }
+}

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

@@ -0,0 +1,89 @@
+<?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\Repository\ScopeRepository;
+use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Chill\PersonBundle\Export\Declarations;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\FormBuilderInterface;
+
+final class ScopeAggregator implements AggregatorInterface
+{
+    private ScopeRepository $scopeRepository;
+
+    private TranslatableStringHelper $translatableStringHelper;
+
+    public function __construct(
+        ScopeRepository $scopeRepository,
+        TranslatableStringHelper $translatableStringHelper
+    ) {
+        $this->scopeRepository = $scopeRepository;
+        $this->translatableStringHelper = $translatableStringHelper;
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        $qb->join('acp.scopes', 's');
+
+        $qb->addSelect('s.id as scope_aggregator');
+
+        $groupBy = $qb->getDQLPart('groupBy');
+
+        if (!empty($groupBy)) {
+            $qb->addGroupBy('scope_aggregator');
+        } else {
+            $qb->groupBy('scope_aggregator');
+        }
+    }
+
+    public function applyOn(): string
+    {
+        return Declarations::ACP_TYPE;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        // no form
+    }
+
+    public function getLabels($key, array $values, $data)
+    {
+        return function ($value): string {
+            if ('_header' === $value) {
+                return 'Scope';
+            }
+
+            $s = $this->scopeRepository->find($value);
+
+            return $this->translatableStringHelper->localize(
+                $s->getName()
+            );
+        };
+    }
+
+    public function getQueryKeys($data): array
+    {
+        return ['scope_aggregator'];
+    }
+
+    public function getTitle(): string
+    {
+        return 'Group by user scope';
+    }
+}

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

@@ -0,0 +1,90 @@
+<?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\PersonBundle\Export\Declarations;
+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 SocialActionAggregator implements AggregatorInterface
+{
+    private SocialActionRender $actionRender;
+
+    private SocialActionRepository $actionRepository;
+
+    public function __construct(
+        SocialActionRender $actionRender,
+        SocialActionRepository $actionRepository
+    ) {
+        $this->actionRender = $actionRender;
+        $this->actionRepository = $actionRepository;
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        if (!in_array('acpw', $qb->getAllAliases(), true)) {
+            $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');
+        }
+    }
+
+    public function applyOn(): string
+    {
+        return Declarations::ACP_TYPE;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        // no form
+    }
+
+    public function getLabels($key, array $values, $data)
+    {
+        return function ($value) {
+            if ('_header' === $value) {
+                return 'Social action';
+            }
+
+            $sa = $this->actionRepository->find($value);
+
+            return $this->actionRender->renderString($sa, []);
+        };
+    }
+
+    public function getQueryKeys($data): array
+    {
+        return ['socialaction_aggregator'];
+    }
+
+    public function getTitle(): string
+    {
+        return 'Group by social action';
+    }
+}

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

@@ -0,0 +1,86 @@
+<?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\PersonBundle\Export\Declarations;
+use Chill\PersonBundle\Repository\SocialWork\SocialIssueRepository;
+use Chill\PersonBundle\Templating\Entity\SocialIssueRender;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\FormBuilderInterface;
+
+final class SocialIssueAggregator implements AggregatorInterface
+{
+    private SocialIssueRender $issueRender;
+
+    private SocialIssueRepository $issueRepository;
+
+    public function __construct(
+        SocialIssueRepository $issueRepository,
+        SocialIssueRender $issueRender
+    ) {
+        $this->issueRepository = $issueRepository;
+        $this->issueRender = $issueRender;
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        $qb->join('acp.socialIssues', 'si');
+        $qb->addSelect('si.id as socialissue_aggregator');
+
+        $groupBy = $qb->getDQLPart('groupBy');
+
+        if (!empty($groupBy)) {
+            $qb->addGroupBy('socialissue_aggregator');
+        } else {
+            $qb->groupBy('socialissue_aggregator');
+        }
+    }
+
+    public function applyOn(): string
+    {
+        return Declarations::ACP_TYPE;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        // no form
+    }
+
+    public function getLabels($key, array $values, $data)
+    {
+        return function ($value): string {
+            if ('_header' === $value) {
+                return 'Social issues';
+            }
+
+            $i = $this->issueRepository->find($value);
+
+            return $this->issueRender->renderString($i, []);
+        };
+    }
+
+    public function getQueryKeys($data): array
+    {
+        return ['socialissue_aggregator'];
+    }
+
+    public function getTitle(): string
+    {
+        return 'Group by social issue';
+    }
+}

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

@@ -0,0 +1,130 @@
+<?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\Export\FilterInterface;
+use Chill\MainBundle\Form\Type\ChillDateType;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+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;
+use Symfony\Contracts\Translation\TranslatorInterface;
+
+final class StepAggregator implements AggregatorInterface //, FilterInterface
+{
+    private TranslatorInterface $translator;
+
+    public function __construct(
+        TranslatorInterface $translator
+    ) {
+        $this->translator = $translator;
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        $qb->addSelect('acp.step AS 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');
+
+        $clause = $qb->expr()->andX(
+            $qb->expr()->lte('acp.openingDate', ':ondate'),
+            $qb->expr()->orX(
+                $qb->expr()->gt('acp.closingDate', ':ondate'),
+                $qb->expr()->isNull('acp.closingDate')
+            )
+        );
+
+        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);
+    }
+
+    public function applyOn(): string
+    {
+        return Declarations::ACP_TYPE;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        $builder->add('on_date', ChillDateType::class, [
+            'data' => new DateTime(),
+        ]);
+    }
+
+    public function getLabels($key, array $values, $data)
+    {
+        return function ($value): string {
+            switch ($value) {
+                case AccompanyingPeriod::STEP_DRAFT:
+                    return $this->translator->trans('Draft');
+
+                case AccompanyingPeriod::STEP_CONFIRMED:
+                    return $this->translator->trans('Confirmed');
+
+                case AccompanyingPeriod::STEP_CLOSED:
+                    return $this->translator->trans('Closed');
+
+                case '_header':
+                    return 'Step';
+
+                default:
+                    throw new LogicException(sprintf('The value %s is not valid', $value));
+            }
+        };
+    }
+
+    public function getQueryKeys($data): array
+    {
+        return ['step_aggregator'];
+    }
+
+    public function getTitle(): string
+    {
+        return 'Group by step';
+    }
+
+    /*
+     * TODO check if we need to add FilterInterface and DescribeAction Method to describe date filter ??
+     *
+    public function describeAction($data, $format = 'string')
+    {
+        return [
+            "Filtered by actives courses: active on %ondate%", [
+                '%ondate%' => $data['on_date']->format('d-m-Y')
+            ]
+        ];
+    }
+     */
+}

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

@@ -0,0 +1,85 @@
+<?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\EvaluationAggregators;
+
+use Chill\MainBundle\Export\AggregatorInterface;
+use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Chill\PersonBundle\Export\Declarations;
+use Chill\PersonBundle\Repository\SocialWork\EvaluationRepository;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\FormBuilderInterface;
+
+class EvaluationTypeAggregator implements AggregatorInterface
+{
+    private EvaluationRepository $evaluationRepository;
+
+    private TranslatableStringHelper $translatableStringHelper;
+
+    public function __construct(
+        EvaluationRepository $evaluationRepository,
+        TranslatableStringHelper $translatableStringHelper
+    ) {
+        $this->evaluationRepository = $evaluationRepository;
+        $this->translatableStringHelper = $translatableStringHelper;
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    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');
+        }
+    }
+
+    public function applyOn(): string
+    {
+        return Declarations::EVAL_TYPE;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        // no form
+    }
+
+    public function getLabels($key, array $values, $data)
+    {
+        return function ($value): string {
+            if ('_header' === $value) {
+                return 'Evaluation type';
+            }
+
+            $ev = $this->evaluationRepository->find($value);
+
+            return $this->translatableStringHelper->localize($ev->getTitle());
+        };
+    }
+
+    public function getQueryKeys($data): array
+    {
+        return ['evaluationtype_aggregator'];
+    }
+
+    public function getTitle(): string
+    {
+        return 'Group by evaluation type';
+    }
+}

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

@@ -0,0 +1,114 @@
+<?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\HouseholdAggregators;
+
+use Chill\MainBundle\Export\AggregatorInterface;
+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;
+use Symfony\Contracts\Translation\TranslatorInterface;
+use function in_array;
+
+class ChildrenNumberAggregator implements AggregatorInterface
+{
+    private TranslatorInterface $translator;
+
+    public function __construct(
+        TranslatorInterface $translator
+    ) {
+        $this->translator = $translator;
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        if (!in_array('composition', $qb->getAllAliases(), true)) {
+            $qb->join('household.compositions', 'composition');
+        }
+
+        $qb->addSelect('composition.numberOfChildren AS 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);
+    }
+
+    public function applyOn(): string
+    {
+        return Declarations::HOUSEHOLD_TYPE;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        $builder->add('on_date', ChillDateType::class, [
+            'data' => new DateTime('now'),
+        ]);
+    }
+
+    public function getLabels($key, array $values, $data)
+    {
+        return function ($value): string {
+            if ('_header' === $value) {
+                return 'Number of children';
+            }
+
+            return $this->translator->trans(
+                'household_composition.numberOfChildren children in household',
+                [
+                    'numberOfChildren' => $value,
+                ]
+            );
+        };
+    }
+
+    public function getQueryKeys($data): array
+    {
+        return ['childrennumber_aggregator'];
+    }
+
+    public function getTitle(): string
+    {
+        return 'Group by number of children';
+    }
+}

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

@@ -0,0 +1,118 @@
+<?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\HouseholdAggregators;
+
+use Chill\MainBundle\Export\AggregatorInterface;
+use Chill\MainBundle\Form\Type\ChillDateType;
+use Chill\MainBundle\Templating\TranslatableStringHelper;
+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\QueryBuilder;
+use Symfony\Component\Form\FormBuilderInterface;
+use function in_array;
+
+class CompositionAggregator implements AggregatorInterface
+{
+    private TranslatableStringHelper $translatableStringHelper;
+
+    private HouseholdCompositionTypeRepository $typeRepository;
+
+    public function __construct(
+        HouseholdCompositionTypeRepository $typeRepository,
+        TranslatableStringHelper $translatableStringHelper
+    ) {
+        $this->typeRepository = $typeRepository;
+        $this->translatableStringHelper = $translatableStringHelper;
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        if (!in_array('composition', $qb->getAllAliases(), true)) {
+            $qb->join('household.compositions', 'composition');
+        }
+
+        $qb->addSelect('IDENTITY(composition.householdCompositionType) AS 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);
+    }
+
+    public function applyOn(): string
+    {
+        return Declarations::HOUSEHOLD_TYPE;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        $builder->add('on_date', ChillDateType::class, [
+            'data' => new DateTime('now'),
+        ]);
+    }
+
+    public function getLabels($key, array $values, $data)
+    {
+        return function ($value): string {
+            if ('_header' === $value) {
+                return 'Composition';
+            }
+
+            $c = $this->typeRepository->find($value);
+
+            return $this->translatableStringHelper->localize(
+                $c->getLabel()
+            );
+        };
+    }
+
+    public function getQueryKeys($data): array
+    {
+        return ['composition_aggregator'];
+    }
+
+    public function getTitle(): string
+    {
+        return 'Group by composition';
+    }
+}

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

@@ -9,13 +9,14 @@
 
 declare(strict_types=1);
 
-namespace Chill\PersonBundle\Export\Aggregator;
+namespace Chill\PersonBundle\Export\Aggregator\PersonAggregators;
 
 use Chill\MainBundle\Export\AggregatorInterface;
 use Chill\MainBundle\Export\ExportElementValidatedInterface;
 use DateTime;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\Extension\Core\Type\DateType;
+use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
@@ -28,7 +29,7 @@ final class AgeAggregator implements AggregatorInterface, ExportElementValidated
         $this->translator = $translator;
     }
 
-    public function addRole()
+    public function addRole(): ?string
     {
         return null;
     }
@@ -45,7 +46,7 @@ final class AgeAggregator implements AggregatorInterface, ExportElementValidated
         return 'person';
     }
 
-    public function buildForm(\Symfony\Component\Form\FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder)
     {
         $builder->add('date_age_calculation', DateType::class, [
             'label' => 'Calculate age in relation to this date',

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

@@ -9,13 +9,14 @@
 
 declare(strict_types=1);
 
-namespace Chill\PersonBundle\Export\Aggregator;
+namespace Chill\PersonBundle\Export\Aggregator\PersonAggregators;
 
 use Chill\MainBundle\Export\AggregatorInterface;
 use Chill\MainBundle\Export\ExportElementValidatedInterface;
 use Chill\MainBundle\Repository\CountryRepository;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Chill\MainBundle\Util\CountriesInfo;
+use Doctrine\ORM\Query;
 use Doctrine\ORM\QueryBuilder;
 use LogicException;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
@@ -41,7 +42,7 @@ final class CountryOfBirthAggregator implements AggregatorInterface, ExportEleme
         $this->translator = $translator;
     }
 
-    public function addRole()
+    public function addRole(): ?string
     {
         return null;
     }
@@ -122,7 +123,7 @@ final class CountryOfBirthAggregator implements AggregatorInterface, ExportEleme
                 ->andWhere($qb->expr()->in('c.countryCode', ':countries'))
                 ->setParameter('countries', $values)
                 ->getQuery()
-                ->getResult(\Doctrine\ORM\Query::HYDRATE_SCALAR);
+                ->getResult(Query::HYDRATE_SCALAR);
 
             // initialize array and add blank key for null values
             $labels = [

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

@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Chill\PersonBundle\Export\Aggregator;
+namespace Chill\PersonBundle\Export\Aggregator\PersonAggregators;
 
 use Chill\MainBundle\Export\AggregatorInterface;
 use Chill\PersonBundle\Entity\Person;
@@ -28,7 +28,7 @@ final class GenderAggregator implements AggregatorInterface
         $this->translator = $translator;
     }
 
-    public function addRole()
+    public function addRole(): ?string
     {
         return null;
     }

src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/HouseholdPositionAggregator.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\Aggregator\PersonAggregators;
+
+use Chill\MainBundle\Export\AggregatorInterface;
+use Chill\MainBundle\Export\ExportElementValidatedInterface;
+use Chill\MainBundle\Form\Type\ChillDateType;
+use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Chill\PersonBundle\Repository\Household\PositionRepository;
+use DateTime;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\Validator\Context\ExecutionContextInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
+
+final class HouseholdPositionAggregator implements AggregatorInterface, ExportElementValidatedInterface
+{
+    private PositionRepository $positionRepository;
+
+    private TranslatableStringHelper $translatableStringHelper;
+
+    private TranslatorInterface $translator;
+
+    public function __construct(TranslatorInterface $translator, TranslatableStringHelper $translatableStringHelper, PositionRepository $positionRepository)
+    {
+        $this->translator = $translator;
+        $this->positionRepository = $positionRepository;
+        $this->translatableStringHelper = $translatableStringHelper;
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        $qb->resetDQLPart('from');
+        $qb->from('ChillPersonBundle:Household\HouseholdMember', 'hm');
+
+        $qb->join('hm.person', 'person');
+        $qb->join('person.center', 'center');
+
+        $qb->andWhere($qb->expr()->andX(
+            $qb->expr()->lte('hm.startDate', ':date'),
+            $qb->expr()->orX(
+                $qb->expr()->isNull('hm.endDate'),
+                $qb->expr()->gte('hm.endDate', ':date')
+            )
+        ));
+
+        $qb->setParameter('date', $data['date_position']);
+
+        $qb->addSelect('IDENTITY(hm.position) AS household_position_aggregator');
+
+        $groupBy = $qb->getDQLPart('groupBy');
+
+        if (!empty($groupBy)) {
+            $qb->addGroupBy('household_position_aggregator');
+        } else {
+            $qb->groupBy('household_position_aggregator');
+        }
+    }
+
+    public function applyOn()
+    {
+        return 'person';
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        $builder->add('date_position', ChillDateType::class, [
+            'label' => 'Household position in relation to this date',
+            'data' => new DateTime(),
+        ]);
+    }
+
+    public function getLabels($key, array $values, $data)
+    {
+        return function ($value) {
+            if ('_header' === $value) {
+                return 'Household position';
+            }
+
+            if (null === $value) {
+                return $this->translator->trans('without data');
+            }
+
+            $p = $this->positionRepository->find($value);
+
+            return $this->translatableStringHelper->localize($p->getLabel());
+        };
+    }
+
+    public function getQueryKeys($data)
+    {
+        return [
+            'household_position_aggregator',
+        ];
+    }
+
+    public function getTitle()
+    {
+        return 'Aggregate by household position';
+    }
+
+    public function validateForm($data, ExecutionContextInterface $context)
+    {
+        if (null === $data['date_position']) {
+            $context->buildViolation('The date should not be empty')
+                ->addViolation();
+        }
+    }
+}

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

@@ -0,0 +1,83 @@
+<?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\Export\AggregatorInterface;
+use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Chill\PersonBundle\Export\Declarations;
+use Chill\PersonBundle\Repository\MaritalStatusRepository;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\FormBuilderInterface;
+
+final class MaritalStatusAggregator implements AggregatorInterface
+{
+    private MaritalStatusRepository $maritalStatusRepository;
+
+    private TranslatableStringHelper $translatableStringHelper;
+
+    public function __construct(MaritalStatusRepository $maritalStatusRepository, TranslatableStringHelper $translatableStringHelper)
+    {
+        $this->maritalStatusRepository = $maritalStatusRepository;
+        $this->translatableStringHelper = $translatableStringHelper;
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        $qb->join('person.maritalStatus', 'ms');
+        $qb->addSelect('ms.id as marital_status_aggregator');
+
+        $groupBy = $qb->getDQLPart('groupBy');
+
+        if (!empty($groupBy)) {
+            $qb->addGroupBy('marital_status_aggregator');
+        } else {
+            $qb->groupBy('marital_status_aggregator');
+        }
+    }
+
+    public function applyOn()
+    {
+        return Declarations::PERSON_TYPE;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+    }
+
+    public function getLabels($key, array $values, $data)
+    {
+        return function ($value): string {
+            if ('_header' === $value) {
+                return 'Marital status';
+            }
+
+            $g = $this->maritalStatusRepository->find($value);
+
+            return $this->translatableStringHelper->localize($g->getName());
+        };
+    }
+
+    public function getQueryKeys($data)
+    {
+        return ['marital_status_aggregator'];
+    }
+
+    public function getTitle()
+    {
+        return 'Group people by marital status';
+    }
+}

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

@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Chill\PersonBundle\Export\Aggregator;
+namespace Chill\PersonBundle\Export\Aggregator\PersonAggregators;
 
 use Chill\MainBundle\Export\AggregatorInterface;
 use Chill\MainBundle\Export\ExportElementValidatedInterface;
@@ -41,7 +41,7 @@ final class NationalityAggregator implements AggregatorInterface, ExportElementV
         $this->translator = $translator;
     }
 
-    public function addRole()
+    public function addRole(): ?string
     {
         return null;
     }
@@ -149,7 +149,7 @@ final class NationalityAggregator implements AggregatorInterface, ExportElementV
             ];
         }
 
-        return static function (string $value) use ($labels): string {
+        return static function ($value) use ($labels): string {
             return $labels[$value];
         };
     }

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

@@ -0,0 +1,85 @@
+<?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\PersonBundle\Export\Declarations;
+use Chill\PersonBundle\Repository\SocialWork\SocialActionRepository;
+use Chill\PersonBundle\Templating\Entity\SocialActionRender;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\FormBuilderInterface;
+
+final class ActionTypeAggregator implements AggregatorInterface
+{
+    private SocialActionRender $actionRender;
+
+    private SocialActionRepository $socialActionRepository;
+
+    public function __construct(
+        SocialActionRepository $socialActionRepository,
+        SocialActionRender $actionRender
+    ) {
+        $this->socialActionRepository = $socialActionRepository;
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        $qb->join('acpw.socialAction', 'sa');
+        $qb->addSelect('sa.id as action_type_aggregator');
+
+        $groupBy = $qb->getDQLPart('groupBy');
+
+        if (!empty($groupBy)) {
+            $qb->addGroupBy('action_type_aggregator');
+        } else {
+            $qb->groupBy('action_type_aggregator');
+        }
+    }
+
+    public function applyOn()
+    {
+        return Declarations::SOCIAL_WORK_ACTION_TYPE;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        // no form
+    }
+
+    public function getLabels($key, array $values, $data)
+    {
+        return function ($value): string {
+            if ('_header' === $value) {
+                return 'Social Action Type';
+            }
+
+            $sa = $this->socialActionRepository->find($value);
+
+            return $this->actionRender->renderString($sa, []);
+        };
+    }
+
+    public function getQueryKeys($data)
+    {
+        return ['action_type_aggregator'];
+    }
+
+    public function getTitle()
+    {
+        return 'Group social work actions by action type';
+    }
+}

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

@@ -0,0 +1,84 @@
+<?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 Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\FormBuilderInterface;
+
+final class GoalAggregator implements AggregatorInterface
+{
+    private GoalRepository $goalRepository;
+
+    private TranslatableStringHelper $translatableStringHelper;
+
+    public function __construct(GoalRepository $goalRepository, TranslatableStringHelper $translatableStringHelper)
+    {
+        $this->goalRepository = $goalRepository;
+        $this->translatableStringHelper = $translatableStringHelper;
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        $qb->join('acpw.goals', 'g');
+        $qb->addSelect('g.id as goal_aggregator');
+
+        $groupBy = $qb->getDQLPart('groupBy');
+
+        if (!empty($groupBy)) {
+            $qb->addGroupBy('goal_aggregator');
+        } else {
+            $qb->groupBy('goal_aggregator');
+        }
+    }
+
+    public function applyOn()
+    {
+        return Declarations::SOCIAL_WORK_ACTION_TYPE;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        // no form
+    }
+
+    public function getLabels($key, array $values, $data)
+    {
+        return function ($value): string {
+            if ('_header' === $value) {
+                return 'Goal Type';
+            }
+
+            $g = $this->goalRepository->find($value);
+
+            return $this->translatableStringHelper->localize($g->getTitle());
+        };
+    }
+
+    public function getQueryKeys($data)
+    {
+        return ['goal_aggregator'];
+    }
+
+    public function getTitle()
+    {
+        return 'Group social work actions by goal';
+    }
+}

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

@@ -0,0 +1,89 @@
+<?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\Repository\UserJobRepository;
+use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Chill\PersonBundle\Export\Declarations;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\FormBuilderInterface;
+
+final class JobAggregator implements AggregatorInterface
+{
+    private UserJobRepository $jobRepository;
+
+    private TranslatableStringHelper $translatableStringHelper;
+
+    public function __construct(
+        UserJobRepository $jobRepository,
+        TranslatableStringHelper $translatableStringHelper
+    ) {
+        $this->jobRepository = $jobRepository;
+        $this->translatableStringHelper = $translatableStringHelper;
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        $qb->join('acpw.referrers', 'u');
+
+        $qb->addSelect('IDENTITY(u.userJob) as job_aggregator');
+
+        $groupBy = $qb->getDQLPart('groupBy');
+
+        if (!empty($groupBy)) {
+            $qb->addGroupBy('job_aggregator');
+        } else {
+            $qb->groupBy('job_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): string {
+            if ('_header' === $value) {
+                return 'Job';
+            }
+
+            $j = $this->jobRepository->find($value);
+
+            return $this->translatableStringHelper->localize(
+                $j->getLabel()
+            );
+        };
+    }
+
+    public function getQueryKeys($data): array
+    {
+        return ['job_aggregator'];
+    }
+
+    public function getTitle(): string
+    {
+        return 'Group by treating agent job';
+    }
+}

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

@@ -0,0 +1,87 @@
+<?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\Repository\UserRepository;
+use Chill\MainBundle\Templating\Entity\UserRender;
+use Chill\PersonBundle\Export\Declarations;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\FormBuilderInterface;
+
+final class ReferrerAggregator implements AggregatorInterface
+{
+    private UserRender $userRender;
+
+    private UserRepository $userRepository;
+
+    public function __construct(
+        UserRepository $userRepository,
+        UserRender $userRender
+    ) {
+        $this->userRepository = $userRepository;
+        $this->userRender = $userRender;
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        $qb->join('acpw.referrers', 'u');
+
+        $qb->addSelect('u.id AS referrer_aggregator');
+
+        $groupBy = $qb->getDQLPart('groupBy');
+
+        if (!empty($groupBy)) {
+            $qb->addGroupBy('referrer_aggregator');
+        } else {
+            $qb->groupBy('referrer_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): string {
+            if ('_header' === $value) {
+                return 'Referrer';
+            }
+
+            $r = $this->userRepository->find($value);
+
+            return $this->userRender->renderString($r, []);
+        };
+    }
+
+    public function getQueryKeys($data): array
+    {
+        return ['referrer_aggregator'];
+    }
+
+    public function getTitle(): string
+    {
+        return 'Group by treating agent';
+    }
+}

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

@@ -0,0 +1,86 @@
+<?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\ResultRepository;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\FormBuilderInterface;
+
+final class ResultAggregator implements AggregatorInterface
+{
+    private ResultRepository $resultRepository;
+
+    private TranslatableStringHelper $translatableStringHelper;
+
+    public function __construct(ResultRepository $resultRepository, TranslatableStringHelper $translatableStringHelper)
+    {
+        $this->resultRepository = $resultRepository;
+        $this->translatableStringHelper = $translatableStringHelper;
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        $qb->join('acpw.results', 'res');
+        $qb->join('acpw.goals', 'g');
+        $qb->join('g.results', 'gres');
+        $qb->addSelect('res.id, IDENTITY(g.results) as result_aggregator');
+
+        $groupBy = $qb->getDQLPart('groupBy');
+
+        if (!empty($groupBy)) {
+            $qb->addGroupBy('result_aggregator');
+        } else {
+            $qb->groupBy('result_aggregator');
+        }
+    }
+
+    public function applyOn()
+    {
+        return Declarations::SOCIAL_WORK_ACTION_TYPE;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        // no form
+    }
+
+    public function getLabels($key, array $values, $data)
+    {
+        return function ($value): string {
+            if ('_header' === $value) {
+                return 'Result Type';
+            }
+
+            $g = $this->resultRepository->find($value);
+
+            return $this->translatableStringHelper->localize($g->getTitle());
+        };
+    }
+
+    public function getQueryKeys($data)
+    {
+        return ['result_aggregator'];
+    }
+
+    public function getTitle()
+    {
+        return 'Group social work actions by result';
+    }
+}

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

@@ -0,0 +1,89 @@
+<?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\Repository\ScopeRepository;
+use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Chill\PersonBundle\Export\Declarations;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\FormBuilderInterface;
+
+final class ScopeAggregator implements AggregatorInterface
+{
+    private ScopeRepository $scopeRepository;
+
+    private TranslatableStringHelper $translatableStringHelper;
+
+    public function __construct(
+        ScopeRepository $scopeRepository,
+        TranslatableStringHelper $translatableStringHelper
+    ) {
+        $this->scopeRepository = $scopeRepository;
+        $this->translatableStringHelper = $translatableStringHelper;
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        $qb->join('acpw.referrers', 'u');
+
+        $qb->addSelect('IDENTITY(u.mainScope) as scope_aggregator');
+
+        $groupBy = $qb->getDQLPart('groupBy');
+
+        if (!empty($groupBy)) {
+            $qb->addGroupBy('scope_aggregator');
+        } else {
+            $qb->groupBy('scope_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): string {
+            if ('_header' === $value) {
+                return 'Scope';
+            }
+
+            $s = $this->scopeRepository->find($value);
+
+            return $this->translatableStringHelper->localize(
+                $s->getName()
+            );
+        };
+    }
+
+    public function getQueryKeys($data): array
+    {
+        return ['scope_aggregator'];
+    }
+
+    public function getTitle(): string
+    {
+        return 'Group by treating agent scope';
+    }
+}

src/Bundle/ChillPersonBundle/Export/Declarations.php

@@ -16,7 +16,15 @@ namespace Chill\PersonBundle\Export;
  */
 abstract class Declarations
 {
+    public const ACP_TYPE = 'accompanying_period';
+
+    public const EVAL_TYPE = 'evaluation';
+
+    public const HOUSEHOLD_TYPE = 'household';
+
     public const PERSON_IMPLIED_IN = 'person_implied_in';
 
     public const PERSON_TYPE = 'person';
+
+    public const SOCIAL_WORK_ACTION_TYPE = 'social_actions';
 }

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

@@ -0,0 +1,111 @@
+<?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\Export;
+
+use Chill\MainBundle\Export\ExportInterface;
+use Chill\MainBundle\Export\FormatterInterface;
+use Chill\MainBundle\Export\GroupedExportInterface;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Export\Declarations;
+use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\EntityRepository;
+use Doctrine\ORM\Query;
+use Doctrine\ORM\QueryBuilder;
+use LogicException;
+use Symfony\Component\Form\FormBuilderInterface;
+
+class CountAccompanyingCourse implements ExportInterface, GroupedExportInterface
+{
+    protected EntityRepository $repository;
+
+    public function __construct(
+        EntityManagerInterface $em
+    ) {
+        $this->repository = $em->getRepository(AccompanyingPeriod::class);
+    }
+
+    public function buildForm(FormBuilderInterface $builder): void
+    {
+        // TODO: Implement buildForm() method.
+    }
+
+    public function getAllowedFormattersTypes(): array
+    {
+        return [FormatterInterface::TYPE_TABULAR];
+    }
+
+    public function getDescription(): string
+    {
+        return 'Count accompanying courses by various parameters';
+    }
+
+    public function getGroup(): string
+    {
+        return 'Exports of accompanying courses';
+    }
+
+    public function getLabels($key, array $values, $data)
+    {
+        if ('export_result' !== $key) {
+            throw new LogicException("the key {$key} is not used by this export");
+        }
+
+        $labels = array_combine($values, $values);
+        $labels['_header'] = $this->getTitle();
+
+        return static function ($value) use ($labels) {
+            return $labels[$value];
+        };
+    }
+
+    public function getQueryKeys($data): array
+    {
+        return ['export_result'];
+    }
+
+    public function getResult($qb, $data)
+    {
+        return $qb->getQuery()->getResult(Query::HYDRATE_SCALAR);
+    }
+
+    public function getTitle(): string
+    {
+        return 'Count accompanying courses';
+    }
+
+    public function getType(): string
+    {
+        return Declarations::ACP_TYPE;
+    }
+
+    public function initiateQuery(array $requiredModifiers, array $acl, array $data = []): QueryBuilder
+    {
+        $qb = $this->repository->createQueryBuilder('acp');
+
+        $qb->select('COUNT(acp.id) AS export_result');
+
+        return $qb;
+    }
+
+    public function requiredRole(): string
+    {
+        return AccompanyingPeriodVoter::STATS;
+    }
+
+    public function supportsModifiers(): array
+    {
+        return [
+            Declarations::ACP_TYPE,
+        ];
+    }
+}

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

@@ -0,0 +1,113 @@
+<?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\Export;
+
+use Chill\MainBundle\Export\ExportInterface;
+use Chill\MainBundle\Export\FormatterInterface;
+use Chill\MainBundle\Export\GroupedExportInterface;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+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;
+
+class CountEvaluation implements ExportInterface, GroupedExportInterface
+{
+    private EntityRepository $repository;
+
+    public function __construct(
+        EntityManagerInterface $em
+    ) {
+        $this->repository = $em->getRepository(AccompanyingPeriod::class);
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        // TODO: Implement buildForm() method.
+    }
+
+    public function getAllowedFormattersTypes(): array
+    {
+        return [FormatterInterface::TYPE_TABULAR];
+    }
+
+    public function getDescription(): string
+    {
+        return 'Count evaluation by various parameters.';
+    }
+
+    public function getGroup(): string
+    {
+        return 'Exports of evaluations';
+    }
+
+    public function getLabels($key, array $values, $data)
+    {
+        if ('export_result' !== $key) {
+            throw new LogicException("the key {$key} is not used by this export");
+        }
+
+        $labels = array_combine($values, $values);
+        $labels['_header'] = $this->getTitle();
+
+        return static function ($value) use ($labels) {
+            return $labels[$value];
+        };
+    }
+
+    public function getQueryKeys($data): array
+    {
+        return ['export_result'];
+    }
+
+    public function getResult($qb, $data)
+    {
+        return $qb->getQuery()->getResult(Query::HYDRATE_SCALAR);
+    }
+
+    public function getTitle(): string
+    {
+        return 'Count evaluations';
+    }
+
+    public function getType(): string
+    {
+        return Declarations::EVAL_TYPE;
+    }
+
+    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
+    {
+        $qb = $this->repository->createQueryBuilder('acp')
+            ->join('acp.works', 'acpw')
+            ->join('acpw.accompanyingPeriodWorkEvaluations', 'eval');
+
+        $qb->select('COUNT(eval.id) AS export_result');
+
+        return $qb;
+    }
+
+    public function requiredRole(): string
+    {
+        return AccompanyingPeriodVoter::STATS;
+    }
+
+    public function supportsModifiers(): array
+    {
+        return [
+            Declarations::EVAL_TYPE,
+            //Declarations::ACP_TYPE,
+            //Declarations::SOCIAL_WORK_ACTION_TYPE,
+        ];
+    }
+}

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

@@ -0,0 +1,114 @@
+<?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\Export;
+
+use Chill\MainBundle\Export\ExportInterface;
+use Chill\MainBundle\Export\FormatterInterface;
+use Chill\MainBundle\Export\GroupedExportInterface;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Export\Declarations;
+use Chill\PersonBundle\Security\Authorization\HouseholdVoter;
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\EntityRepository;
+use Doctrine\ORM\Query;
+use Symfony\Component\Form\FormBuilderInterface;
+
+class CountHousehold implements ExportInterface, GroupedExportInterface
+{
+    private EntityRepository $repository;
+
+    public function __construct(
+        EntityManagerInterface $em
+    ) {
+        $this->repository = $em->getRepository(AccompanyingPeriod::class);
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        // TODO: Implement buildForm() method.
+    }
+
+    public function getAllowedFormattersTypes(): array
+    {
+        return [FormatterInterface::TYPE_TABULAR];
+    }
+
+    public function getDescription(): string
+    {
+        return 'Count household by various parameters.';
+    }
+
+    public function getGroup(): string
+    {
+        return 'Exports of households';
+    }
+
+    public function getLabels($key, array $values, $data)
+    {
+        if ('export_result' !== $key) {
+            throw new LogicException("the key {$key} is not used by this export");
+        }
+
+        $labels = array_combine($values, $values);
+        $labels['_header'] = $this->getTitle();
+
+        return static function ($value) use ($labels) {
+            return $labels[$value];
+        };
+    }
+
+    public function getQueryKeys($data): array
+    {
+        return ['export_result'];
+    }
+
+    public function getResult($qb, $data)
+    {
+        return $qb->getQuery()->getResult(Query::HYDRATE_SCALAR);
+    }
+
+    public function getTitle(): string
+    {
+        return 'Count households';
+    }
+
+    public function getType(): string
+    {
+        return Declarations::HOUSEHOLD_TYPE;
+    }
+
+    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
+    {
+        $qb = $this->repository->createQueryBuilder('acp')
+            ->join('acp.participations', 'acppart')
+            ->join('acppart.person', 'person')
+            ->join('person.householdParticipations', 'householdmember')
+            ->join('householdmember.household', 'household');
+
+        $qb->select('COUNT(DISTINCT householdmember.household) AS export_result');
+
+        return $qb;
+    }
+
+    public function requiredRole(): string
+    {
+        return HouseholdVoter::STATS;
+    }
+
+    public function supportsModifiers(): array
+    {
+        return [
+            Declarations::HOUSEHOLD_TYPE,
+            //Declarations::ACP_TYPE
+        ];
+    }
+}

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

@@ -13,30 +13,28 @@ namespace Chill\PersonBundle\Export\Export;
 
 use Chill\MainBundle\Export\ExportInterface;
 use Chill\MainBundle\Export\FormatterInterface;
+use Chill\MainBundle\Export\GroupedExportInterface;
 use Chill\PersonBundle\Export\Declarations;
+use Chill\PersonBundle\Repository\PersonRepository;
 use Chill\PersonBundle\Security\Authorization\PersonVoter;
-use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Query;
 use Doctrine\ORM\QueryBuilder;
 use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\Security\Core\Role\Role;
 
-class CountPerson implements ExportInterface
+class CountPerson implements ExportInterface, GroupedExportInterface
 {
-    /**
-     * @var EntityManagerInterface
-     */
-    protected $entityManager;
+    protected PersonRepository $personRepository;
 
     public function __construct(
-        EntityManagerInterface $em
+        PersonRepository $personRepository
     ) {
-        $this->entityManager = $em;
+        $this->personRepository = $personRepository;
     }
 
     public function buildForm(FormBuilderInterface $builder)
     {
+        // No form necessary
     }
 
     public function getAllowedFormattersTypes()
@@ -46,7 +44,12 @@ class CountPerson implements ExportInterface
 
     public function getDescription()
     {
-        return 'Count peoples by various parameters.';
+        return 'Count people by various parameters.';
+    }
+
+    public function getGroup(): string
+    {
+        return 'Exports of persons';
     }
 
     public function getLabels($key, array $values, $data)
@@ -75,7 +78,7 @@ class CountPerson implements ExportInterface
 
     public function getTitle()
     {
-        return 'Count peoples';
+        return 'Count people';
     }
 
     public function getType()
@@ -94,10 +97,9 @@ class CountPerson implements ExportInterface
             return $el['center'];
         }, $acl);
 
-        $qb = $this->entityManager->createQueryBuilder();
+        $qb = $this->personRepository->createQueryBuilder('person');
 
         $qb->select('COUNT(person.id) AS export_result')
-            ->from('ChillPersonBundle:Person', 'person')
             ->join('person.center', 'center')
             ->andWhere('center IN (:authorized_centers)')
             ->setParameter('authorized_centers', $centers);
@@ -105,13 +107,17 @@ class CountPerson implements ExportInterface
         return $qb;
     }
 
-    public function requiredRole()
+    public function requiredRole(): string
     {
-        return new Role(PersonVoter::STATS);
+        return PersonVoter::STATS;
     }
 
     public function supportsModifiers()
     {
-        return [Declarations::PERSON_TYPE, Declarations::PERSON_IMPLIED_IN];
+        return [
+            Declarations::PERSON_TYPE,
+            Declarations::PERSON_IMPLIED_IN,
+            //Declarations::ACP_TYPE
+        ];
     }
 }

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

@@ -0,0 +1,112 @@
+<?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\Export;
+
+use Chill\MainBundle\Export\ExportInterface;
+use Chill\MainBundle\Export\FormatterInterface;
+use Chill\MainBundle\Export\GroupedExportInterface;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+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;
+
+class CountPersonWithAccompanyingCourse implements ExportInterface, GroupedExportInterface
+{
+    private EntityRepository $repository;
+
+    public function __construct(
+        EntityManagerInterface $em
+    ) {
+        $this->repository = $em->getRepository(AccompanyingPeriod::class);
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        // TODO: Implement buildForm() method.
+    }
+
+    public function getAllowedFormattersTypes(): array
+    {
+        return [FormatterInterface::TYPE_TABULAR];
+    }
+
+    public function getDescription(): string
+    {
+        return 'Count people participating in an accompanying course by various parameters.';
+    }
+
+    public function getGroup(): string
+    {
+        return 'Exports of persons';
+    }
+
+    public function getLabels($key, array $values, $data)
+    {
+        if ('export_result' !== $key) {
+            throw new LogicException("the key {$key} is not used by this export");
+        }
+
+        $labels = array_combine($values, $values);
+        $labels['_header'] = $this->getTitle();
+
+        return static function ($value) use ($labels) {
+            return $labels[$value];
+        };
+    }
+
+    public function getQueryKeys($data): array
+    {
+        return ['export_result'];
+    }
+
+    public function getResult($qb, $data)
+    {
+        return $qb->getQuery()->getResult(Query::HYDRATE_SCALAR);
+    }
+
+    public function getTitle(): string
+    {
+        return 'Count people participating in an accompanying course';
+    }
+
+    public function getType(): string
+    {
+        return Declarations::HOUSEHOLD_TYPE;
+    }
+
+    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
+    {
+        $qb = $this->repository->createQueryBuilder('acp')
+            ->join('acp.participations', 'acppart')
+            ->join('acppart.person', 'person');
+
+        $qb->select('COUNT(DISTINCT person.id) AS export_result');
+
+        return $qb;
+    }
+
+    public function requiredRole(): string
+    {
+        return AccompanyingPeriodVoter::STATS;
+    }
+
+    public function supportsModifiers(): array
+    {
+        return [
+            Declarations::ACP_TYPE,
+            Declarations::PERSON_TYPE,
+        ];
+    }
+}

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

@@ -0,0 +1,112 @@
+<?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\Export;
+
+use Chill\MainBundle\Export\ExportInterface;
+use Chill\MainBundle\Export\FormatterInterface;
+use Chill\MainBundle\Export\GroupedExportInterface;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Export\Declarations;
+use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\EntityRepository;
+use Doctrine\ORM\Query;
+use Doctrine\ORM\QueryBuilder;
+use LogicException;
+use Symfony\Component\Form\FormBuilderInterface;
+
+class CountSocialWorkActions implements ExportInterface, GroupedExportInterface
+{
+    protected EntityRepository $repository;
+
+    public function __construct(
+        EntityManagerInterface $em
+    ) {
+        $this->repository = $em->getRepository(AccompanyingPeriod::class);
+    }
+
+    public function buildForm(FormBuilderInterface $builder): void
+    {
+        // No form necessary?
+    }
+
+    public function getAllowedFormattersTypes(): array
+    {
+        return [FormatterInterface::TYPE_TABULAR];
+    }
+
+    public function getDescription(): string
+    {
+        return 'Count social work actions by various parameters';
+    }
+
+    public function getGroup(): string
+    {
+        return 'Exports of social work actions';
+    }
+
+    public function getLabels($key, array $values, $data)
+    {
+        if ('export_result' !== $key) {
+            throw new LogicException("the key {$key} is not used by this export");
+        }
+
+        $labels = array_combine($values, $values);
+        $labels['_header'] = $this->getTitle();
+
+        return static function ($value) use ($labels) {
+            return $labels[$value];
+        };
+    }
+
+    public function getQueryKeys($data): array
+    {
+        return ['export_result'];
+    }
+
+    public function getResult($qb, $data)
+    {
+        return $qb->getQuery()->getResult(Query::HYDRATE_SCALAR);
+    }
+
+    public function getTitle(): string
+    {
+        return 'Count social work actions';
+    }
+
+    public function getType(): string
+    {
+        return Declarations::SOCIAL_WORK_ACTION_TYPE;
+    }
+
+    public function initiateQuery(array $requiredModifiers, array $acl, array $data = []): QueryBuilder
+    {
+        $qb = $this->repository->createQueryBuilder('acp')
+            ->join('acp.works', 'acpw');
+
+        $qb->select('COUNT(acpw.id) as export_result');
+
+        return $qb;
+    }
+
+    public function requiredRole(): string
+    {
+        return AccompanyingPeriodVoter::STATS;
+    }
+
+    public function supportsModifiers(): array
+    {
+        return [
+            Declarations::SOCIAL_WORK_ACTION_TYPE,
+        ];
+    }
+}

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

@@ -16,6 +16,7 @@ use Chill\CustomFieldsBundle\Entity\CustomField;
 use Chill\CustomFieldsBundle\Service\CustomFieldProvider;
 use Chill\MainBundle\Export\ExportElementValidatedInterface;
 use Chill\MainBundle\Export\FormatterInterface;
+use Chill\MainBundle\Export\GroupedExportInterface;
 use Chill\MainBundle\Export\ListInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Chill\PersonBundle\Entity\Person;
@@ -28,7 +29,6 @@ use Exception;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\Extension\Core\Type\DateType;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\Security\Core\Role\Role;
 use Symfony\Component\Validator\Constraints\Callback;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
@@ -45,7 +45,7 @@ use function uniqid;
 /**
  * Render a list of people.
  */
-class ListPerson implements ExportElementValidatedInterface, ListInterface
+class ListPerson implements ExportElementValidatedInterface, ListInterface, GroupedExportInterface
 {
     protected CustomFieldProvider $customFieldProvider;
 
@@ -135,6 +135,11 @@ class ListPerson implements ExportElementValidatedInterface, ListInterface
         return 'Create a list of people according to various filters.';
     }
 
+    public function getGroup(): string
+    {
+        return 'Exports of persons';
+    }
+
     public function getLabels($key, array $values, $data)
     {
         switch ($key) {
@@ -349,9 +354,9 @@ class ListPerson implements ExportElementValidatedInterface, ListInterface
         return $qb;
     }
 
-    public function requiredRole()
+    public function requiredRole(): string
     {
-        return new Role(PersonVoter::LISTS);
+        return PersonVoter::LISTS;
     }
 
     public function supportsModifiers()
@@ -426,6 +431,10 @@ class ListPerson implements ExportElementValidatedInterface, ListInterface
                 return $this->translatableStringHelper->localize($cf->getName());
             }
 
+            if (null === $value) {
+                return '';
+            }
+
             return $this->customFieldProvider
                 ->getCustomFieldByType($cf->getType())
                 ->render(json_decode($value, true), $cf, 'csv');
@@ -434,6 +443,10 @@ class ListPerson implements ExportElementValidatedInterface, ListInterface
         if ($cfType instanceof CustomFieldChoice && $cfType->isMultiple($cf)) {
             return function ($value) use ($cf, $cfType, $key) {
                 $slugChoice = $this->extractInfosFromSlug($key)['additionnalInfos']['choiceSlug'];
+
+                if (null === $value) {
+                    return '';
+                }
                 $decoded = json_decode($value, true);
 
                 if ('_header' === $value) {
@@ -459,7 +472,7 @@ class ListPerson implements ExportElementValidatedInterface, ListInterface
      */
     private function slugToDQL(string $slug, string $type = 'default', array $additionalInfos = []): string
     {
-        $uid = 'slug_' . uniqid('', true);
+        $uid = 'slug_' . uniqid('', false);
 
         $this->slugs[$uid] = [
             'slug' => $slug,

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

@@ -13,6 +13,7 @@ namespace Chill\PersonBundle\Export\Export;
 
 use Chill\MainBundle\Export\DirectExportInterface;
 use Chill\MainBundle\Export\ExportElementValidatedInterface;
+use Chill\MainBundle\Export\GroupedExportInterface;
 use Chill\PersonBundle\Security\Authorization\PersonVoter;
 use Doctrine\ORM\EntityManagerInterface;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
@@ -30,7 +31,7 @@ use Symfony\Contracts\Translation\TranslatorInterface;
 /**
  * Render a list of duplicate peoples.
  */
-class ListPersonDuplicate implements DirectExportInterface, ExportElementValidatedInterface
+class ListPersonDuplicate implements DirectExportInterface, ExportElementValidatedInterface, GroupedExportInterface
 {
     /**
      * @var float
@@ -125,7 +126,12 @@ class ListPersonDuplicate implements DirectExportInterface, ExportElementValidat
      */
     public function getDescription()
     {
-        return 'Create a list of duplicate people.';
+        return 'Create a list of duplicate people';
+    }
+
+    public function getGroup(): string
+    {
+        return 'Exports of persons';
     }
 
     /**
@@ -192,8 +198,8 @@ class ListPersonDuplicate implements DirectExportInterface, ExportElementValidat
 
         $statement = $this->entityManager->getConnection()->prepare($sql);
         $statement->bindValue('precision', $precision);
-        $statement->execute();
+        $result = $statement->executeQuery();
 
-        return $statement->fetchAll();
+        return $result->fetchAllAssociative();
     }
 }

src/Bundle/ChillPersonBundle/Export/Export/StatAccompanyingCourseDuration.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\Export;
+
+use Chill\MainBundle\Export\ExportInterface;
+use Chill\MainBundle\Export\FormatterInterface;
+use Chill\MainBundle\Export\GroupedExportInterface;
+use Chill\MainBundle\Form\Type\ChillDateType;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Export\Declarations;
+use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
+use DateTime;
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\EntityRepository;
+use Doctrine\ORM\Query;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\FormBuilderInterface;
+
+class StatAccompanyingCourseDuration implements ExportInterface, GroupedExportInterface
+{
+    private EntityRepository $repository;
+
+    public function __construct(
+        EntityManagerInterface $em
+    ) {
+        $this->repository = $em->getRepository(AccompanyingPeriod::class);
+    }
+
+    public function buildForm(FormBuilderInterface $builder): void
+    {
+        $builder->add('closingdate', ChillDateType::class, [
+            'label' => 'Closingdate to apply',
+            'data' => new DateTime('now'),
+        ]);
+    }
+
+    public function getAllowedFormattersTypes(): array
+    {
+        return [FormatterInterface::TYPE_TABULAR];
+    }
+
+    public function getDescription(): string
+    {
+        return 'Create an average of accompanying courses duration according to various filters';
+    }
+
+    public function getGroup(): string
+    {
+        return 'Exports of accompanying courses';
+    }
+
+    public function getLabels($key, array $values, $data)
+    {
+        if ('export_result' !== $key) {
+            throw new LogicException("the key {$key} is not used by this export");
+        }
+
+        $labels = array_combine($values, $values);
+        $labels['_header'] = $this->getTitle();
+
+        return static function ($value) use ($labels) {
+            return $labels[$value];
+        };
+    }
+
+    public function getQueryKeys($data): array
+    {
+        return ['export_result'];
+    }
+
+    public function getResult($qb, $data)
+    {
+        return $qb->getQuery()->getResult(Query::HYDRATE_SCALAR);
+    }
+
+    public function getTitle(): string
+    {
+        return 'Accompanying courses duration';
+    }
+
+    public function getType(): string
+    {
+        return Declarations::ACP_TYPE;
+    }
+
+    public function initiateQuery(array $requiredModifiers, array $acl, array $data = []): QueryBuilder
+    {
+        $qb = $this->repository->createQueryBuilder('acp');
+
+        $qb
+            ->select('AVG(
+                ( CASE
+                    WHEN acp.closingDate IS NOT NULL
+                    THEN acp.closingDate
+                    ELSE :force_closingDate
+                END ) - acp.openingDate
+            ) AS export_result')
+            ->setParameter('force_closingDate', $data['closingdate']);
+
+        return $qb;
+    }
+
+    public function requiredRole(): string
+    {
+        return AccompanyingPeriodVoter::STATS;
+    }
+
+    public function supportsModifiers(): array
+    {
+        return [
+            Declarations::ACP_TYPE,
+        ];
+    }
+}

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

@@ -0,0 +1,76 @@
+<?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\MainBundle\Export\FilterInterface;
+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;
+
+class ActiveOnDateFilter implements FilterInterface
+{
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        $where = $qb->getDQLPart('where');
+
+        $clause = $qb->expr()->andX(
+            $qb->expr()->lte('acp.openingDate', ':ondate'),
+            $qb->expr()->orX(
+                $qb->expr()->gt('acp.closingDate', ':ondate'),
+                $qb->expr()->isNull('acp.closingDate')
+            )
+        );
+
+        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);
+    }
+
+    public function applyOn(): string
+    {
+        return Declarations::ACP_TYPE;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        $builder
+            ->add('on_date', ChillDateType::class, [
+                'data' => new DateTime(),
+            ]);
+    }
+
+    public function describeAction($data, $format = 'string'): array
+    {
+        return ['Filtered by actives courses: active on %ondate%', [
+            '%ondate%' => $data['on_date']->format('d-m-Y'),
+        ]];
+    }
+
+    public function getTitle(): string
+    {
+        return 'Filter by active on date';
+    }
+}

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

@@ -0,0 +1,82 @@
+<?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\MainBundle\Export\FilterInterface;
+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;
+
+class ActiveOneDayBetweenDatesFilter implements FilterInterface
+{
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        $where = $qb->getDQLPart('where');
+
+        $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->setParameter('datefrom', $data['date_from'], Types::DATE_MUTABLE);
+        $qb->setParameter('dateto', $data['date_to'], Types::DATE_MUTABLE);
+    }
+
+    public function applyOn(): string
+    {
+        return Declarations::ACP_TYPE;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        $builder
+            ->add('date_from', ChillDateType::class, [
+                'data' => new DateTime(),
+            ])
+            ->add('date_to', ChillDateType::class, [
+                'data' => new DateTime(),
+            ]);
+    }
+
+    public function describeAction($data, $format = 'string'): array
+    {
+        return ['Filtered by actives courses: at least one day between %datefrom% and %dateto%', [
+            '%datefrom%' => $data['date_from']->format('d-m-Y'),
+            '%dateto%' => $data['date_to']->format('d-m-Y'),
+        ]];
+    }
+
+    public function getTitle(): string
+    {
+        return 'Filter by active at least one day between dates';
+    }
+}

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

@@ -0,0 +1,99 @@
+<?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', 'act');
+
+        $qb
+            ->join('act.accompanyingPeriod', 'acp')
+            ->join('act.activityType', 'aty');
+
+        $where = $qb->getDQLPart('where');
+        $clause = $qb->expr()->in('aty.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/AdministrativeLocationFilter.php

@@ -0,0 +1,87 @@
+<?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\MainBundle\Entity\Location;
+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;
+
+class AdministrativeLocationFilter 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)
+    {
+        $where = $qb->getDQLPart('where');
+        $clause = $qb->expr()->in('acp.administrativeLocation', ':locations');
+
+        if ($where instanceof Andx) {
+            $where->add($clause);
+        } else {
+            $where = $qb->expr()->andX($clause);
+        }
+
+        $qb->add('where', $where);
+        $qb->setParameter('locations', $data['accepted_locations']);
+    }
+
+    public function applyOn(): string
+    {
+        return Declarations::ACP_TYPE;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        $builder->add('accepted_locations', EntityType::class, [
+            'class' => Location::class,
+            'choice_label' => function (Location $l) {
+                return $l->getName() . ' (' . $this->translatableStringHelper->localize($l->getLocationType()->getTitle()) . ')';
+            },
+            'multiple' => true,
+            'expanded' => true,
+        ]);
+    }
+
+    public function describeAction($data, $format = 'string'): array
+    {
+        $locations = [];
+
+        foreach ($data['accepted_locations'] as $l) {
+            $locations[] = $l->getName();
+        }
+
+        return ['Filtered by administratives locations: only %locations%', [
+            '%locations%' => implode(', ou ', $locations),
+        ]];
+    }
+
+    public function getTitle(): string
+    {
+        return 'Filter by administrative location';
+    }
+}

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

@@ -0,0 +1,88 @@
+<?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\MainBundle\Export\FilterInterface;
+use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Chill\PersonBundle\Entity\AccompanyingPeriod\ClosingMotive;
+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;
+
+class ClosingMotiveFilter 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)
+    {
+        $where = $qb->getDQLPart('where');
+        $clause = $qb->expr()->in('acp.closingMotive', ':closingmotive');
+
+        if ($where instanceof Andx) {
+            $where->add($clause);
+        } else {
+            $where = $qb->expr()->andX($clause);
+        }
+
+        $qb->add('where', $where);
+        $qb->setParameter('closingmotive', $data['accepted_closingmotives']);
+    }
+
+    public function applyOn(): string
+    {
+        return Declarations::ACP_TYPE;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        $builder->add('accepted_closingmotives', EntityType::class, [
+            'class' => ClosingMotive::class,
+            'choice_label' => function (ClosingMotive $cm) {
+                return $this->translatableStringHelper->localize($cm->getName());
+            },
+            'multiple' => true,
+            'expanded' => true,
+        ]);
+    }
+
+    public function describeAction($data, $format = 'string'): array
+    {
+        $motives = [];
+
+        foreach ($data['accepted_closingmotives'] as $k => $v) {
+            $motives[] = $this->translatableStringHelper->localize($v->getName());
+        }
+
+        return [
+            'Filtered by closingmotive: only %closingmotives%', [
+                '%closingmotives%' => implode(', ou ', $motives),
+            ], ];
+    }
+
+    public function getTitle(): string
+    {
+        return 'Filter by closing motive';
+    }
+}

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

@@ -0,0 +1,95 @@
+<?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\MainBundle\Export\FilterInterface;
+use Chill\PersonBundle\Export\Declarations;
+use Doctrine\ORM\Query\Expr\Andx;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
+
+class ConfidentialFilter implements FilterInterface
+{
+    private const CHOICES = [
+        'is not confidential' => false,
+        'is confidential' => true,
+    ];
+
+    private const DEFAULT_CHOICE = false;
+
+    private TranslatorInterface $translator;
+
+    public function __construct(TranslatorInterface $translator)
+    {
+        $this->translator = $translator;
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        $where = $qb->getDQLPart('where');
+        $clause = $qb->expr()->eq('acp.confidential', ':confidential');
+
+        if ($where instanceof Andx) {
+            $where->add($clause);
+        } else {
+            $where = $qb->expr()->andX($clause);
+        }
+
+        $qb->add('where', $where);
+        $qb->setParameter('confidential', $data['accepted_confidentials']);
+    }
+
+    public function applyOn(): string
+    {
+        return Declarations::ACP_TYPE;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        $builder->add('accepted_confidentials', ChoiceType::class, [
+            'choices' => self::CHOICES,
+            'multiple' => false,
+            'expanded' => true,
+            'empty_data' => self::DEFAULT_CHOICE,
+            'data' => self::DEFAULT_CHOICE,
+        ]);
+    }
+
+    public function describeAction($data, $format = 'string'): array
+    {
+        dump($data, self::CHOICES);
+
+        foreach (self::CHOICES as $k => $v) {
+            if ($v === $data['accepted_confidentials']) {
+                $choice = $k;
+            }
+        }
+
+        return [
+            'Filtered by confidential: only %confidential%', [
+                '%confidential%' => $this->translator->trans($choice),
+            ],
+        ];
+    }
+
+    public function getTitle(): string
+    {
+        return 'Filter by confidential';
+    }
+}

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

@@ -0,0 +1,90 @@
+<?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\MainBundle\Entity\User;
+use Chill\MainBundle\Entity\UserJob;
+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\Component\Form\FormBuilderInterface;
+use Symfony\Component\Security\Core\Security;
+
+class CurrentUserJobFilter implements FilterInterface
+{
+    private Security $security;
+
+    private TranslatableStringHelper $translatableStringHelper;
+
+    public function __construct(
+        TranslatableStringHelper $translatableStringHelper,
+        Security $security
+    ) {
+        $this->translatableStringHelper = $translatableStringHelper;
+        $this->security = $security;
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        $where = $qb->getDQLPart('where');
+        $clause = $qb->expr()->eq('acp.job', ':userjob');
+
+        if ($where instanceof Andx) {
+            $where->add($clause);
+        } else {
+            $where = $qb->expr()->andX($clause);
+        }
+
+        $qb->add('where', $where);
+        $qb->setParameter('userjob', $this->getUserJob());
+    }
+
+    public function applyOn()
+    {
+        return Declarations::ACP_TYPE;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+    }
+
+    public function describeAction($data, $format = 'string')
+    {
+        return [
+            'Filtered by user job: only %job%', [
+                '%job%' => $this->translatableStringHelper->localize(
+                    $this->getUserJob()->getLabel()
+                ),
+            ],
+        ];
+    }
+
+    public function getTitle()
+    {
+        return 'Filter by user job';
+    }
+
+    private function getUserJob(): UserJob
+    {
+        /** @var User $user */
+        $user = $this->security->getUser();
+
+        return $user->getUserJob();
+    }
+}

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

@@ -0,0 +1,92 @@
+<?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\MainBundle\Entity\Scope;
+use Chill\MainBundle\Entity\User;
+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\Component\Form\FormBuilderInterface;
+use Symfony\Component\Security\Core\Security;
+
+class CurrentUserScopeFilter implements FilterInterface
+{
+    private Security $security;
+
+    private TranslatableStringHelper $translatableStringHelper;
+
+    public function __construct(
+        TranslatableStringHelper $translatableStringHelper,
+        Security $security
+    ) {
+        $this->translatableStringHelper = $translatableStringHelper;
+        $this->security = $security;
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        $qb->join('acp.scopes', 's');
+
+        $where = $qb->getDQLPart('where');
+        $clause = $qb->expr()->eq('s.id', ':userscope');
+
+        if ($where instanceof Andx) {
+            $where->add($clause);
+        } else {
+            $where = $qb->expr()->andX($clause);
+        }
+
+        $qb->add('where', $where);
+        $qb->setParameter('userscope', $this->getUserMainScope());
+    }
+
+    public function applyOn()
+    {
+        return Declarations::ACP_TYPE;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+    }
+
+    public function describeAction($data, $format = 'string')
+    {
+        return [
+            'Filtered by user main scope: only %scope%', [
+                '%scope%' => $this->translatableStringHelper->localize(
+                    $this->getUserMainScope()->getName()
+                ),
+            ],
+        ];
+    }
+
+    public function getTitle()
+    {
+        return 'Filter by user scope';
+    }
+
+    private function getUserMainScope(): Scope
+    {
+        /** @var User $user */
+        $user = $this->security->getUser();
+
+        return $user->getMainScope();
+    }
+}

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

@@ -0,0 +1,93 @@
+<?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\MainBundle\Export\FilterInterface;
+use Chill\PersonBundle\Export\Declarations;
+use Doctrine\ORM\Query\Expr\Andx;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
+
+class EmergencyFilter implements FilterInterface
+{
+    private const CHOICES = [
+        'is emergency' => true,
+        'is not emergency' => false,
+    ];
+
+    private const DEFAULT_CHOICE = false;
+
+    private TranslatorInterface $translator;
+
+    public function __construct(TranslatorInterface $translator)
+    {
+        $this->translator = $translator;
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        $where = $qb->getDQLPart('where');
+        $clause = $qb->expr()->eq('acp.emergency', ':emergency');
+
+        if ($where instanceof Andx) {
+            $where->add($clause);
+        } else {
+            $where = $qb->expr()->andX($clause);
+        }
+
+        $qb->add('where', $where);
+        $qb->setParameter('emergency', $data['accepted_emergency']);
+    }
+
+    public function applyOn(): string
+    {
+        return Declarations::ACP_TYPE;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        $builder->add('accepted_emergency', ChoiceType::class, [
+            'choices' => self::CHOICES,
+            'multiple' => false,
+            'expanded' => true,
+            'empty_data' => self::DEFAULT_CHOICE,
+            'data' => self::DEFAULT_CHOICE,
+        ]);
+    }
+
+    public function describeAction($data, $format = 'string'): array
+    {
+        foreach (self::CHOICES as $k => $v) {
+            if ($v === $data['accepted_emergency']) {
+                $choice = $k;
+            }
+        }
+
+        return [
+            'Filtered by emergency: only %emergency%', [
+                '%emergency%' => $this->translator->trans($choice),
+            ],
+        ];
+    }
+
+    public function getTitle(): string
+    {
+        return 'Filter by emergency';
+    }
+}

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

@@ -0,0 +1,92 @@
+<?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\MainBundle\Export\FilterInterface;
+use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Chill\PersonBundle\Entity\SocialWork\Evaluation;
+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;
+
+class EvaluationFilter 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)
+    {
+        $qb
+            ->join('acp.works', 'acpw')
+            ->join('acpw.accompanyingPeriodWorkEvaluations', 'we')
+            ->join('we.evaluation', 'ev');
+
+        $where = $qb->getDQLPart('where');
+        $clause = $qb->expr()->in('ev.id', ':evaluations');
+
+        if ($where instanceof Andx) {
+            $where->add($clause);
+        } else {
+            $where = $qb->expr()->andX($clause);
+        }
+
+        $qb->add('where', $where);
+        $qb->setParameter('evaluations', $data['accepted_evaluations']);
+    }
+
+    public function applyOn(): string
+    {
+        return Declarations::ACP_TYPE;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        $builder->add('accepted_evaluations', EntityType::class, [
+            'class' => Evaluation::class,
+            'choice_label' => function (Evaluation $ev) {
+                return $this->translatableStringHelper->localize($ev->getTitle());
+            },
+            'multiple' => true,
+            'expanded' => true,
+        ]);
+    }
+
+    public function describeAction($data, $format = 'string'): array
+    {
+        $evaluations = [];
+
+        foreach ($data['accepted_evaluations'] as $ev) {
+            $evaluations[] = $this->translatableStringHelper->localize($ev->getTitle());
+        }
+
+        return ['Filtered by evaluations: only %evals%', [
+            '%evals%' => implode(', ou ', $evaluations),
+        ]];
+    }
+
+    public function getTitle(): string
+    {
+        return 'Filter by evaluation';
+    }
+}

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

@@ -0,0 +1,90 @@
+<?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\MainBundle\Entity\GeographicalUnit;
+use Chill\MainBundle\Export\FilterInterface;
+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\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.
+ */
+class GeographicalUnitStatFilter implements FilterInterface
+{
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        $where = $qb->getDQLPart('where');
+        $clause = $qb->expr()->eq(1, 1);
+
+        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']);
+    }
+
+    public function applyOn(): string
+    {
+        return Declarations::ACP_TYPE;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        $builder
+            ->add('date', ChillDateType::class, [
+                'data' => new DateTime(),
+            ])
+            ->add('accepted_loctype', EntityType::class, [
+                'class' => GeographicalUnit::class,
+                'choice_label' => static function (GeographicalUnit $u) {
+                    return $u->getUnitName();
+                },
+                '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'),
+        ]];
+    }
+
+    public function getTitle(): string
+    {
+        return 'Filter by geographical unit';
+    }
+}

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

@@ -0,0 +1,93 @@
+<?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\MainBundle\Export\FilterInterface;
+use Chill\PersonBundle\Export\Declarations;
+use Doctrine\ORM\Query\Expr\Andx;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
+
+class IntensityFilter implements FilterInterface
+{
+    private const CHOICES = [
+        'is occasional' => 'occasional',
+        'is regular' => 'regular',
+    ];
+
+    private const DEFAULT_CHOICE = 'occasional';
+
+    private TranslatorInterface $translator;
+
+    public function __construct(TranslatorInterface $translator)
+    {
+        $this->translator = $translator;
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        $where = $qb->getDQLPart('where');
+        $clause = $qb->expr()->eq('acp.intensity', ':intensity');
+
+        if ($where instanceof Andx) {
+            $where->add($clause);
+        } else {
+            $where = $qb->expr()->andX($clause);
+        }
+
+        $qb->add('where', $where);
+        $qb->setParameter('intensity', $data['accepted_intensities']);
+    }
+
+    public function applyOn(): string
+    {
+        return Declarations::ACP_TYPE;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        $builder->add('accepted_intensities', ChoiceType::class, [
+            'choices' => self::CHOICES,
+            'multiple' => false,
+            'expanded' => true,
+            'empty_data' => self::DEFAULT_CHOICE,
+            'data' => self::DEFAULT_CHOICE,
+        ]);
+    }
+
+    public function describeAction($data, $format = 'string'): array
+    {
+        foreach (self::CHOICES as $k => $v) {
+            if ($v === $data['accepted_intensities']) {
+                $choice = $k;
+            }
+        }
+
+        return [
+            'Filtered by intensity: only %intensity%', [
+                '%intensity%' => $this->translator->trans($choice),
+            ],
+        ];
+    }
+
+    public function getTitle(): string
+    {
+        return 'Filter by intensity';
+    }
+}

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

@@ -0,0 +1,78 @@
+<?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\MainBundle\Export\FilterInterface;
+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;
+
+class OpenBetweenDatesFilter implements FilterInterface
+{
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    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')
+        );
+
+        if ($where instanceof Andx) {
+            $where->add($clause);
+        } else {
+            $where = $qb->expr()->andX($clause);
+        }
+
+        $qb->add('where', $where);
+        $qb->setParameter('datefrom', $data['date_from'], Types::DATE_MUTABLE);
+        $qb->setParameter('dateto', $data['date_to'], Types::DATE_MUTABLE);
+    }
+
+    public function applyOn(): string
+    {
+        return Declarations::ACP_TYPE;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        $builder
+            ->add('date_from', ChillDateType::class, [
+                'data' => new DateTime(),
+            ])
+            ->add('date_to', ChillDateType::class, [
+                'data' => new DateTime(),
+            ]);
+    }
+
+    public function describeAction($data, $format = 'string'): array
+    {
+        return ['Filtered by opening dates: between %datefrom% and %dateto%', [
+            '%datefrom%' => $data['date_from']->format('d-m-Y'),
+            '%dateto%' => $data['date_to']->format('d-m-Y'),
+        ]];
+    }
+
+    public function getTitle(): string
+    {
+        return 'Filter by opened between dates';
+    }
+}

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

@@ -0,0 +1,87 @@
+<?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\MainBundle\Export\FilterInterface;
+use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Chill\PersonBundle\Entity\AccompanyingPeriod\Origin;
+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;
+
+class OriginFilter 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)
+    {
+        $where = $qb->getDQLPart('where');
+        $clause = $qb->expr()->in('acp.origin', ':origin');
+
+        if ($where instanceof Andx) {
+            $where->add($clause);
+        } else {
+            $where = $qb->expr()->andX($clause);
+        }
+
+        $qb->add('where', $where);
+        $qb->setParameter('origin', $data['accepted_origins']);
+    }
+
+    public function applyOn(): string
+    {
+        return Declarations::ACP_TYPE;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        $builder->add('accepted_origins', EntityType::class, [
+            'class' => Origin::class,
+            'choice_label' => function (Origin $o) {
+                return $this->translatableStringHelper->localize($o->getLabel());
+            },
+            'multiple' => true,
+            'expanded' => true,
+        ]);
+    }
+
+    public function describeAction($data, $format = 'string'): array
+    {
+        $origins = [];
+
+        foreach ($data['accepted_origins'] as $v) {
+            $origins[] = $this->translatableStringHelper->localize($v->getLabel());
+        }
+
+        return ['Filtered by origins: only %origins%', [
+            '%origins%' => implode(', ou ', $origins),
+        ]];
+    }
+
+    public function getTitle(): string
+    {
+        return 'Filter by origin';
+    }
+}

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

@@ -0,0 +1,87 @@
+<?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\MainBundle\Entity\User;
+use Chill\MainBundle\Export\FilterInterface;
+use Chill\MainBundle\Templating\Entity\UserRender;
+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;
+
+class ReferrerFilter implements FilterInterface
+{
+    private UserRender $userRender;
+
+    public function __construct(UserRender $userRender)
+    {
+        $this->userRender = $userRender;
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        $where = $qb->getDQLPart('where');
+        $clause = $qb->expr()->in('acp.user', ':referrers');
+
+        if ($where instanceof Andx) {
+            $where->add($clause);
+        } else {
+            $where = $qb->expr()->andX($clause);
+        }
+
+        $qb->add('where', $where);
+        $qb->setParameter('referrers', $data['accepted_referrers']);
+    }
+
+    public function applyOn(): string
+    {
+        return Declarations::ACP_TYPE;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        $builder->add('accepted_referrers', EntityType::class, [
+            'class' => User::class,
+            'choice_label' => function (User $u) {
+                return $this->userRender->renderString($u, []);
+            },
+            'multiple' => true,
+            'expanded' => true,
+        ]);
+    }
+
+    public function describeAction($data, $format = 'string'): array
+    {
+        $users = [];
+
+        foreach ($data['accepted_referrers'] as $r) {
+            $users[] = $r;
+        }
+
+        return [
+            'Filtered by referrer: only %referrers%', [
+                '%referrers' => implode(', ou ', $users),
+            ], ];
+    }
+
+    public function getTitle(): string
+    {
+        return 'Filter by referrers';
+    }
+}

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

@@ -0,0 +1,144 @@
+<?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\MainBundle\Export\FilterInterface;
+use Chill\PersonBundle\Export\Declarations;
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\Query\Expr\Andx;
+use Doctrine\ORM\QueryBuilder;
+use Exception;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
+
+final class RequestorFilter implements FilterInterface
+{
+    private const DEFAULT_CHOICE = 'participation';
+
+    private const REQUESTOR_CHOICES = [
+        'is person concerned' => 'participation',
+        'is other person' => 'other_person',
+        'is thirdparty' => 'thirdparty',
+        'no requestor' => 'no_requestor',
+    ];
+
+    private EntityManagerInterface $em;
+
+    private TranslatorInterface $translator;
+
+    public function __construct(
+        TranslatorInterface $translator,
+        EntityManagerInterface $em
+    ) {
+        $this->translator = $translator;
+        $this->em = $em;
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        $where = $qb->getDQLPart('where');
+
+        switch ($data['accepted_choices']) {
+            case 'participation':
+                $qb->join('acp.participations', 'part');
+
+                $clause = $qb->expr()->andX(
+                    $qb->expr()->isNotNull('acp.requestorPerson'),
+                    $qb->expr()->eq('acp.requestorPerson', 'part.person')
+                );
+
+                break;
+
+            case 'other_person':
+                $expr = $this->em->getExpressionBuilder();
+
+                $qb->join('acp.participations', 'part');
+
+                $clause = $expr->andX(
+                    $expr->isNotNull('acp.requestorPerson'),
+                    $expr->notIn(
+                        'acp.requestorPerson',
+
+                        // subquery
+                        $this->em->createQueryBuilder()
+                            ->select('identity(acp2.requestorPerson)')
+                            ->from('ChillPersonBundle:AccompanyingPeriod', 'acp2')
+                            ->join('acp2.participations', 'part2')
+                            ->where($expr->eq('acp2.requestorPerson', 'part2.person'))
+                            ->getDQL()
+                    )
+                );
+
+                break;
+
+            case 'thirdparty':
+                $clause = $qb->expr()->isNotNull('acp.requestorThirdParty');
+
+                break;
+
+            case 'no_requestor':
+                $clause = $qb->expr()->andX(
+                    $qb->expr()->isNull('acp.requestorPerson'),
+                    $qb->expr()->isNull('acp.requestorThirdParty')
+                );
+
+                break;
+
+            default:
+                throw new Exception('Uncaught choice exception');
+        }
+
+        if ($where instanceof Andx) {
+            $where->add($clause);
+        } else {
+            $where = $qb->expr()->andX($clause);
+        }
+
+        $qb->add('where', $where);
+    }
+
+    public function applyOn(): string
+    {
+        return Declarations::ACP_TYPE;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        $builder->add('accepted_choices', ChoiceType::class, [
+            'choices' => self::REQUESTOR_CHOICES,
+            'multiple' => false,
+            'expanded' => true,
+            'empty_data' => self::DEFAULT_CHOICE,
+            'data' => self::DEFAULT_CHOICE,
+        ]);
+    }
+
+    public function describeAction($data, $format = 'string'): array
+    {
+        $choice = array_flip(self::REQUESTOR_CHOICES)[$data['accepted_choices']];
+
+        return ['Filtered by requestor: only %choice%', [
+            '%choice%' => $this->translator->trans($choice),
+        ]];
+    }
+
+    public function getTitle(): string
+    {
+        return 'Filter by requestor';
+    }
+}

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

@@ -0,0 +1,98 @@
+<?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\MainBundle\Export\FilterInterface;
+use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Chill\PersonBundle\Entity\SocialWork\SocialAction;
+use Chill\PersonBundle\Export\Declarations;
+use Chill\PersonBundle\Templating\Entity\SocialActionRender;
+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 SocialActionFilter implements FilterInterface
+{
+    private SocialActionRender $actionRender;
+
+    private TranslatableStringHelper $translatableStringHelper;
+
+    public function __construct(
+        TranslatableStringHelper $translatableStringHelper,
+        SocialActionRender $actionRender
+    ) {
+        $this->translatableStringHelper = $translatableStringHelper;
+        $this->actionRender = $actionRender;
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        if (!in_array('acpw', $qb->getAllAliases(), true)) {
+            $qb->join('acp.works', 'acpw');
+        }
+        $qb->join('acpw.socialAction', 'sa');
+
+        $where = $qb->getDQLPart('where');
+        $clause = $qb->expr()->in('sa.id', ':socialactions');
+
+        if ($where instanceof Andx) {
+            $where->add($clause);
+        } else {
+            $where = $qb->expr()->andX($clause);
+        }
+
+        $qb->add('where', $where);
+        $qb->setParameter('socialactions', $data['accepted_socialactions']);
+    }
+
+    public function applyOn(): string
+    {
+        return Declarations::ACP_TYPE;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        $builder->add('accepted_socialactions', EntityType::class, [
+            'class' => SocialAction::class,
+            'choice_label' => function (SocialAction $sa) {
+                return $this->actionRender->renderString($sa, []);
+            },
+            'multiple' => true,
+            'expanded' => true,
+        ]);
+    }
+
+    public function describeAction($data, $format = 'string'): array
+    {
+        $socialactions = [];
+
+        foreach ($data['accepted_socialactions'] as $sa) {
+            $socialactions[] = $this->actionRender->renderString($sa, []);
+        }
+
+        return ['Filtered by socialactions: only %socialactions%', [
+            '%socialactions%' => implode(', ou ', $socialactions),
+        ]];
+    }
+
+    public function getTitle(): string
+    {
+        return 'Filter by socialaction';
+    }
+}

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

@@ -0,0 +1,148 @@
+<?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\MainBundle\Export\FilterInterface;
+use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
+use Chill\PersonBundle\Export\Declarations;
+use Chill\PersonBundle\Templating\Entity\SocialIssueRender;
+use Doctrine\ORM\Query\Expr\Andx;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
+
+class SocialIssueFilter implements FilterInterface
+{
+    /**
+     * @var TranslatorInterface
+     */
+    protected $translator;
+
+    private SocialIssueRender $socialIssueRender;
+
+    private TranslatableStringHelper $translatableStringHelper;
+
+    public function __construct(
+        TranslatorInterface $translator,
+        TranslatableStringHelper $translatableStringHelper,
+        SocialIssueRender $socialIssueRender
+    ) {
+        $this->translator = $translator;
+        $this->translatableStringHelper = $translatableStringHelper;
+        $this->socialIssueRender = $socialIssueRender;
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        $qb->join('acp.socialIssues', 'si');
+
+        $where = $qb->getDQLPart('where');
+        $clause = $qb->expr()->in('si.id', ':socialissues');
+
+        if ($where instanceof Andx) {
+            $where->add($clause);
+        } else {
+            $where = $qb->expr()->andX($clause);
+        }
+
+        $qb->add('where', $where);
+        $qb->setParameter(
+            'socialissues',
+            $this->addParentIssues($data['accepted_socialissues'])
+        );
+    }
+
+    public function applyOn()
+    {
+        return Declarations::ACP_TYPE;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        $builder->add('accepted_socialissues', EntityType::class, [
+            'class' => SocialIssue::class,
+            'choice_label' => function ($socialIssue) {
+                return $this->socialIssueRender->renderString($socialIssue, []);
+            },
+            'multiple' => true,
+            'expanded' => true,
+        ]);
+    }
+
+    public function describeAction($data, $format = 'string')
+    {
+        $issues = [];
+
+        $socialissues = $this->addParentIssues($data['accepted_socialissues']);
+
+        foreach ($socialissues as $i) {
+            if ('null' === $i) {
+                $issues[] = $this->translator->trans('Not given');
+            } else {
+                $issues[] = $this->socialIssueRender->renderString($i, []);
+            }
+        }
+
+        return [
+            'Filtered by socialissues: only %socialissues%', [
+                '%socialissues%' => implode(', ou ', $issues),
+            ], ];
+    }
+
+    public function getTitle()
+    {
+        return 'Filter by social issue';
+    }
+
+    /**
+     *  "Le filtre retiendra les parcours qui comportent cette problématique,
+     *   ou une problématique parente à celles choisies.".
+     *
+     *  Add parent of each socialissue selected, and remove duplicates
+     *
+     * @param $accepted_issues
+     */
+    private function addParentIssues($accepted_issues): array
+    {
+        $array = [];
+
+        foreach ($accepted_issues as $i) {
+            /** @var SocialIssue $i */
+            if ($i->hasParent()) {
+                $array[] = $i->getParent();
+            }
+            $array[] = $i;
+        }
+
+        return $this->removeDuplicate($array);
+    }
+
+    private function removeDuplicate(array $array): array
+    {
+        $ids = array_map(static function ($item) {
+            return $item->getId();
+        }, $array);
+
+        $unique_ids = array_unique($ids);
+
+        return array_values(
+            array_intersect_key($array, $unique_ids)
+        );
+    }
+}

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

@@ -0,0 +1,92 @@
+<?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\MainBundle\Export\FilterInterface;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Export\Declarations;
+use Doctrine\ORM\Query\Expr\Andx;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
+
+class StepFilter implements FilterInterface
+{
+    private const DEFAULT_CHOICE = AccompanyingPeriod::STEP_CONFIRMED;
+
+    private const STEPS = [
+        'Draft' => AccompanyingPeriod::STEP_DRAFT,
+        'Confirmed' => AccompanyingPeriod::STEP_CONFIRMED,
+        'Closed' => AccompanyingPeriod::STEP_CLOSED,
+    ];
+
+    /**
+     * @var TranslatorInterface
+     */
+    protected $translator;
+
+    public function __construct(TranslatorInterface $translator)
+    {
+        $this->translator = $translator;
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        $where = $qb->getDQLPart('where');
+        $clause = $qb->expr()->eq('acp.step', ':step');
+
+        if ($where instanceof Andx) {
+            $where->add($clause);
+        } else {
+            $where = $qb->expr()->andX($clause);
+        }
+
+        $qb->add('where', $where);
+        $qb->setParameter('step', $data['accepted_steps']);
+    }
+
+    public function applyOn()
+    {
+        return Declarations::ACP_TYPE;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        $builder->add('accepted_steps', ChoiceType::class, [
+            'choices' => self::STEPS,
+            'multiple' => false,
+            'expanded' => true,
+            'empty_data' => self::DEFAULT_CHOICE,
+            'data' => self::DEFAULT_CHOICE,
+        ]);
+    }
+
+    public function describeAction($data, $format = 'string')
+    {
+        $step = array_flip(self::STEPS)[$data['accepted_steps']];
+
+        return ['Filtered by steps: only %step%', [
+            '%step%' => $this->translator->trans($step),
+        ]];
+    }
+
+    public function getTitle()
+    {
+        return 'Filter by step';
+    }
+}

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

@@ -0,0 +1,87 @@
+<?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\EvaluationFilters;
+
+use Chill\MainBundle\Export\FilterInterface;
+use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Chill\PersonBundle\Entity\SocialWork\Evaluation;
+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;
+
+final class EvaluationTypeFilter 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)
+    {
+        $where = $qb->getDQLPart('where');
+        $clause = $qb->expr()->in('eval.evaluation', ':evaluationtype');
+
+        if ($where instanceof Andx) {
+            $where->add($clause);
+        } else {
+            $where = $qb->expr()->andX($clause);
+        }
+
+        $qb->add('where', $where);
+        $qb->setParameter('evaluationtype', $data['accepted_evaluationtype']);
+    }
+
+    public function applyOn(): string
+    {
+        return Declarations::EVAL_TYPE;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        $builder->add('accepted_evaluationtype', EntityType::class, [
+            'class' => Evaluation::class,
+            'choice_label' => function (Evaluation $ev): string {
+                return $this->translatableStringHelper->localize($ev->getTitle());
+            },
+            'multiple' => true,
+            'expanded' => true,
+        ]);
+    }
+
+    public function describeAction($data, $format = 'string'): array
+    {
+        $evals = [];
+
+        foreach ($data['accepted_evaluationtype'] as $ev) {
+            $evals[] = $this->translatableStringHelper->localize($ev->getTitle());
+        }
+
+        return ['Filtered by evaluation type: only %evals%', [
+            '%evals%' => implode(', ou ', $evals),
+        ]];
+    }
+
+    public function getTitle(): string
+    {
+        return 'Filter by evaluation type';
+    }
+}

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

@@ -0,0 +1,91 @@
+<?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\EvaluationFilters;
+
+use Chill\MainBundle\Export\FilterInterface;
+use Chill\PersonBundle\Export\Declarations;
+use Doctrine\ORM\Query\Expr\Andx;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
+
+class MaxDateFilter implements FilterInterface
+{
+    private const MAXDATE_CHOICES = [
+        'is specified' => true,
+        'is not specified' => false,
+    ];
+
+    private TranslatorInterface $translator;
+
+    public function __construct(TranslatorInterface $translator)
+    {
+        $this->translator = $translator;
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        $where = $qb->getDQLPart('where');
+
+        if (true === $data['maxdate']) {
+            $clause = $qb->expr()->isNotNull('eval.maxDate');
+        } else {
+            $clause = $qb->expr()->isNull('eval.maxDate');
+        }
+
+        if ($where instanceof Andx) {
+            $where->add($clause);
+        } else {
+            $where = $qb->expr()->andX($clause);
+        }
+
+        $qb->add('where', $where);
+    }
+
+    public function applyOn(): string
+    {
+        return Declarations::EVAL_TYPE;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        $builder->add('maxdate', ChoiceType::class, [
+            'choices' => self::MAXDATE_CHOICES,
+            'multiple' => false,
+            'expanded' => true,
+        ]);
+    }
+
+    public function describeAction($data, $format = 'string'): array
+    {
+        foreach (self::MAXDATE_CHOICES as $k => $v) {
+            if ($v === $data['maxdate']) {
+                $choice = $k;
+            }
+        }
+
+        return ['Filtered by maxdate: only %choice%', [
+            '%choice%' => $this->translator->trans($choice),
+        ]];
+    }
+
+    public function getTitle(): string
+    {
+        return 'Filter by maxdate';
+    }
+}

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

@@ -0,0 +1,115 @@
+<?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\HouseholdFilters;
+
+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\Export\Declarations;
+use DateTime;
+use Doctrine\DBAL\Types\Types;
+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 CompositionFilter 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)
+    {
+        if (!in_array('composition', $qb->getAllAliases(), true)) {
+            $qb->join('household.compositions', 'composition');
+        }
+
+        $where = $qb->getDQLPart('where');
+
+        $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->setParameter('compositions', $data['accepted_composition']);
+        $qb->setParameter('ondate', $data['on_date'], Types::DATE_MUTABLE);
+    }
+
+    public function applyOn(): string
+    {
+        return Declarations::HOUSEHOLD_TYPE;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        $builder
+            ->add('accepted_composition', EntityType::class, [
+                'class' => HouseholdCompositionType::class,
+                'choice_label' => function (HouseholdCompositionType $type) {
+                    return $this->translatableStringHelper->localize(
+                        $type->getLabel()
+                    );
+                },
+                'multiple' => true,
+                'expanded' => true,
+            ])
+            ->add('on_date', ChillDateType::class, [
+                'data' => new DateTime('now'),
+            ]);
+    }
+
+    public function describeAction($data, $format = 'string'): array
+    {
+        $compositions = [];
+
+        foreach ($data['accepted_composition'] as $c) {
+            $compositions[] = $this->translatableStringHelper->localize(
+                $c->getLabel()
+            );
+        }
+
+        return ['Filtered by composition: only %compositions% on %ondate%', [
+            '%compositions%' => implode(', ou ', $compositions),
+            '%ondate%' => $data['on_date']->format('d-m-Y'),
+        ]];
+    }
+
+    public function getTitle(): string
+    {
+        return 'Filter by composition';
+    }
+}

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

@@ -9,11 +9,12 @@
 
 declare(strict_types=1);
 
-namespace Chill\PersonBundle\Export\Filter;
+namespace Chill\PersonBundle\Export\Filter\PersonFilters;
 
 use Chill\MainBundle\Export\FilterInterface;
 use Chill\MainBundle\Form\Type\ChillDateType;
 use Chill\PersonBundle\Export\AbstractAccompanyingPeriodExportElement;
+use Chill\PersonBundle\Export\Declarations;
 use DateTime;
 use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\QueryBuilder;
@@ -21,7 +22,7 @@ use Symfony\Component\Form\FormBuilderInterface;
 
 class AccompanyingPeriodClosingFilter extends AbstractAccompanyingPeriodExportElement implements FilterInterface
 {
-    public function addRole()
+    public function addRole(): ?string
     {
         return null;
     }
@@ -42,7 +43,7 @@ class AccompanyingPeriodClosingFilter extends AbstractAccompanyingPeriodExportEl
 
     public function applyOn(): string
     {
-        return 'person';
+        return Declarations::PERSON_TYPE;
     }
 
     public function buildForm(FormBuilderInterface $builder)

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

@@ -9,11 +9,12 @@
 
 declare(strict_types=1);
 
-namespace Chill\PersonBundle\Export\Filter;
+namespace Chill\PersonBundle\Export\Filter\PersonFilters;
 
 use Chill\MainBundle\Export\FilterInterface;
 use Chill\MainBundle\Form\Type\ChillDateType;
 use Chill\PersonBundle\Export\AbstractAccompanyingPeriodExportElement;
+use Chill\PersonBundle\Export\Declarations;
 use DateTime;
 use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\QueryBuilder;
@@ -21,7 +22,7 @@ use Symfony\Component\Form\FormBuilderInterface;
 
 class AccompanyingPeriodFilter extends AbstractAccompanyingPeriodExportElement implements FilterInterface
 {
-    public function addRole()
+    public function addRole(): ?string
     {
         return null;
     }
@@ -49,7 +50,7 @@ class AccompanyingPeriodFilter extends AbstractAccompanyingPeriodExportElement i
 
     public function applyOn(): string
     {
-        return 'person';
+        return Declarations::PERSON_TYPE;
     }
 
     public function buildForm(FormBuilderInterface $builder)

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

@@ -9,11 +9,12 @@
 
 declare(strict_types=1);
 
-namespace Chill\PersonBundle\Export\Filter;
+namespace Chill\PersonBundle\Export\Filter\PersonFilters;
 
 use Chill\MainBundle\Export\FilterInterface;
 use Chill\MainBundle\Form\Type\ChillDateType;
 use Chill\PersonBundle\Export\AbstractAccompanyingPeriodExportElement;
+use Chill\PersonBundle\Export\Declarations;
 use DateTime;
 use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\QueryBuilder;
@@ -21,7 +22,7 @@ use Symfony\Component\Form\FormBuilderInterface;
 
 class AccompanyingPeriodOpeningFilter extends AbstractAccompanyingPeriodExportElement implements FilterInterface
 {
-    public function addRole()
+    public function addRole(): ?string
     {
         return null;
     }
@@ -42,7 +43,7 @@ class AccompanyingPeriodOpeningFilter extends AbstractAccompanyingPeriodExportEl
 
     public function applyOn(): string
     {
-        return 'person';
+        return Declarations::PERSON_TYPE;
     }
 
     public function buildForm(FormBuilderInterface $builder)

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

@@ -0,0 +1,111 @@
+<?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\Export\ExportElementValidatedInterface;
+use Chill\MainBundle\Export\FilterInterface;
+use Chill\MainBundle\Form\Type\ChillDateType;
+use Chill\PersonBundle\Export\Declarations;
+use DateTime;
+use Doctrine\ORM\Query\Expr;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\Extension\Core\Type\IntegerType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\Validator\Context\ExecutionContextInterface;
+
+class AgeFilter implements ExportElementValidatedInterface, FilterInterface
+{
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        $where = $qb->getDQLPart('where');
+
+        $min = null !== $data['min_age'] ? $data['min_age'] : 0;
+        $max = null !== $data['max_age'] ? $data['max_age'] : 200;
+        $calc = $data['date_calc'];
+
+        $clause = $qb->expr()->andX(
+            $qb->expr()->gte(
+                'DATE_DIFF(:calc_date, person.birthdate)/365',
+                ':min_age'
+            ),
+            $qb->expr()->lte(
+                'DATE_DIFF(:calc_date, person.birthdate)/365',
+                ':max_age'
+            )
+        );
+
+        if ($where instanceof Expr\Andx) {
+            $where->add($clause);
+        } else {
+            $where = $qb->expr()->andX($clause);
+        }
+
+        $qb->add('where', $where);
+        $qb->setParameter('min_age', $min);
+        $qb->setParameter('max_age', $max);
+        $qb->setParameter('calc_date', $calc);
+    }
+
+    public function applyOn()
+    {
+        return Declarations::PERSON_TYPE;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        $builder->add('min_age', IntegerType::class, [
+            'label' => 'Minimum age',
+        ]);
+
+        $builder->add('max_age', IntegerType::class, [
+            'label' => 'Maximum age',
+        ]);
+
+        $builder->add('date_calc', ChillDateType::class, [
+            'label' => 'Calculate age in relation to this date',
+            'data' => new DateTime('now'),
+        ]);
+    }
+
+    public function describeAction($data, $format = 'string')
+    {
+        return ['Filtered by person\'s age: '
+        . 'between %min_age% and %max_age%', [
+            '%min_age%' => $data['min_age'],
+            '%max_age%' => $data['max_age'],
+        ], ];
+    }
+
+    public function getTitle()
+    {
+        return 'Filter by person\'s age';
+    }
+
+    public function validateForm($data, ExecutionContextInterface $context)
+    {
+        $min = $data['min_age'];
+        $max = $data['max_age'];
+
+        if (
+            (null !== $min && null !== $max)
+            && $min >= $max
+        ) {
+            $context->buildViolation('The minimum age should be less than the maximum age.')
+                ->addViolation();
+        }
+    }
+}

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

@@ -9,18 +9,19 @@
 
 declare(strict_types=1);
 
-namespace Chill\PersonBundle\Export\Filter;
+namespace Chill\PersonBundle\Export\Filter\PersonFilters;
 
 use Chill\MainBundle\Export\ExportElementValidatedInterface;
 use Chill\MainBundle\Export\FilterInterface;
+use Chill\MainBundle\Form\Type\ChillDateType;
+use Chill\PersonBundle\Export\Declarations;
 use DateTime;
 use Doctrine\ORM\Query\Expr;
-use Symfony\Component\Form\Extension\Core\Type\DateType;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
 
 class BirthdateFilter implements ExportElementValidatedInterface, FilterInterface
 {
-    public function addRole()
+    public function addRole(): ?string
     {
         return null;
     }
@@ -47,31 +48,25 @@ class BirthdateFilter implements ExportElementValidatedInterface, FilterInterfac
 
     public function applyOn()
     {
-        return 'person';
+        return Declarations::PERSON_TYPE;
     }
 
     public function buildForm(\Symfony\Component\Form\FormBuilderInterface $builder)
     {
-        $builder->add('date_from', DateType::class, [
+        $builder->add('date_from', ChillDateType::class, [
             'label' => 'Born after this date',
             'data' => new DateTime(),
-            'attr' => ['class' => 'datepicker'],
-            'widget' => 'single_text',
-            'format' => 'dd-MM-yyyy',
         ]);
 
-        $builder->add('date_to', DateType::class, [
+        $builder->add('date_to', ChillDateType::class, [
             'label' => 'Born before this date',
             'data' => new DateTime(),
-            'attr' => ['class' => 'datepicker'],
-            'widget' => 'single_text',
-            'format' => 'dd-MM-yyyy',
         ]);
     }
 
     public function describeAction($data, $format = 'string')
     {
-        return ['Filtered by person\'s birtdate: '
+        return ['Filtered by person\'s birthdate: '
             . 'between %date_from% and %date_to%', [
                 '%date_from%' => $data['date_from']->format('d-m-Y'),
                 '%date_to%' => $data['date_to']->format('d-m-Y'),

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

@@ -0,0 +1,113 @@
+<?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\Export\FilterInterface;
+use Chill\MainBundle\Form\Type\ChillDateType;
+use Chill\PersonBundle\Export\Declarations;
+use DateTime;
+use Doctrine\ORM\Query\Expr;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\Form\FormBuilderInterface;
+
+class DeadOrAliveFilter implements FilterInterface
+{
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        $where = $qb->getDQLPart('where');
+
+        $personState = $data['person_state'];
+        $calc = $data['date_calc'];
+
+        if ('alive' === $personState) {
+            $clause = $qb->expr()->orX(
+                $qb->expr()->andX(
+                    $qb->expr()->isNull('person.deathdate'),
+                    $qb->expr()->lte(
+                       'person.birthdate',
+                       ':date_calc'
+                   )
+                ),
+                $qb->expr()->andX(
+                    $qb->expr()->isNotNull('person.deathdate'),
+                    $qb->expr()->gt(
+                        'person.deathdate',
+                        ':date_calc'
+                    ),
+                    $qb->expr()->lte(
+                        'person.birthdate',
+                        ':date_calc'
+                    )
+                )
+            );
+        } else {
+            $clause = $qb->expr()->andX(
+                $qb->expr()->isNotNull('person.deathdate'),
+                $qb->expr()->lte(
+                    'person.deathdate',
+                    ':date_calc'
+                )
+            );
+        }
+
+        if ($where instanceof Expr\Andx) {
+            $where->add($clause);
+        } else {
+            $where = $qb->expr()->andX($clause);
+        }
+
+        $qb->add('where', $where);
+        $qb->setParameter('date_calc', $calc);
+    }
+
+    public function applyOn()
+    {
+        return Declarations::PERSON_TYPE;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        $builder->add('person_state', ChoiceType::class, [
+            'choices' => [
+                'Alive' => 'alive',
+                'Deceased' => 'deceased',
+            ],
+            'multiple' => false,
+            'expanded' => true,
+        ]);
+
+        $builder->add('date_calc', ChillDateType::class, [
+            'label' => 'Filter in relation to this date',
+            'data' => new DateTime('now'),
+        ]);
+    }
+
+    public function describeAction($data, $format = 'string')
+    {
+        return ['Filtered by a state of %deadOrAlive%: '
+        . 'at this date %date_calc%', [
+            '%date_calc%' => $data['date_calc']->format('d-m-Y'),
+            '%deadOrAlive%' => $data['person_state'],
+        ], ];
+    }
+
+    public function getTitle()
+    {
+        return 'Filtered by person\'s that are alive or have deceased at a certain date';
+    }
+}

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

@@ -0,0 +1,109 @@
+<?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\Export\ExportElementValidatedInterface;
+use Chill\MainBundle\Export\FilterInterface;
+use Chill\MainBundle\Form\Type\ChillDateType;
+use Chill\PersonBundle\Export\Declarations;
+use DateTime;
+use Doctrine\ORM\Query\Expr;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\Validator\Context\ExecutionContextInterface;
+
+class DeathdateFilter implements ExportElementValidatedInterface, FilterInterface
+{
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        $where = $qb->getDQLPart('where');
+        $clause = $qb->expr()->between(
+            'person.deathdate',
+            ':date_from',
+            ':date_to'
+        );
+
+        if ($where instanceof Expr\Andx) {
+            $where->add($clause);
+        } else {
+            $where = $qb->expr()->andX($clause);
+        }
+
+        $qb->add('where', $where);
+        $qb->setParameter('date_from', $data['date_from']);
+        $qb->setParameter('date_to', $data['date_to']);
+    }
+
+    public function applyOn()
+    {
+        return Declarations::PERSON_TYPE;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        $builder->add('date_from', ChillDateType::class, [
+            'label' => 'Death after this date',
+            'data' => new DateTime(),
+        ]);
+
+        $builder->add('date_to', ChillDateType::class, [
+            'label' => 'Deathdate before',
+            'data' => new DateTime(),
+        ]);
+    }
+
+    public function describeAction($data, $format = 'string')
+    {
+        return ['Filtered by person\'s deathdate: '
+            . 'between %date_from% and %date_to%', [
+                '%date_from%' => $data['date_from']->format('d-m-Y'),
+                '%date_to%' => $data['date_to']->format('d-m-Y'),
+            ], ];
+    }
+
+    public function getTitle()
+    {
+        return 'Filter by person\'s deathdate';
+    }
+
+    public function validateForm($data, ExecutionContextInterface $context)
+    {
+        $date_from = $data['date_from'];
+        $date_to = $data['date_to'];
+
+        if (null === $date_from) {
+            $context->buildViolation('The "date from" should not be empty')
+                //->atPath('date_from')
+                ->addViolation();
+        }
+
+        if (null === $date_to) {
+            $context->buildViolation('The "date to" should not be empty')
+                //->atPath('date_to')
+                ->addViolation();
+        }
+
+        if (
+            (null !== $date_from && null !== $date_to)
+            && $date_from >= $date_to
+        ) {
+            $context->buildViolation('The date "date to" should be after the '
+                . 'date given in "date from" field')
+                ->addViolation();
+        }
+    }
+}

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

@@ -9,11 +9,12 @@
 
 declare(strict_types=1);
 
-namespace Chill\PersonBundle\Export\Filter;
+namespace Chill\PersonBundle\Export\Filter\PersonFilters;
 
 use Chill\MainBundle\Export\ExportElementValidatedInterface;
 use Chill\MainBundle\Export\FilterInterface;
 use Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\Export\Declarations;
 use Doctrine\ORM\Query\Expr;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
@@ -41,7 +42,7 @@ class GenderFilter implements
         $this->translator = $translator;
     }
 
-    public function addRole()
+    public function addRole(): ?string
     {
         return null;
     }
@@ -74,7 +75,7 @@ class GenderFilter implements
 
     public function applyOn()
     {
-        return 'person';
+        return Declarations::PERSON_TYPE;
     }
 
     public function buildForm(FormBuilderInterface $builder)

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

@@ -0,0 +1,98 @@
+<?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\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
+{
+    private TranslatableStringHelper $translatableStringHelper;
+
+    public function __construct(
+        TranslatableStringHelper $translatableStringHelper
+    ) {
+        $this->translatableStringHelper = $translatableStringHelper;
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(\Doctrine\ORM\QueryBuilder $qb, $data)
+    {
+        $where = $qb->getDQLPart('where');
+
+        $clause = $qb->expr()->andX(
+            $qb->expr()->in('person.maritalStatus', ':maritalStatus'),
+            $qb->expr()->orX(
+                $qb->expr()->eq('person.maritalStatusDate', ':calc_date'),
+                $qb->expr()->isNull('person.maritalStatusDate')
+            )
+        );
+
+        if ($where instanceof Andx) {
+            $where->add($clause);
+        } else {
+            $where = $qb->expr()->andX($clause);
+        }
+
+        $qb->add('where', $where);
+        $qb->setParameter('maritalStatus', $data['maritalStatus']);
+        $qb->setParameter('calc_date', $data['calc_date']);
+    }
+
+    public function applyOn()
+    {
+        return Declarations::PERSON_TYPE;
+    }
+
+    public function buildForm(\Symfony\Component\Form\FormBuilderInterface $builder)
+    {
+        $builder->add('maritalStatus', EntityType::class, [
+            'class' => MaritalStatus::class,
+            'choice_label' => function (MaritalStatus $ms) {
+                return $this->translatableStringHelper->localize(
+                    $ms->getName()
+                );
+            },
+            'multiple' => true,
+            'expanded' => true
+        ]);
+
+        $builder->add('calc_date', ChillDateType::class, [
+            'label' => 'Marital status at this time',
+            'data' => new DateTime(),
+        ]);
+    }
+
+    public function describeAction($data, $format = 'string')
+    {
+        return ['Filtered by person\'s marital status'];
+    }
+
+    public function getTitle()
+    {
+        return 'Filter by person\'s marital status';
+    }
+}

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

@@ -9,13 +9,14 @@
 
 declare(strict_types=1);
 
-namespace Chill\PersonBundle\Export\Filter;
+namespace Chill\PersonBundle\Export\Filter\PersonFilters;
 
 use Chill\MainBundle\Entity\Country;
 use Chill\MainBundle\Export\ExportElementValidatedInterface;
 use Chill\MainBundle\Export\FilterInterface;
 use Chill\MainBundle\Form\Type\Select2CountryType;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Chill\PersonBundle\Export\Declarations;
 use Doctrine\ORM\Query\Expr;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
@@ -35,7 +36,7 @@ class NationalityFilter implements
         $this->translatableStringHelper = $helper;
     }
 
-    public function addRole()
+    public function addRole(): ?string
     {
         return null;
     }
@@ -57,7 +58,7 @@ class NationalityFilter implements
 
     public function applyOn()
     {
-        return 'person';
+        return Declarations::PERSON_TYPE;
     }
 
     public function buildForm(FormBuilderInterface $builder)

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

@@ -0,0 +1,102 @@
+<?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\Export\FilterInterface;
+use Chill\MainBundle\Form\Type\ChillDateType;
+use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Chill\PersonBundle\Export\Declarations;
+use Chill\ThirdPartyBundle\Entity\ThirdPartyCategory;
+use DateTime;
+use Doctrine\ORM\Query\Expr;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
+use Symfony\Component\Form\FormBuilderInterface;
+
+class ResidentialAddressAtThirdpartyFilter 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)
+    {
+        $qb->resetDQLPart('from');
+        $qb->from('ChillPersonBundle:Person\ResidentialAddress', 'ra');
+
+        $qb->join('ra.person', 'person');
+        $qb->join('person.center', 'center');
+        $qb->join('ra.hostThirdParty', 't');
+        $qb->join('t.categories', 'tc');
+
+        $where = $qb->getDQLPart('where');
+        $clause = $qb->expr()->andX(
+            $qb->expr()->isNotNull('ra.hostThirdParty'),
+            $qb->expr()->between(':date', 'ra.startDate', 'ra.endDate'),
+            $qb->expr()->in('tc.id', ':type')
+        );
+
+        if ($where instanceof Expr\Andx) {
+            $where->add($clause);
+        } else {
+            $where = $qb->expr()->andX($clause);
+        }
+
+        $qb->setParameter('type', $data['thirdparty_cat']);
+        $qb->setParameter('date', $data['date_calc']);
+        $qb->add('where', $where);
+    }
+
+    public function applyOn()
+    {
+        return Declarations::PERSON_TYPE;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        $builder->add('thirdparty_cat', EntityType::class, [
+            'class' => ThirdPartyCategory::class,
+            'label' => 'Category',
+            'choice_label' => function (ThirdPartyCategory $tpc) {
+                return $this->translatableStringHelper->localize($tpc->getName());
+            },
+            'multiple' => true,
+            'expanded' => true,
+        ]);
+
+        $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 a thirdparty of type %thirdparty_type% and valid on %date_calc%', [
+            '%thirdparty_type%' => $this->translatableStringHelper->localize($data['thirdparty_cat'][0]->getName()),
+            '%date_calc%' => $data['date_calc']->format('d-m-Y'),
+        ]];
+    }
+
+    public function getTitle()
+    {
+        return 'Filtered by person\'s who have a residential address located at a thirdparty of type';
+    }
+}

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

@@ -0,0 +1,65 @@
+<?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\Export\FilterInterface;
+use Chill\PersonBundle\Export\Declarations;
+use Doctrine\ORM\Query\Expr\Andx;
+use Doctrine\ORM\QueryBuilder;
+
+class ResidentialAddressAtUserFilter implements FilterInterface
+{
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        $qb->resetDQLPart('from');
+        $qb->from('ChillPersonBundle:Person\ResidentialAddress', 'ra');
+
+        $qb->join('ra.person', 'person');
+        $qb->join('person.center', 'center');
+
+        $where = $qb->getDQLPart('where');
+        $clause = $qb->expr()->isNotNull('ra.hostPerson');
+
+        if ($where instanceof Andx) {
+            $where->add($clause);
+        } else {
+            $where = $qb->expr()->andX($clause);
+        }
+
+        $qb->add('where', $where);
+    }
+
+    public function applyOn()
+    {
+        return Declarations::PERSON_TYPE;
+    }
+
+    public function buildForm(\Symfony\Component\Form\FormBuilderInterface $builder)
+    {
+        // No form needed unless validity date should be added ( not specified in doc as a parameter ).
+    }
+
+    public function describeAction($data, $format = 'string')
+    {
+        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';
+    }
+}

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

@@ -0,0 +1,98 @@
+<?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\SocialWorkFilters;
+
+use Chill\MainBundle\Entity\UserJob;
+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;
+use Symfony\Contracts\Translation\TranslatorInterface;
+
+class JobFilter implements FilterInterface
+{
+    protected TranslatorInterface $translator;
+
+    private TranslatableStringHelper $translatableStringHelper;
+
+    public function __construct(
+        TranslatorInterface $translator,
+        TranslatableStringHelper $translatableStringHelper
+    ) {
+        $this->translator = $translator;
+        $this->translatableStringHelper = $translatableStringHelper;
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        $qb->join('acpw.referrers', 'u');
+
+        $where = $qb->getDQLPart('where');
+        $clause = $qb->expr()->in('u.userJob', ':job');
+
+        if ($where instanceof Andx) {
+            $where->add($clause);
+        } else {
+            $where = $qb->expr()->andX($clause);
+        }
+
+        $qb->add('where', $where);
+        $qb->setParameter('job', $data['job']);
+    }
+
+    public function applyOn()
+    {
+        return Declarations::SOCIAL_WORK_ACTION_TYPE;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        $builder->add('job', EntityType::class, [
+            'class' => UserJob::class,
+            'choice_label' => function (UserJob $j) {
+                return $this->translatableStringHelper->localize(
+                    $j->getLabel()
+                );
+            },
+            'multiple' => true,
+            'expanded' => true,
+        ]);
+    }
+
+    public function describeAction($data, $format = 'string')
+    {
+        $userjobs = [];
+
+        foreach ($data['job'] as $j) {
+            $userjobs[] = $this->translatableStringHelper->localize(
+                $j->getLabel()
+            );
+        }
+
+        return ['Filtered by treating agent job: only %jobs%', [
+            '%jobs%' => implode(', ou ', $userjobs),
+        ]];
+    }
+
+    public function getTitle(): string
+    {
+        return 'Filter by treating agent job';
+    }
+}

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

@@ -0,0 +1,89 @@
+<?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\SocialWorkFilters;
+
+use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Export\FilterInterface;
+use Chill\MainBundle\Templating\Entity\UserRender;
+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;
+
+class ReferrerFilter implements FilterInterface
+{
+    private UserRender $userRender;
+
+    public function __construct(UserRender $userRender)
+    {
+        $this->userRender = $userRender;
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        $qb->join('acpw.referrers', 'u');
+
+        $where = $qb->getDQLPart('where');
+        $clause = $qb->expr()->in('u', ':agents');
+
+        if ($where instanceof Andx) {
+            $where->add($clause);
+        } else {
+            $where = $qb->expr()->andX($clause);
+        }
+
+        $qb->add('where', $where);
+        $qb->setParameter('agents', $data['accepted_agents']);
+    }
+
+    public function applyOn(): string
+    {
+        return Declarations::SOCIAL_WORK_ACTION_TYPE;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        $builder->add('accepted_agents', EntityType::class, [
+            'class' => User::class,
+            'choice_label' => function (User $u) {
+                return $this->userRender->renderString($u, []);
+            },
+            'multiple' => true,
+            'expanded' => true,
+        ]);
+    }
+
+    public function describeAction($data, $format = 'string'): array
+    {
+        $users = [];
+
+        foreach ($data['accepted_agents'] as $r) {
+            $users[] = $r;
+        }
+
+        return [
+            'Filtered by treating agent: only %agents%', [
+                '%agents' => implode(', ou ', $users),
+            ], ];
+    }
+
+    public function getTitle(): string
+    {
+        return 'Filter by treating agent';
+    }
+}

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

@@ -0,0 +1,98 @@
+<?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\SocialWorkFilters;
+
+use Chill\MainBundle\Entity\Scope;
+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;
+use Symfony\Contracts\Translation\TranslatorInterface;
+
+class ScopeFilter implements FilterInterface
+{
+    protected TranslatorInterface $translator;
+
+    private TranslatableStringHelper $translatableStringHelper;
+
+    public function __construct(
+        TranslatorInterface $translator,
+        TranslatableStringHelper $translatableStringHelper
+    ) {
+        $this->translator = $translator;
+        $this->translatableStringHelper = $translatableStringHelper;
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        $qb->join('acpw.referrers', 'u');
+
+        $where = $qb->getDQLPart('where');
+        $clause = $qb->expr()->in('u.mainScope', ':scope');
+
+        if ($where instanceof Andx) {
+            $where->add($clause);
+        } else {
+            $where = $qb->expr()->andX($clause);
+        }
+
+        $qb->add('where', $where);
+        $qb->setParameter('scope', $data['scope']);
+    }
+
+    public function applyOn()
+    {
+        return Declarations::SOCIAL_WORK_ACTION_TYPE;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        $builder->add('scope', EntityType::class, [
+            'class' => Scope::class,
+            'choice_label' => function (Scope $s) {
+                return $this->translatableStringHelper->localize(
+                    $s->getName()
+                );
+            },
+            'multiple' => true,
+            'expanded' => true,
+        ]);
+    }
+
+    public function describeAction($data, $format = 'string')
+    {
+        $scopes = [];
+
+        foreach ($data['scope'] as $s) {
+            $scopes[] = $this->translatableStringHelper->localize(
+                $s->getName()
+            );
+        }
+
+        return ['Filtered by treating agent scope: only %scopes%', [
+            '%scopes%' => implode(', ou ', $scopes),
+        ]];
+    }
+
+    public function getTitle()
+    {
+        return 'Filter by treating agent scope';
+    }
+}

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

@@ -0,0 +1,144 @@
+<?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\SocialWorkFilters;
+
+use Chill\MainBundle\Export\FilterInterface;
+use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Chill\PersonBundle\Entity\SocialWork\Goal;
+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\Query\Expr\Andx;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\Form\FormEvent;
+use Symfony\Component\Form\FormEvents;
+use Symfony\Component\Form\FormInterface;
+
+class SocialWorkTypeFilter implements FilterInterface
+{
+    private SocialActionRender $socialActionRender;
+
+    private SocialActionRepository $socialActionRepository;
+
+    private TranslatableStringHelper $translatableStringHelper;
+
+    public function __construct(
+        SocialActionRender $socialActionRender,
+        TranslatableStringHelper $translatableStringHelper,
+        SocialActionRepository $socialActionRepository
+    ) {
+        $this->socialActionRender = $socialActionRender;
+        $this->translatableStringHelper = $translatableStringHelper;
+        $this->socialActionRepository = $socialActionRepository;
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    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);
+        }
+
+        $qb->add('where', $where);
+        $qb->setParameter('referrers', $data['referrers']);
+    }
+
+    public function applyOn(): string
+    {
+        return Declarations::SOCIAL_WORK_ACTION_TYPE;
+    }
+
+    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);
+            }
+        );
+         */
+    }
+
+    public function describeAction($data, $format = 'string'): array
+    {
+        $actionTypes = [];
+        $objectives = [];
+        $results = [];
+
+        foreach ($data['actionType'] as $at) {
+            $actionTypes[] = $at->getTitle();
+        }
+
+        foreach ($data['objectives'] as $o) {
+            $objectives[] = $o->getTitle();
+        }
+
+        foreach ($data['results'] as $r) {
+            $results[] = $r->getTitle();
+        }
+
+        return ['Filtered by referrers: only %actionTypes%', [
+            '%actionTypes%' => implode(', ou ', $actionTypes),
+        ]];
+    }
+
+    public function getTitle(): string
+    {
+        return 'Filter by type of action, objectives and results';
+    }
+}

src/Bundle/ChillPersonBundle/Form/HouseholdCompositionTypeType.php

@@ -0,0 +1,38 @@
+<?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\Form;
+
+use Chill\MainBundle\Form\Type\TranslatableStringFormType;
+use Chill\PersonBundle\Entity\Household\HouseholdCompositionType;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+
+class HouseholdCompositionTypeType extends AbstractType
+{
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+        $builder
+            ->add('label', TranslatableStringFormType::class)
+            ->add('active', CheckboxType::class, [
+                'label' => 'Actif?',
+                'required' => false,
+            ]);
+    }
+
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $resolver
+            ->setDefault('class', HouseholdCompositionType::class);
+    }
+}

src/Bundle/ChillPersonBundle/Menu/AdminHouseholdMenuBuilder.php

@@ -46,9 +46,13 @@ class AdminHouseholdMenuBuilder implements LocalMenuBuilderInterface
             'route' => 'chill_crud_person_household_position_index',
         ])->setExtras(['order' => 2110]);
 
+        $menu->addChild('Composition', [
+            'route' => 'chill_crud_person_household_composition_type_index',
+        ])->setExtras(['order' => 2120]);
+
         $menu->addChild('person_admin.relation', [
             'route' => 'chill_crud_person_relation_index',
-        ])->setExtras(['order' => 2120]);
+        ])->setExtras(['order' => 2130]);
     }
 
     public static function getMenuIds(): array

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

@@ -56,6 +56,11 @@ final class AccompanyingPeriodWorkRepository implements ObjectRepository
             ->select('count(w)')->getQuery()->getSingleScalarResult();
     }
 
+    public function createQueryBuilder(string $alias, ?string $indexBy = null): QueryBuilder
+    {
+        return $this->repository->createQueryBuilder($alias, $indexBy);
+    }
+
     public function find($id): ?AccompanyingPeriodWork
     {
         return $this->repository->find($id);

src/Bundle/ChillPersonBundle/Repository/PersonRepository.php

@@ -51,6 +51,11 @@ final class PersonRepository implements ObjectRepository
         return $qb->getQuery()->getSingleScalarResult();
     }
 
+    public function createQueryBuilder(string $alias, ?string $indexBy = null): QueryBuilder
+    {
+        return $this->repository->createQueryBuilder($alias, $indexBy);
+    }
+
     public function find($id, $lockMode = null, $lockVersion = null): ?Person
     {
         return $this->repository->find($id, $lockMode, $lockVersion);

src/Bundle/ChillPersonBundle/Repository/SocialWork/SocialActionRepository.php

@@ -14,6 +14,7 @@ namespace Chill\PersonBundle\Repository\SocialWork;
 use Chill\PersonBundle\Entity\SocialWork\SocialAction;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
+use Doctrine\ORM\QueryBuilder;
 use Doctrine\Persistence\ObjectRepository;
 
 final class SocialActionRepository implements ObjectRepository
@@ -25,6 +26,11 @@ final class SocialActionRepository implements ObjectRepository
         $this->repository = $entityManager->getRepository(SocialAction::class);
     }
 
+    public function createQueryBuilder(string $alias, ?string $indexBy = null): QueryBuilder
+    {
+        return $this->repository->createQueryBuilder($alias, $indexBy);
+    }
+
     public function find($id, ?int $lockMode = null, ?int $lockVersion = null): ?SocialAction
     {
         return $this->repository->find($id, $lockMode, $lockVersion);

src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/_join_household.html.twig

@@ -1,7 +1,7 @@
 <div class="alert alert-warning alert-with-actions">
     <div class="float-button bottom">
         <div class="box">
-
+            {% if is_granted('CHILL_PERSON_ACCOMPANYING_PERIOD_UPDATE', accompanyingCourse) %}
             <div class="action">
                 <ul class="record_actions">
                     <li>
@@ -13,6 +13,8 @@
                     </li>
                 </ul>
             </div>
+            {% endif %}
+
             <p>{{ 'Some peoples does not belong to any household currently. Add them to an household soon'|trans }}</p>
         </div>
     </div>

src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/_warning_address.html.twig

@@ -3,6 +3,7 @@
 <div class="alert alert-danger {% if hasPersonLocation %}alert-with-actions{% endif %}">
     <div class="float-button bottom">
         <div class="box">
+            {% if is_granted('CHILL_PERSON_ACCOMPANYING_PERIOD_UPDATE', accompanyingCourse) %}
             <div class="action">
                 <ul class="record_actions">
                     <li>
@@ -14,6 +15,7 @@
                     </li>
                 </ul>
             </div>
+            {% endif %}
                 <p>
             {{ 'This course is located at a temporarily address. You should locate this course to an user'|trans }}</p>
             {% if not hasPersonLocation %}

src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/dispatch_list.html.twig

@@ -14,7 +14,7 @@
     {% if is_granted('CHILL_PERSON_ACCOMPANYING_PERIOD_UPDATE', period) %}
         <div class="item-col item-meta">
             {% set job_id = null %}
-            {% if period.job is defined %}
+            {% if period.job is not null %}
                 {% set job_id = period.job.id %}
             {% endif %}
             <span

src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/_list.html.twig

@@ -48,13 +48,66 @@
 {% endmacro %}
 
 {% block content %}
-    <div class="flex-table accompanyingcourse-list">
-        {% for period in accompanying_periods %}
 
+    {# WARNING: this list is rendered in either person context or houshold context #}
+
+    {%- set acps = [] %}
+    {%- set acpsClosed = [] %}
+    {% for acp in accompanying_periods %}
+        {% if acp.step == 'CLOSED' or (person is defined and acp.requestorPerson is not same as(person) and acp.openParticipationContainsPerson(person) is null ) %}
+            {%- set acpsClosed = acpsClosed|merge([acp]) %}
+        {% else %}
+            {%- set acps = acps|merge([acp]) %}
+        {% endif %}
+    {% endfor %}
+
+    <div class="flex-table accompanyingcourse-list">
+        {% for period in acps %}
             {% include 'ChillPersonBundle:AccompanyingPeriod:_list_item.html.twig' with {
                 'recordAction': _self.recordAction(period, contextEntity)
             } %}
-
+        {% else %}
+            <p class="chill-no-data-statement">{{ 'Any accompanying periods are open'|trans }}</p>
         {% endfor %}
     </div>
+
+    {% if acpsClosed|length > 0 %}
+        {% if person is defined %}
+            {% set identifier = person.id %}
+        {% else  %}
+            {% set identifier = household.id %}
+        {% endif %}
+
+        <div class="accordion" id="member_{{ identifier }}">
+            <div class="accordion-item">
+                <h2 class="accordion-header" id="heading_{{ identifier }}">
+                    <button
+                        class="accordion-button collapsed"
+                        type="button"
+                        data-bs-toggle="collapse"
+                        data-bs-target="#collapse_{{ identifier }}"
+                        aria-expanded="false"
+                        aria-controls="collapse_{{ identifier }}">
+                        <span class="folded">{{ 'periods.show closed periods'|trans({ 'nb_items': acpsClosed|length }) }}</span>
+                        <span class="unfolded text-secondary">{{ 'periods.hide closed periods'|trans({ 'nb_items': acpsClosed|length }) }}</span>
+                    </button>
+                </h2>
+
+                <div id="collapse_{{ identifier }}"
+                     class="accordion-collapse collapse"
+                     aria-labelledby="heading_{{ identifier }}"
+                     data-bs-parent="#nonCurrent">
+
+                    <div class="flex-table accompanyingcourse-list">
+                        {% for period in acpsClosed %}
+                            {% include 'ChillPersonBundle:AccompanyingPeriod:_list_item.html.twig' with {
+                                'recordAction': _self.recordAction(period, contextEntity)
+                            } %}
+                        {% endfor %}
+                    </div>
+
+                </div>
+            </div>
+        </div>
+    {% endif %}
 {% endblock content %}

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

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

src/Bundle/ChillPersonBundle/Resources/views/HouseholdCompositionType/edit.html.twig

@@ -0,0 +1,11 @@
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
+
+{% block title %}
+    {% include('@ChillMain/CRUD/_edit_title.html.twig') %}
+{% endblock %}
+
+{% block admin_content %}
+    {% embed '@ChillMain/CRUD/_edit_content.html.twig' %}
+        {% block content_form_actions_save_and_show %}{% endblock %}
+    {% endembed %}
+{% endblock admin_content %}

src/Bundle/ChillPersonBundle/Resources/views/HouseholdCompositionType/index.html.twig

@@ -0,0 +1,41 @@
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
+
+{% block admin_content %}
+    {% embed '@ChillMain/CRUD/_index.html.twig' %}
+        {% block table_entities_thead_tr %}
+            <th>{{ 'Id'|trans }}</th>
+            <th>{{ 'Label'|trans }}</th>
+            <th>{{ 'Active'|trans }}</th>
+            <th>&nbsp;</th>
+        {% endblock %}
+
+        {% block table_entities_tbody %}
+            {% for entity in entities %}
+                <tr>
+                    <td>{{ entity.id }}</td>
+                    <td>{{ entity.label|localize_translatable_string }}</td>
+                    <td style="text-align:center;">
+						{%- if entity.isActive -%}
+							<i class="fa fa-check-square-o"></i>
+						{%- else -%}
+							<i class="fa fa-square-o"></i>
+						{%- endif -%}
+					</td>
+                    <td>
+                        <ul class="record_actions">
+                            <li>
+                                <a href="{{ chill_path_add_return_path('chill_crud_person_household_position_edit', { 'id': entity.id }) }}" class="btn btn-edit"></a>
+                            </li>
+                        </ul>
+                    </td>
+                </tr>
+             {% endfor %}
+        {% endblock %}
+
+        {% block actions_before %}
+            <li class='cancel'>
+                <a href="{{ path('chill_main_admin_central') }}" class="btn btn-cancel">{{'Back to the admin'|trans}}</a>
+            </li>
+        {% endblock %}
+    {% endembed %}
+{% endblock %}

src/Bundle/ChillPersonBundle/Resources/views/HouseholdCompositionType/new.html.twig

@@ -0,0 +1,12 @@
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
+
+{% block title %}
+    {% include('@ChillMain/CRUD/_new_title.html.twig') %}
+{% endblock %}
+
+{% block admin_content %}
+    {% embed '@ChillMain/CRUD/_new_content.html.twig' %}
+        {% block content_form_actions_save_and_show %}{% endblock %}
+    {% endembed %}
+{% endblock admin_content %}
+

src/Bundle/ChillPersonBundle/Resources/views/Person/household_history.html.twig

@@ -65,18 +65,18 @@
                     <h3>{{ 'household.Members at same time'|trans }}</h3>
                 </div>
                 <div class="wl-col list">
-                    {% set simultaneous = p.household.getMembersDuringMembership(p) %}
+                    {% set simultaneous = p.household.getPersonsDuringMembership(p) %}
                     {% if simultaneous|length == 0 %}
                         <p class="chill-no-data-statement">
                             {{ 'household.Any simultaneous members'|trans }}
                         </p>
                     {% else %}
-                        {% for m in simultaneous -%}
+                        {% for person in simultaneous -%}
                             {% include '@ChillMain/OnTheFly/_insert_vue_onthefly.html.twig' with {
                                 action: 'show', displayBadge: true,
-                                targetEntity: { name: 'person', id: m.person.id },
-                                buttonText: m.person|chill_entity_render_string,
-                                isDead: m.person.deathdate is not null
+                                targetEntity: { name: 'person', id: person.id },
+                                buttonText: person|chill_entity_render_string,
+                                isDead: person.deathdate is not null
                             } %}
                         {%- endfor -%}
                     {% endif %}