cs fix

Merge branch '11-fix-scope-person-document' into chill_amli_staging
# Conflicts: # docs/source/installation/index.rst # src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/BySocialActionAggregator.php # src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/BySocialIssueAggregator.php # src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/ByThirdpartyAggregator.php # src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/ByUserAggregator.php # src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/DateAggregator.php # src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/LocationTypeAggregator.php # src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/UserScopeAggregator.php # src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityTypeAggregator.php # src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/AvgActivityDuration.php # src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/AvgActivityVisitDuration.php # src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/CountActivity.php # src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/SumActivityDuration.php # src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/SumActivityVisitDuration.php # src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/CountActivity.php # src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/BySocialActionFilter.php # src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/BySocialIssueFilter.php # src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/ByUserFilter.php # src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/EmergencyFilter.php # src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/LocationTypeFilter.php # src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/SentReceivedFilter.php # src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/UserFilter.php # src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/UserScopeFilter.php # src/Bundle/ChillActivityBundle/Tests/Export/Filter/ActivityTypeFilterTest.php # src/Bundle/ChillCalendarBundle/Export/Aggregator/AgentAggregator.php # src/Bundle/ChillCalendarBundle/Export/Aggregator/CancelReasonAggregator.php # src/Bundle/ChillCalendarBundle/Export/Aggregator/JobAggregator.php # src/Bundle/ChillCalendarBundle/Export/Aggregator/LocationAggregator.php # src/Bundle/ChillCalendarBundle/Export/Aggregator/LocationTypeAggregator.php # src/Bundle/ChillCalendarBundle/Export/Aggregator/MonthYearAggregator.php # src/Bundle/ChillCalendarBundle/Export/Aggregator/ScopeAggregator.php # src/Bundle/ChillCalendarBundle/Export/Export/CountAppointments.php # src/Bundle/ChillCalendarBundle/Export/Export/StatAppointmentAvgDuration.php # src/Bundle/ChillCalendarBundle/Export/Export/StatAppointmentSumDuration.php # src/Bundle/ChillCalendarBundle/Export/Filter/AgentFilter.php # src/Bundle/ChillCalendarBundle/Export/Filter/BetweenDatesFilter.php # src/Bundle/ChillCalendarBundle/Export/Filter/JobFilter.php # src/Bundle/ChillCalendarBundle/Export/Filter/ScopeFilter.php # src/Bundle/ChillMainBundle/Doctrine/DQL/Extract.php # src/Bundle/ChillMainBundle/Doctrine/DQL/ToChar.php # src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/AdministrativeLocationAggregator.php # src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ClosingMotiveAggregator.php # src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ConfidentialAggregator.php # src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/DurationAggregator.php # src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/EmergencyAggregator.php # src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/EvaluationAggregator.php # src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/IntensityAggregator.php # src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/JobAggregator.php # src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/OriginAggregator.php # src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ReferrerAggregator.php # src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ScopeAggregator.php # src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/SocialActionAggregator.php # src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/SocialIssueAggregator.php # src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/StepAggregator.php # src/Bundle/ChillPersonBundle/Export/Aggregator/EvaluationAggregators/EvaluationTypeAggregator.php # src/Bundle/ChillPersonBundle/Export/Aggregator/HouseholdAggregators/ChildrenNumberAggregator.php # src/Bundle/ChillPersonBundle/Export/Aggregator/HouseholdAggregators/CompositionAggregator.php # src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/HouseholdPositionAggregator.php # src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/ActionTypeAggregator.php # src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/GoalAggregator.php # src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/JobAggregator.php # src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/ReferrerAggregator.php # src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/ResultAggregator.php # src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/ScopeAggregator.php # src/Bundle/ChillPersonBundle/Export/Export/CountAccompanyingCourse.php # src/Bundle/ChillPersonBundle/Export/Export/CountEvaluation.php # src/Bundle/ChillPersonBundle/Export/Export/CountHousehold.php # src/Bundle/ChillPersonBundle/Export/Export/CountPersonWithAccompanyingCourse.php # src/Bundle/ChillPersonBundle/Export/Export/CountSocialWorkActions.php # src/Bundle/ChillPersonBundle/Export/Export/StatAccompanyingCourseDuration.php # src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ActiveOnDateFilter.php # src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ActiveOneDayBetweenDatesFilter.php # src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ActivityTypeFilter.php # src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/AdministrativeLocationFilter.php # src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ClosingMotiveFilter.php # src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ConfidentialFilter.php # src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/CurrentUserJobFilter.php # src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/CurrentUserScopeFilter.php # src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/EmergencyFilter.php # src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/EvaluationFilter.php # src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/GeographicalUnitStatFilter.php # src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/IntensityFilter.php # src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/OpenBetweenDatesFilter.php # src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/OriginFilter.php # src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/ReferrerFilter.php # src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/RequestorFilter.php # src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/SocialActionFilter.php # src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/SocialIssueFilter.php # src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/StepFilter.php # src/Bundle/ChillPersonBundle/Export/Filter/EvaluationFilters/EvaluationTypeFilter.php # src/Bundle/ChillPersonBundle/Export/Filter/EvaluationFilters/MaxDateFilter.php # src/Bundle/ChillPersonBundle/Export/Filter/HouseholdFilters/CompositionFilter.php # src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/AgeFilter.php # src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/FamilySituationFilter.php # src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/ResidentialAddressAtThirdpartyFilter.php # src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/ResidentialAddressAtUserFilter.php # src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/JobFilter.php # src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/ReferrerFilter.php # src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/ScopeFilter.php # src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/SocialWorkTypeFilter.php # src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContext.php # src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/AgeAggregatorTest.php # src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/GenderAggregatorTest.php # src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/PersonAggregators/NationalityAggregatorTest.php # src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/ActionTypeAggregatorTest.php # src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/GoalAggregatorTest.php # src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/ReferrerAggregatorTest.php # src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/SocialWorkAggregators/ResultAggregatorTest.php # src/Bundle/ChillPersonBundle/Tests/Export/Export/CountAccompanyingCourseTest.php # src/Bundle/ChillPersonBundle/Tests/Export/Export/CountSocialWorkActionsTest.php # src/Bundle/ChillPersonBundle/Tests/Export/Export/StatAccompanyingCourseDurationTest.php # src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ActiveOnDateFilterTest.php # src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ActiveOneDayBetweenDatesFilterTest.php # src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/AdministrativeLocationFilterTest.php # src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ClosingMotiveFilterTest.php # src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ConfidentialFilterTest.php # src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/CurrentUserJobFilterTest.php # src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/CurrentUserScopeFilterTest.php # src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/EmergencyFilterTest.php # src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/EvaluationFilterTest.php # src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/GeographicalUnitStatFilterTest.php # src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/IntensityFilterTest.php # src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/OpenBetweenDatesFilterTest.php # src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/OriginFilterTest.php # src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/ReferrerFilterTest.php # src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/RequestorFilterTest.php # src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/SocialActionFilterTest.php # src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/SocialIssueFilterTest.php # src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/StepFilterTest.php # src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/AccompanyingPeriodFilterTest.php # src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/BirthdateFilterTest.php # src/Bundle/ChillPersonBundle/Tests/Export/Filter/PersonFilters/GenderFilterTest.php # src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/JobFilterTest.php # src/Bundle/ChillPersonBundle/Tests/Export/Filter/SocialWorkFilters/ScopeFilterTest.php
2025-09-30 18:39:43 +00:00 · 2022-10-10 14:57:58 +02:00 · 2022-10-10 14:12:12 +02:00 · 2022-10-08 00:23:53 +02:00 · 2022-10-08 00:23:53 +02:00 · 2022-10-08 00:23:53 +02:00
1929 changed files with 30940 additions and 11848 deletions
--- a/.editorconfig
+++ b/.editorconfig
@@ -18,10 +18,8 @@ max_line_length = 80

 [COMMIT_EDITMSG]
 max_line_length = 0
-<<<<<<< Updated upstream
-=======

 [*.{js, vue, ts}]
 indent_size = 2
 indent_style = space
->>>>>>> Stashed changes
+
--- a/.php_cs.dist.php
+++ b/.php_cs.dist.php
@@ -1,7 +1,7 @@
 <?php

 /**
- * Chill is a software for social workers
+ * 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.
@@ -9,7 +9,13 @@

 declare(strict_types=1);

-/** @var \drupol\PhpCsFixerConfigsPhp\Config\Php73 $config */
+/*
+ * 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.
+ */
+
 $config = require __DIR__ . '/tests/app/vendor/drupol/php-conventions/config/php73/php_cs_fixer.config.php';

 $config
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,11 @@ and this project adheres to
 ## Unreleased

 <!-- write down unreleased development here -->
+* [person][export] Fixed: rename the alias for `accompanying_period` to `acp` in filter associated with person
+* [activity][export] Feature: improve label for aliases in "Filter by activity type"
+* [activity][export] DX/Feature: use of an `ActivityTypeRepositoryInterface` instead of the old-style EntityRepository
+* [person][export] Fixed: some inconsistency with date filter on accompanying courses
+* [person][export] Fixed: use left join for related entities in accompanying course aggregators

 ## Test releases

--- a/composer.json
+++ b/composer.json
@@ -19,10 +19,12 @@
        "graylog2/gelf-php": "^1.5",
        "knplabs/knp-menu-bundle": "^3.0",
        "knplabs/knp-time-bundle": "^1.12",
+        "knpuniversity/oauth2-client-bundle": "^2.10",
        "league/csv": "^9.7.1",
        "nyholm/psr7": "^1.4",
        "ocramius/package-versions": "^1.10 || ^2",
        "odolbeau/phone-number-bundle": "^3.6",
+        "ovh/ovh": "^3.0",
        "phpoffice/phpspreadsheet": "^1.16",
        "ramsey/uuid-doctrine": "^1.7",
        "sensio/framework-extra-bundle": "^5.5",
@@ -36,6 +38,7 @@
        "symfony/http-foundation": "^4.4",
        "symfony/intl": "^4.4",
        "symfony/mailer": "^5.4",
+        "symfony/messenger": "^5.4",
        "symfony/mime": "^5.4",
        "symfony/monolog-bundle": "^3.5",
        "symfony/security-bundle": "^4.4",
@@ -49,6 +52,7 @@
        "symfony/webpack-encore-bundle": "^1.11",
        "symfony/workflow": "^4.4",
        "symfony/yaml": "^4.4",
+        "thenetworg/oauth2-azure": "^2.0",
        "twig/extra-bundle": "^3.0",
        "twig/intl-extra": "^3.0",
        "twig/markdown-extra": "^3.3",
--- a/docs/source/_static/code/exports/BirthdateFilter.php
+++ b/docs/source/_static/code/exports/BirthdateFilter.php
@@ -1,7 +1,7 @@
 <?php

 /**
- * Chill is a software for social workers
+ * 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.
@@ -9,6 +9,13 @@

 declare(strict_types=1);

+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\PersonBundle\Export\Filter;

 use Chill\MainBundle\Export\ExportElementValidatedInterface;
--- a/docs/source/_static/code/exports/CountPerson.php
+++ b/docs/source/_static/code/exports/CountPerson.php
@@ -1,7 +1,7 @@
 <?php

 /**
- * Chill is a software for social workers
+ * 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.
@@ -9,6 +9,13 @@

 declare(strict_types=1);

+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\PersonBundle\Export\Export;

 use Chill\MainBundle\Export\ExportInterface;
--- a/docs/source/development/pagination/example.php
+++ b/docs/source/development/pagination/example.php
@@ -1,7 +1,7 @@
 <?php

 /**
- * Chill is a software for social workers
+ * 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.
@@ -9,6 +9,13 @@

 declare(strict_types=1);

+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\MyBundle\Controller;

 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
--- a/docs/source/development/useful-snippets/controller-secured-for-person.php
+++ b/docs/source/development/useful-snippets/controller-secured-for-person.php
@@ -1,7 +1,7 @@
 <?php

 /**
- * Chill is a software for social workers
+ * 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.
@@ -9,6 +9,13 @@

 declare(strict_types=1);

+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\HealthBundle\Controller;

 use Chill\HealthBundle\Security\Authorization\ConsultationVoter;
--- a/docs/source/development/user-interface/widgets/ChillMainConfiguration.php
+++ b/docs/source/development/user-interface/widgets/ChillMainConfiguration.php
@@ -1,7 +1,7 @@
 <?php

 /**
- * Chill is a software for social workers
+ * 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.
@@ -9,6 +9,13 @@

 declare(strict_types=1);

+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\MainBundle\DependencyInjection;

 use Chill\MainBundle\DependencyInjection\Widget\AddWidgetConfigurationTrait;
--- a/docs/source/development/user-interface/widgets/ChillMainExtension.php
+++ b/docs/source/development/user-interface/widgets/ChillMainExtension.php
@@ -1,7 +1,7 @@
 <?php

 /**
- * Chill is a software for social workers
+ * 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.
@@ -9,6 +9,13 @@

 declare(strict_types=1);

+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\MainBundle\DependencyInjection;

 use Chill\MainBundle\DependencyInjection\Widget\Factory\WidgetFactoryInterface;
--- a/docs/source/development/user-interface/widgets/ChillPersonAddAPersonListWidgetFactory.php
+++ b/docs/source/development/user-interface/widgets/ChillPersonAddAPersonListWidgetFactory.php
@@ -1,7 +1,7 @@
 <?php

 /**
- * Chill is a software for social workers
+ * 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.
@@ -9,6 +9,13 @@

 declare(strict_types=1);

+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\PersonBundle\Widget;

 use Chill\MainBundle\DependencyInjection\Widget\Factory\AbstractWidgetFactory;
--- a/docs/source/development/user-interface/widgets/ChillPersonAddAPersonWidget.php
+++ b/docs/source/development/user-interface/widgets/ChillPersonAddAPersonWidget.php
@@ -1,7 +1,7 @@
 <?php

 /**
- * Chill is a software for social workers
+ * 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.
@@ -9,6 +9,13 @@

 declare(strict_types=1);

+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\PersonBundle\Widget;

 use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
--- a/docs/source/development/user-interface/widgets/ChillPersonExtension.php
+++ b/docs/source/development/user-interface/widgets/ChillPersonExtension.php
@@ -1,7 +1,7 @@
 <?php

 /**
- * Chill is a software for social workers
+ * 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.
@@ -9,6 +9,13 @@

 declare(strict_types=1);

+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\PersonBundle\DependencyInjection;

 use Symfony\Component\DependencyInjection\ContainerBuilder;
--- a/docs/source/installation/index.rst
+++ b/docs/source/installation/index.rst
@@ -14,6 +14,13 @@
 Installation & Usage
 ####################

+.. toctree::
+   :maxdepth: 2
+
+   prod.rst
+   prod-calendar-sms-sending.rst
+   msgraph-configure.rst
+

 Requirements
 ************
@@ -21,31 +28,74 @@ Requirements
 - This project use `docker  <https://docker.com>`_ to be run. As a developer, use `docker-compose <https://docs.docker.com/compose/overview/>`_ to bootstrap a dev environment in a glance. You do not need any other dependencies ;
 - Make is used to automate scripts.

-Installation in development mode
-********************************
+Installation
+************
+
+If you plan to run chill in production:
+
+1. install it locally first, and check if everything is ok on your local machine;
+2. once ready, build the image from your local machine, and deploy them.
+
+If you want to develop some bundles, the first step is sufficient (until you deploy on production).
+

 1. Get the code
 ===============

-Clone or download the chill-app project and `cd` into the main directory.
+Clone or download the chill-skeleton project and `cd` into the main directory.


 .. code-block:: bash

-   git clone https://gitlab.com/Chill-Projet/chill-app.git
+   git clone https://gitlab.com/Chill-Projet/chill-skeleton-basic.git
   cd chill-app


 As a developer, the code will stay on your computer and will be executed in docker container. To avoid permission problem, the code should be run with the same uid/gid from your current user. This is why we get your current user id with the command ``id -u`` in each following scripts.

-2. Prepare your variables
-=========================
+2. Prepare composer to download the sources
+===========================================

-Have a look at the variable in ``.env.dist`` and in ``app/config/parameters.yml.dist`` and check if you need to adapt them. If they do not adapt with your need, or if some are missing: 
+As you are running in dev, you must configure an auth token for getting the source code.

-1. copy the file as ``.env``: ``cp .env.dist .env``
+.. warning
+
+   If you skip this part, the code will be downloaded from dist instead of source (with git repository). You will probably replace the source manually, but the next time you will run ```composer update```, your repository will be replaced and you might loose something.
+
+1. Create a personal access token from https://gitlab.com/-/profile/personal_access_tokens, with the `read_api` scope.
+2. add a file called ```.composer/auth.json``` with this content:
+
+   .. code-block:: json
+
+      {
+        "gitlab-token": {
+            "gitlab.com": "glXXX-XXXXXXXXXXXXXXXXXXXX"
+        }
+      }
+
+2. Prepare your variables and environment
+=========================================
+
+Copy ```docker-compose.override.dev.yml``` into ```docker-compose.override.yml```
+
+.. code-block:: bash
+
+   cp docker-compose.override.dev.template.yml docker-compose.override.yml
+
+2. Prepare your variables and docker-compose
+============================================
+
+Have a look at the variable in ``.env`` and check if you need to adapt them. If they do not adapt with your need, or if some are missing:
+
+1. copy the file as ``.env.local``: ``cp .env .env.local``
 2. you may replace some variables inside ``.env``

+Prepare also you docker-compose installation, and adapt it to your needs:
+
+1. If you plan to deploy on dev, copy the file ``docker-compose.override.dev.template.yml`` to ``docker-compose.override.yml``.
+2. adapt to your needs.
+
+
 **Note**: If you intend to use the bundle ``Chill-Doc-Store``, you will need to configure and install an openstack object storage container with temporary url middleware. You will have to configure `secret keys <https://docs.openstack.org/swift/latest/api/temporary_url_middleware.html#secret-keys>`_.

 3. Run the bootstrap script
@@ -60,10 +110,21 @@ This script can be run using `make`
 This script will :

 1. force docker-compose to, eventually, pull the base images and build the image used by this project ;
-2. run an install script to download `composer <https://getcomposer.org>`_ ; 
+2. run an install script to download `composer <https://getcomposer.org>`_ ;
 3. install the php dependencies
 4. build assets

+.. warning::
+
+   The script will work only if the binary ``docker-compose`` is located into your ``PATH``. If you use ``compose`` as a docker plugin,
+   you can simulate this binary by creating this file at (for instance), ``/usr/local/bin/docker-compose`` (and run ``chmod +x /usr/local/bin/docker-compose``):
+
+   .. code-block:: bash
+
+      #!/bin/bash
+
+      /usr/bin/docker compose "$@"
+

 .. note::

@@ -87,13 +148,20 @@ This script will :

 .. code-block:: bash

-   make migrate
+   # mount into to container
+   ./docker-php.sh
+   # and load fixtures
+   bin/console doctrine:migrations:migrate
+

 Chill will be available at ``http://localhost:8001.`` Currently, there isn't any user or data. To add fixtures, run

 .. code-block:: bash

-   docker-compose exec --user $(id -u) php bin/console doctrine:fixtures:load --purge-with-truncate
+   # mount into to container
+   ./docker-php.sh
+   # and load fixtures
+   bin/console doctrine:fixtures:load --purge-with-truncate

 There are several users available:

@@ -104,28 +172,6 @@ The password is always ``password``.

 Now, read `Operations` below.

-Prepare for development
-***********************
-
-Add a Gitlab token to ensure that you get always the source code:
-
-1. generate a gitlab token there: https://gitlab.com/oauth/token
-2. run this command (in php container, at the app's root): :code:`composer config gitlab-token.gitlab.com <your token>`
-
-The auth token should appears now in the directory :code:`.composer`:
-
-.. code-block: bash
-
-   $ cat .composer/auth.json
-   {
-       "gitlab-token": {
-           "gitlab.com": "<your token>"
-       }
-   }
-
-
-See also "how to switch branch and get new dependencies".
-

 Operations
 **********
@@ -133,7 +179,7 @@ Operations
 Build assets
 ============

-run those commands: 
+run those commands:

 .. code-block:: bash

@@ -145,8 +191,8 @@ How to execute the console ?
 .. code-block:: bash

   # if a container is running
-   docker-compose exec --user $(id -u) php bin/console
-   # if not 
+   ./docker-php.sh
+   # if not
   docker-compose run --user $(id -u) php bin/console

 How to create the database schema (= run migrations) ?
@@ -155,8 +201,9 @@ How to create the database schema (= run migrations) ?
 .. code-block:: bash

   # if a container is running
-   docker-compose exec --user $(id -u) php bin/console doctrine:migrations:migrate
-   # if not 
+   ./docker-php.sh
+   bin/console doctrine:migrations:migrate
+   # if not
   docker-compose run --user $(id -u) php bin/console doctrine:migrations:migrate


@@ -173,8 +220,9 @@ How to load fixtures ? (development mode only)
 .. code-block:: bash

   # if a container is running
-   docker-compose exec --user $(id -u) php bin/console doctrine:fixtures:load
-   # if not 
+   ./docker-php.sh
+   bin/console doctrine:fixtures:load
+   # if not
   docker-compose run --user $(id -u) php bin/console doctrine:fixtures:load

 How to open a terminal in the project
@@ -183,8 +231,8 @@ How to open a terminal in the project
 .. code-block:: bash

   # if a container is running
-   docker-compose exec --user $(id -u) php /bin/bash
-   # if not 
+   ./docker-php.sh
+   # if not
   docker-compose run --user $(id -u) php /bin/bash

 How to run composer ?
@@ -193,21 +241,22 @@ How to run composer ?
 .. code-block:: bash

   # if a container is running
-   docker-compose exec --user $(id -u) php ./composer.phar
-   # if not 
-   docker-compose run --user $(id -u) php ./composer.phar
+   ./docker-php.sh
+   composer
+   # if not
+   docker-compose run --user $(id -u) php composer

 How to access to PGADMIN ?
 ==========================

-Pgadmin is installed with docker-compose.
+Pgadmin is installed with docker-compose, and is available **only if you uncomment the appropriate lines into ``docker-compose.override.yml``.

 You can access it at ``http://localhost:8002``.

 Credentials:

- login: admin@chill.social
- password: password
+- login: from the variable you set into ``docker-composer.override.yml``
+- password: same :-)

 How to run tests ?
 ==================
@@ -216,18 +265,20 @@ Tests reside inside the installed bundles. You must `cd` into that directory, do

 **Note**: some bundle require the fixture to be executed. See the dedicated _how-tos_.

-Exemple, for running test inside `main` bundle: 
+Exemple, for running test inside `main` bundle:

 .. code-block:: bash

   # mount into the php image
-   docker-compose run --user $(id -u) php /bin/bash
+   ./docker-php.sh
   # cd into main directory
-   cd vendor/chill-project/main
+   cd vendor/chill-project/chill-bundles
   # download deps
-   php ../../../composer.phar install
+   git submodule init
+   git submodule update
+   composer install
   # run tests
-   /vendor/bin/phpunit
+   bin/phpunit src/Bundle/path/to/your/test

 How to run webpack interactively
 ================================
@@ -239,10 +290,14 @@ How to switch the branch for chill-bundles, and get new dependencies

 During development, you will switch to new branches for chill-bundles. As long as the dependencies are equals, this does not cause any problem. But sometimes, a new branch introduces a new dependency, and you must download it.

+.. warning::
+
+   Ensure that you have gitlab-token ready before updating your branches. See above.
+
 In order to do that without pain, use those steps:

 0. Ensuire you have a token, set
-1. at the app's root, update the `composer.json` to your current branch:
+1. at the app's root, update the ``composer.json`` to your current branch:

 .. code-block:: json

@@ -251,14 +306,7 @@ In order to do that without pain, use those steps:
          "chill-bundles": "dev-<my-branch>@dev"
   }

-2. mount into the php container, and run `composer update`
-
-Build the documentation API
-===========================
-
-A basic configuration of `sami <https://github.com/FriendsOfPhp/Sami>`_ is embedded within the project. 
-
-A configuration file for `phpDocumentor <https://www.phpdoc.org>`_ is present.
+2. mount into the php container (``./docker-php.sh``), and run ``composer update``

 Error `An exception has been thrown during the rendering of a template ("Asset manifest file "/var/www/app/web/build/manifest.json" does not exist.").` on first run
 ====================================================================================================================================================================
@@ -272,8 +320,9 @@ Currently, to run this software in production, the *state of the art* is the fol

 1. Run the software locally and tweak the configuration to your needs ;
 2. Build the image and store them into a private container registry. This can be done using :code:`make build-and-push-image`.
-   
-   To be sure to target the correct container registry, you have to adapt the values ``IMAGE_NGINX`` and ``IMAGE_PHP`` date in the ``.env`` file.
+
+   To be sure to target the correct container registry, you have to adapt the image names into your ``docker-compose.override.yml`` file.
+3. Push the image on your registry, or upload them to the destination machine using ``docker image save`` and ``docker image load``.
 3. Run the image on your production server, using docker-compose or eventually docker stack. You have to customize the variable set in docker-compose.

   See also the :ref:`running-production-tips-and-tricks` below.
@@ -305,7 +354,7 @@ It is worth having an eye on the configuration of logstash container.
 Design principles
 *****************

-Why the DB URL is set in environment, and not in parameters.yml ?
+Why the DB URL is also set in environment, and not in .env file ?
 =================================================================

 Because, at startup, a script does check the db is up and, if not, wait for a couple of seconds before running ``entrypoint.sh``. For avoiding double configuration, the configuration of the PHP app takes his configuration from environment also (and it will be standard in future releases, with symfony 4.0).
--- a/docs/source/installation/msgraph-configure.rst
+++ b/docs/source/installation/msgraph-configure.rst
@@ -0,0 +1,320 @@
+
+Configure Chill for calendar sync and SSO with Microsoft Graph (Outlook)
+========================================================================
+
+Chill offers the possibility to:
+
+* authenticate users using Microsoft Graph, with relatively small adaptations;
+* synchronize calendar in both ways (`see the user manual for a large description of the feature <https://gitea.champs-libres.be/Chill-project/manuals>`_).
+
+Both can be configured separately (synchronising calendars without SSO, or SSO without calendar). When calendar sync is configured without SSL, the user's email address is the key to associate Chill's users with Microsoft's ones.
+
+Configure SSO
+-------------
+
+On Azure side
+*************
+
+Configure an app with the Azure interface, and give it the name of your choice.
+
+Grab the tenant's ID for your app, which is visible on the main tab "Vue d'ensemble":
+
+.. figure:: ./saml_login_id_general.png
+
+This the variable which will be named :code:`SAML_IDP_APP_UUID`.
+
+Go to the "Single sign-on" ("Authentication unique") section. Choose "SAML" as protocol, and fill those values:
+
+.. figure:: ./saml_login_1.png
+
+1. The :code:`entityId` seems to be arbitrary. This will be your variable :code:`SAML_ENTITY_ID`;
+2. The url response must be your Chill's URL appended by :code:`/saml/acs`
+3. The only used attributes is :code:`emailaddress`, which must match the user's email one.
+
+.. figure:: ./saml_login_2.png
+
+You must download the certificate, as base64. The format for the download is :code:`cer`: you will remove the first and last line (the ones with :code:`-----BEGIN CERTIFICATE-----` and :code:`-----END CERTIFICATE-----`), and remove all the return line. The final result should be something as :code:`MIIAbcdef...XyZA=`.
+
+This certificat will be your :code:`SAML_IDP_X509_CERT` variable.
+
+The url login will be filled automatically with your tenant id.
+
+Do not forget to provider user's accesses to your app, using the "Utilisateurs et groupes" tab:
+
+.. figure:: ./saml_login_appro.png
+
+
+You must know have gathered all the required variables for SSO:
+
+.. code-block:: 
+
+   SAML_BASE_URL=https://test.chill.be # must be
+   SAML_ENTITY_ID=https://test.chill.be # must match the one entered
+   SAML_IDP_APP_UUID=42XXXXXX-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+   SAML_IDP_X509_CERT: MIIC...E8u3bk # truncated
+
+Configure chill app
+*******************
+
+* add the bundle :code:`hslavich/oneloginsaml-bundle`
+* add the configuration file (see example above)
+* configure the security part (see example above)
+* add a user SAML factory into your src, and register it
+
+
+.. code-block:: yaml
+
+   # config/packages/hslavich_onelogin.yaml
+
+   parameters:
+     saml_base_url: '%env(resolve:SAML_BASE_URL)%'
+     saml_entity_id: '%env(resolve:SAML_ENTITY_ID)%'
+     saml_idp_x509cert: '%env(resolve:SAML_IDP_X509_CERT)%'
+     saml_idp_app_uuid: '%env(resolve:SAML_IDP_APP_UUID)%'
+
+
+   hslavich_onelogin_saml:
+     # Basic settings
+     idp:
+       entityId: 'https://sts.windows.net/%saml_idp_app_uuid%/'
+       singleSignOnService:
+         url: 'https://login.microsoftonline.com/%saml_idp_app_uuid%/saml2'
+         binding: 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect'
+       singleLogoutService:
+         url: 'https://login.microsoftonline.com/%saml_idp_app_uuid%/saml2'
+         binding: 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect'
+       x509cert: '%saml_idp_x509cert%'
+     sp:
+       entityId: '%saml_entity_id%'
+       assertionConsumerService:
+         url: '%saml_base_url%/saml/acs'
+         binding: 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST'
+       singleLogoutService:
+         url: '%saml_base_url%/saml/'
+         binding: 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect'
+       privateKey: ''
+     # Optional settings.
+     baseurl: '%saml_base_url%/saml'
+     strict: true
+     debug: true
+     security:
+       nameIdEncrypted:       false
+       authnRequestsSigned:   false
+       logoutRequestSigned:   false
+       logoutResponseSigned:  false
+       wantMessagesSigned:    false
+       wantAssertionsSigned:  false
+       wantNameIdEncrypted:   false
+       requestedAuthnContext: true
+       signMetadata: false
+       wantXMLValidation: true
+       signatureAlgorithm: 'http://www.w3.org/2001/04/xmldsig-more#rsa-sha256'
+       digestAlgorithm: 'http://www.w3.org/2001/04/xmlenc#sha256'
+     contactPerson:
+       technical:
+         givenName: 'Tech User'
+         emailAddress: 'techuser@example.com'
+       support:
+         givenName: 'Support User'
+         emailAddress: 'supportuser@example.com'
+     organization:
+       en:
+         name: 'Example'
+         displayname: 'Example'
+         url: 'http://example.com'
+
+
+.. code-block:: yaml
+
+   # config/security.yaml
+   # merge this with other existing configurations
+
+   security:
+
+
+       providers:
+           saml_provider:
+               # Loads user from user repository
+               entity:
+                   class: Chill\MainBundle\Entity\User
+                   property: username
+
+       firewalls:
+
+
+           default:
+               # saml part:
+               saml:
+                   username_attribute: http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress
+                   # weird behaviour in dev environment... configuration seems different
+                   # username_attribute: http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name
+                   # Use the attribute's friendlyName instead of the name
+                   use_attribute_friendly_name: false
+                   user_factory: user_from_saml_factory
+                   persist_user: true
+                   check_path: saml_acs
+                   login_path: saml_login
+               logout:
+                   path: /saml/logout
+
+
+.. code-block:: php
+
+   // src/Security/SamlFactory.php
+
+   namespace App\Security;
+
+   use Chill\MainBundle\Entity\User;
+   use Hslavich\OneloginSamlBundle\Security\Authentication\Token\SamlTokenInterface;
+   use Hslavich\OneloginSamlBundle\Security\User\SamlUserFactoryInterface;
+
+   class UserSamlFactory implements SamlUserFactoryInterface
+   {
+       public function createUser(SamlTokenInterface $token)
+       {
+           $attributes = $token->getAttributes();
+           $user = new User();
+           $user->setUsername($attributes['http://schemas.microsoft.com/identity/claims/displayname'][0]);
+           $user->setLabel($attributes['http://schemas.microsoft.com/identity/claims/displayname'][0]);
+           $user->setPassword('');
+           $user->setEmail($attributes['http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress'][0]);
+           $user->setAttributes($attributes);
+
+           return $user;
+       }
+   }
+
+
+
+Configure sync
+--------------
+
+The sync processe might be configured in the same app, or into a different app.
+
+The synchronization processes use Oauth2.0 for authentication and authorization.
+
+.. note::
+
+   Two flows are in use:
+
+   * we authenticate "on behalf of a user", to allow users to see their own calendar or other user's calendar into the web interface. 
+
+     Typically, when the page is loaded, Chill first check that an authorization token exists. If not, the user is redirected to Microsoft Azure for authentification and a new token is grabbed (most of the times, this is transparent for users). 
+
+   * Chill also acts "as a machine", to synchronize calendars with a daemon background.
+
+One can access the configuration using this screen (it is quite well hidden into the multiple of tabs):
+
+.. figure:: ./oauth_app_registration.png
+
+   You can find the oauth configuration on the "Securité > Autorisations" tab, and click on "application registration" (not translated).
+
+Add a redirection URI for you authentification:
+
+.. figure:: ./oauth_api_authentification.png
+
+   The URI must be "your chill public url" with :code:`/connect/azure/check` at the end.
+
+Allow some authorizations for your app:
+
+.. figure:: ./oauth_api_autorisees.png
+
+Take care of the separation between autorization "on behalf of a user" (déléguée), or "for a machine" (application).
+
+Some explanation:
+
+* Users must be allowed to read their user profile (:code:`User.Read`), and the profile of other users (:code:`User.ReadBasicAll`);
+* They must be allowed to read their calendar (:code:`Calendars.Read`), and the calendars shared with them (:code:`Calendars.Read.Shared`);
+
+The sync daemon must have write access:
+
+* the daemon must be allowed to read all users and their profile, to establish a link between them and the Chill's users: (:code:`Users.Read.All`);
+* it must also be allowed to read and write into the calendars (:code:`Calendars.ReadWrite.All`)
+* for sending invitation to other users, the permission (:code:`Mail.Send`) must be granted.
+
+At this step, you might choose to accept those permissions for all users, or let them do it by yourself.
+
+Grab your client id:
+
+.. figure:: ./oauth_api_client_id.png
+
+This will be your :code:`OAUTH_AZURE_CLIENT_ID` variable.
+
+
+Generate a secret:
+
+.. figure:: ./oauth_api_secret.png
+
+This will be your :code:`OAUTH_AZURE_CLIENT_SECRET` variable.
+
+And get you azure's tenant id, which is the same as the :code:`SAML_IDP_APP_UUID` (see above).
+
+Your variables will be:
+
+.. code-block::
+
+   OAUTH_AZURE_CLIENT_ID=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+   OAUTH_AZURE_CLIENT_TENANT=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+   OAUTH_AZURE_CLIENT_SECRET: 3-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+
+Then, configure chill:
+
+Enable the calendar sync with microsoft azure:
+
+.. code-block:: yaml
+
+   # config/packages/chill_calendar.yaml
+
+   chill_calendar:
+       remote_calendars_sync:
+           microsoft_graph:
+               enabled: true
+
+and configure the oauth client:
+
+.. code-block:: yaml
+
+   # config/packages/knp_oauth2_client.yaml
+   knpu_oauth2_client:
+       clients:
+           azure:
+               type: azure
+               client_id: '%env(OAUTH_AZURE_CLIENT_ID)%'
+               client_secret: '%env(OAUTH_AZURE_CLIENT_SECRET)%'
+               redirect_route: chill_calendar_remote_connect_azure_check
+               redirect_params: { }
+               tenant: '%env(OAUTH_AZURE_CLIENT_TENANT)%'
+               url_api: 'https://graph.microsoft.com/'
+               default_end_point_version: '2.0'
+
+
+You can now process for the first api authorization on the application side, (unless you did it in the Azure interface), and get a first token, by using :
+
+:code:`bin/console chill:calendar:msgraph-grant-admin-consent`
+
+This will generate a url that you can use to grant your app for your tenant. The redirection may fails in the browser, but this is not relevant: if you get an authorization token in the CLI, the authentication works.
+
+Run the processes to synchronize
+--------------------------------
+
+The calendar synchronization is processed using symfony messenger. It seems to be intersting to configure a queue (in the postgresql database it is the most simple way), and to run a worker for synchronization, at least in production.
+
+The association between chill's users and Microsoft's users is done by this cli command:
+
+.. code-block:: 
+
+   bin/console chill:calendar:msgraph-user-map-subscribe
+
+This command:
+
+* will associate the Microsoft's user metadata in our database;
+* and, most important, create a subscription to get notification when the user alter his calendar, to sync chill's event and ranges in sync.
+
+The subscription least at most 3 days. This command should be runned:
+
+* at least each time a user is added;
+* and, at least, every three days.
+
+In production, we advise to run it at least every day to get the sync working.
+
+
--- a/docs/source/installation/oauth_api_authentification.png
+++ b/docs/source/installation/oauth_api_authentification.png
--- a/docs/source/installation/oauth_api_autorisees.png
+++ b/docs/source/installation/oauth_api_autorisees.png
--- a/docs/source/installation/oauth_api_client_id.png
+++ b/docs/source/installation/oauth_api_client_id.png
--- a/docs/source/installation/oauth_api_secret.png
+++ b/docs/source/installation/oauth_api_secret.png
--- a/docs/source/installation/oauth_app_registration.png
+++ b/docs/source/installation/oauth_app_registration.png
--- a/docs/source/installation/prod-calendar-sms-sending.rst
+++ b/docs/source/installation/prod-calendar-sms-sending.rst
@@ -0,0 +1,27 @@
+
+Send short messages (SMS) with calendar bundle
+==============================================
+
+To activate the sending of messages, you should run this command on a regularly basis (using, for instance, a cronjob):
+
+.. code-block:: bash
+
+   bin/console chill:calendar:send-short-messages
+
+A transporter must be configured for the message to be effectively sent. 
+
+Configure OVH Transporter
+-------------------------
+
+Currently, this is the only one transporter available.
+
+For configuring this, simply add this config variable in your environment:
+
+```env
+SHORT_MESSAGE_DSN=ovh://applicationKey:applicationSecret@endpoint?consumerKey=xxxx&sender=yyyy&service_name=zzzz
+```
+
+In order to generate the application key, secret, and consumerKey, refers to their `documentation <https://docs.ovh.com/gb/en/api/first-steps-with-ovh-api/>`_.
+
+Before to be able to send your first sms, you must enable your account, grab some credits, and configure a sender. The service_name is an internal configuration generated by OVH.
+
--- a/docs/source/installation/prod.rst
+++ b/docs/source/installation/prod.rst
@@ -0,0 +1,48 @@
+.. Copyright (C)  2014-2019 Champs Libres Cooperative SCRLFS
+Permission is granted to copy, distribute and/or modify this document
+under the terms of the GNU Free Documentation License, Version 1.3
+or any later version published by the Free Software Foundation;
+with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
+A copy of the license is included in the section entitled "GNU
+Free Documentation License".
+
+Installation for production
+###########################
+
+An installation use these services, which are deployed using docker containers:
+
+* a php-fpm image, which run the Php and Symfony code for Chill;
+* a nginx image, which serves the assets, and usually proxy the php requests to the fpm image;
+* a redis server, which stores the cache, sessions (this is currently hardcoded in the php image), and some useful keys (like wopi locks);
+* a postgresql database. The use of postgresql is mandatory;
+* a relatorio service, which transform odt templates to full documents (replacing the placeholders);
+
+Some external services:
+
+* (required) an openstack object store, configured with `temporary url <https://docs.openstack.org/swift/latest/api/temporary_url_middleware.html>` configured (no openstack users is required). This is currently the only way to store documents from chill;
+* a mailer service (SMTP)
+* (optional) a service for verifying phone number. Currently, only Twilio is possible;
+* (optional) a service for sending Short Messages (SMS). Currently, only Ovh is possible;
+
+The `docker-compose.yaml` file of chill app is a basis for a production install. The environment variable in the ```.env``` and ```.env.prod``` should be overriden by environment variables, or ```.env.local``` files.
+
+This should be adapted to your needs:
+
+* The image for php and nginx apps are pre-compiled images, with the default configuration and bundle. If they do not fullfill your needs, you should compile your own images.
+
+   .. TODO:
+
+      As the time of writing (2022-07-03) those images are not published yet.
+
+* Think about how you will backup your database. Some adminsys find easier to store database outside of docker, which might be easier to administrate or replicate.
+
+Tweak symfony messenger
+=======================
+
+Calendar sync is processed using symfony messenger.
+
+You can tweak the configuration 
+
+Going further:
+
+* Configure the saml login and synchronisation with Outlook api
--- a/docs/source/installation/saml_login_1.png
+++ b/docs/source/installation/saml_login_1.png
--- a/docs/source/installation/saml_login_2.png
+++ b/docs/source/installation/saml_login_2.png
--- a/docs/source/installation/saml_login_appro.png
+++ b/docs/source/installation/saml_login_appro.png
--- a/docs/source/installation/saml_login_id_general.png
+++ b/docs/source/installation/saml_login_id_general.png
--- a/exports_alias_conventions.csv
+++ b/exports_alias_conventions.csv
@@ -0,0 +1,63 @@
+Entity,Join,Attribute,Alias
+AccompanyingPeriod::class,,,acp
+,AccompanyingPeriodWork::class,acp.works,acpw
+,AccompanyingPeriodParticipation::class,acp.participations,acppart
+,Location::class,acp.administrativeLocation,acploc
+,ClosingMotive::class,acp.closingMotive,acpmotive
+,UserJob::class,acp.job,acpjob
+,Origin::class,acp.origin,acporigin
+,Scope::class,acp.scopes,acpscope
+,SocialIssue::class,acp.socialIssues,acpsocialissue
+,User::class,acp.user,acpuser
+AccompanyingPeriodWork::class,,,acpw
+,AccompanyingPeriodWorkEvaluation::class,acpw.accompanyingPeriodWorkEvaluations,workeval
+,User::class,acpw.referrers,acpwuser
+,SocialAction::class,acpw.socialAction,acpwsocialaction
+,Goal::class,acpw.goals,goal
+,Result::class,acpw.results,result
+AccompanyingPeriodParticipation::class,,,acppart
+,Person::class,acppart.person,partperson
+AccompanyingPeriodWorkEvaluation::class,,,workeval
+,Evaluation::class,workeval.evaluation,eval
+Goal::class,,,goal
+,Result::class,goal.results,goalresult
+Person::class,,,person
+,Center::class,person.center,center
+,HouseholdMember::class,partperson.householdParticipations,householdmember
+,MaritalStatus::class,person.maritalStatus,personmarital
+,VendeePerson::class,,vp
+,VendeePersonMineur::class,,vpm
+ResidentialAddress::class,,,resaddr
+,ThirdParty::class,resaddr.hostThirdParty,tparty
+ThirdParty::class,,,tparty
+,ThirdPartyCategory::class,tparty.categories,tpartycat
+HouseholdMember::class,,,householdmember
+,Household::class,householdmember.household,household
+,Person::class,householdmember.person,memberperson
+,,memberperson.center,membercenter
+Household::class,,,household
+,HouseholdComposition::class,household.compositions,composition
+Activity::class,,,activity
+,Person::class,activity.person,actperson
+,AccompanyingPeriod::class,activity.accompanyingPeriod,acp
+,Person::class,activity_person_having_activity.person,person_person_having_activity
+,ActivityReason::class,activity_person_having_activity.reasons,reasons_person_having_activity
+,ActivityType::class,activity.activityType,acttype
+,Location::class,activity.location,actloc
+,SocialAction::class,activity.socialActions,actsocialaction
+,SocialIssue::class,activity.socialIssues,actsocialssue
+,ThirdParty::class,activity.thirdParties,acttparty
+,User::class,activity.user,actuser
+,User::class,activity.users,actusers
+,ActivityReason::class,activity.reasons,actreasons
+,Center::class,actperson.center,actcenter
+ActivityReason::class,,,actreasons
+,ActivityReasonCategory::class,actreason.category,actreasoncat
+Calendar::class,,,cal
+,CancelReason::class,cal.cancelReason,calcancel
+,Location::class,cal.location,calloc
+,User::class,cal.user,caluser
+VendeePerson::class,,,vp
+,SituationProfessionelle::class,vp.situationProfessionelle,vpprof
+,StatutLogement::class,vp.statutLogement,vplog
+,TempsDeTravail::class,vp.tempsDeTravail,vptt
--- a/exports_alias_conventions.md
+++ b/exports_alias_conventions.md
@@ -0,0 +1,71 @@
+# Export conventions
+
+
+Add condition with distinct alias on each export join clauses (Indicators + Filters + Aggregators)
+
+These are alias conventions :
+
+| Entity                                  | Join                                    | Attribute                                  | Alias                             |
+|:----------------------------------------|:----------------------------------------|:-------------------------------------------|:----------------------------------|
+| AccompanyingPeriod::class               |                                         |                                            | acp                               |
+|                                         | AccompanyingPeriodWork::class           | acp.works                                  | acpw                              |
+|                                         | AccompanyingPeriodParticipation::class  | acp.participations                         | acppart                           |
+|                                         | Location::class                         | acp.administrativeLocation                 | acploc                            |
+|                                         | ClosingMotive::class                    | acp.closingMotive                          | acpmotive                         |
+|                                         | UserJob::class                          | acp.job                                    | acpjob                            |
+|                                         | Origin::class                           | acp.origin                                 | acporigin                         |
+|                                         | Scope::class                            | acp.scopes                                 | acpscope                          |
+|                                         | SocialIssue::class                      | acp.socialIssues                           | acpsocialissue                    |
+|                                         | User::class                             | acp.user                                   | acpuser                           |
+| AccompanyingPeriodWork::class           |                                         |                                            | acpw                              |
+|                                         | AccompanyingPeriodWorkEvaluation::class | acpw.accompanyingPeriodWorkEvaluations     | workeval                          |
+|                                         | User::class                             | acpw.referrers                             | acpwuser                          |
+|                                         | SocialAction::class                     | acpw.socialAction                          | acpwsocialaction                  |
+|                                         | Goal::class                             | acpw.goals                                 | goal                              |
+|                                         | Result::class                           | acpw.results                               | result                        |
+| AccompanyingPeriodParticipation::class  |                                         |                                            | acppart                           |
+|                                         | Person::class                           | acppart.person                             | partperson                        |
+| AccompanyingPeriodWorkEvaluation::class |                                         |                                            | workeval                          |
+|                                         | Evaluation::class                       | workeval.evaluation                        | eval                              |
+| Goal::class                             |                                         |                                            | goal                              |
+|                                         | Result::class                           | goal.results                               | goalresult                        |
+| Person::class                           |                                         |                                            | person                            |
+|                                         | Center::class                           | person.center                              | center                            |
+|                                         | HouseholdMember::class                  | partperson.householdParticipations         | householdmember                   |
+|                                         | MaritalStatus::class                    | person.maritalStatus                       | personmarital                     |
+|                                         | VendeePerson::class                     |                                            | vp                                |
+|                                         | VendeePersonMineur::class               |                                            | vpm                               |
+| ResidentialAddress::class               |                                         |                                            | resaddr                           |
+|                                         | ThirdParty::class                       | resaddr.hostThirdParty                     | tparty                            |
+| ThirdParty::class                       |                                         |                                            | tparty                            |
+|                                         | ThirdPartyCategory::class               | tparty.categories                          | tpartycat                         |
+| HouseholdMember::class                  |                                         |                                            | householdmember                   |
+|                                         | Household::class                        | householdmember.household                  | household                         |
+|                                         | Person::class                           | householdmember.person                     | memberperson                      |
+|                                         |                                         | memberperson.center                        | membercenter                      |
+| Household::class                        |                                         |                                            | household                         |
+|                                         | HouseholdComposition::class             | household.compositions                     | composition                       |
+| Activity::class                         |                                         |                                            | activity                          |
+|                                         | Person::class                           | activity.person                            | actperson                         |
+|                                         | AccompanyingPeriod::class               | activity.accompanyingPeriod                | acp                            |
+|                                         | Person::class                           | activity\_person\_having\_activity.person  | person\_person\_having\_activity  |
+|                                         | ActivityReason::class                   | activity\_person\_having\_activity.reasons | reasons\_person\_having\_activity |
+|                                         | ActivityType::class                     | activity.activityType                      | acttype                           |
+|                                         | Location::class                         | activity.location                          | actloc                            |
+|                                         | SocialAction::class                     | activity.socialActions                     | actsocialaction                   |
+|                                         | SocialIssue::class                      | activity.socialIssues                      | actsocialssue                     |
+|                                         | ThirdParty::class                       | activity.thirdParties                      | acttparty                         |
+|                                         | User::class                             | activity.user                              | actuser                           |
+|                                         | User::class                             | activity.users                             | actusers                          |
+|                                         | ActivityReason::class                   | activity.reasons                           | actreasons                        |
+|                                         | Center::class                           | actperson.center                           | actcenter                         |
+| ActivityReason::class                   |                                         |                                            | actreasons                        |
+|                                         | ActivityReasonCategory::class           | actreason.category                         | actreasoncat                      |
+| Calendar::class                         |                                         |                                            | cal                               |
+|                                         | CancelReason::class                     | cal.cancelReason                           | calcancel                         |
+|                                         | Location::class                         | cal.location                               | calloc                            |
+|                                         | User::class                             | cal.user                                   | caluser                           |
+| VendeePerson::class                     |                                         |                                            | vp                                |
+|                                         | SituationProfessionelle::class          | vp.situationProfessionelle                 | vpprof                            |
+|                                         | StatutLogement::class                   | vp.statutLogement                          | vplog                             |
+|                                         | TempsDeTravail::class                   | vp.tempsDeTravail                          | vptt                              |
--- a/phpstan-deprecations.neon
+++ b/phpstan-deprecations.neon
@@ -175,13 +175,6 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillActivityBundle/Form/ActivityType.php

-		-
-			message: """
-				#^Call to deprecated method getReachableScopes\\(\\) of class Chill\\\\MainBundle\\\\Security\\\\Authorization\\\\AuthorizationHelper\\:
-				Use getReachableCircles$#
-			"""
-			count: 1
-			path: src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepository.php

 		-
 			message: """
@@ -294,14 +287,6 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillEventBundle/Form/Type/PickEventType.php

-		-
-			message: """
-				#^Call to deprecated method getReachableScopes\\(\\) of class Chill\\\\MainBundle\\\\Security\\\\Authorization\\\\AuthorizationHelper\\:
-				Use getReachableCircles$#
-			"""
-			count: 1
-			path: src/Bundle/ChillEventBundle/Search/EventSearch.php
-
 		-
 			message: """
 				#^Instantiation of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
@@ -390,13 +375,6 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillMainBundle/Export/ExportInterface.php

-		-
-			message: """
-				#^Call to deprecated method getReachableScopes\\(\\) of class Chill\\\\MainBundle\\\\Security\\\\Authorization\\\\AuthorizationHelper\\:
-				Use getReachableCircles$#
-			"""
-			count: 1
-			path: src/Bundle/ChillMainBundle/Export/ExportManager.php

 		-
 			message: """
@@ -754,14 +732,6 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillPersonBundle/Widget/PersonListWidget.php

-		-
-			message: """
-				#^Call to deprecated method getReachableScopes\\(\\) of class Chill\\\\MainBundle\\\\Security\\\\Authorization\\\\AuthorizationHelper\\:
-				Use getReachableCircles$#
-			"""
-			count: 1
-			path: src/Bundle/ChillReportBundle/Controller/ReportController.php
-
 		-
 			message: """
 				#^Instantiation of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
@@ -794,14 +764,6 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillReportBundle/Export/Filter/ReportDateFilter.php

-		-
-			message: """
-				#^Call to deprecated method getReachableScopes\\(\\) of class Chill\\\\MainBundle\\\\Security\\\\Authorization\\\\AuthorizationHelper\\:
-				Use getReachableCircles$#
-			"""
-			count: 1
-			path: src/Bundle/ChillReportBundle/Form/ReportType.php
-
 		-
 			message: """
 				#^Parameter \\$role of method Chill\\\\ReportBundle\\\\Form\\\\ReportType\\:\\:appendScopeChoices\\(\\) has typehint with deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
@@ -810,14 +772,6 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillReportBundle/Form/ReportType.php

-		-
-			message: """
-				#^Call to deprecated method getReachableScopes\\(\\) of class Chill\\\\MainBundle\\\\Security\\\\Authorization\\\\AuthorizationHelper\\:
-				Use getReachableCircles$#
-			"""
-			count: 1
-			path: src/Bundle/ChillReportBundle/Search/ReportSearch.php
-
 		-
 			message: """
 				#^Instantiation of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
@@ -826,13 +780,6 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillReportBundle/Search/ReportSearch.php

-		-
-			message: """
-				#^Call to deprecated method getReachableScopes\\(\\) of class Chill\\\\MainBundle\\\\Security\\\\Authorization\\\\AuthorizationHelper\\:
-				Use getReachableCircles$#
-			"""
-			count: 2
-			path: src/Bundle/ChillReportBundle/Timeline/TimelineReportProvider.php

 		-
 			message: """
--- a/src/Bundle/ChillActivityBundle/ChillActivityBundle.php
+++ b/src/Bundle/ChillActivityBundle/ChillActivityBundle.php
@@ -1,14 +1,14 @@
 <?php

-/**
+declare(strict_types=1);
+
+/*
 * Chill is a software for social workers
 *
 * For the full copyright and license information, please view
 * the LICENSE file that was distributed with this source code.
 */

-declare(strict_types=1);
-
 namespace Chill\ActivityBundle;

 use Symfony\Component\HttpKernel\Bundle\Bundle;
--- a/src/Bundle/ChillActivityBundle/Controller/ActivityController.php
+++ b/src/Bundle/ChillActivityBundle/Controller/ActivityController.php
@@ -1,14 +1,14 @@
 <?php

-/**
+declare(strict_types=1);
+
+/*
 * Chill is a software for social workers
 *
 * For the full copyright and license information, please view
 * the LICENSE file that was distributed with this source code.
 */

-declare(strict_types=1);
-
 namespace Chill\ActivityBundle\Controller;

 use Chill\ActivityBundle\Entity\Activity;
@@ -17,10 +17,11 @@ use Chill\ActivityBundle\Form\ActivityType;
 use Chill\ActivityBundle\Repository\ActivityACLAwareRepositoryInterface;
 use Chill\ActivityBundle\Repository\ActivityRepository;
 use Chill\ActivityBundle\Repository\ActivityTypeCategoryRepository;
-use Chill\ActivityBundle\Repository\ActivityTypeRepository;
+use Chill\ActivityBundle\Repository\ActivityTypeRepositoryInterface;
 use Chill\ActivityBundle\Security\Authorization\ActivityVoter;
 use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable;
 use Chill\MainBundle\Repository\LocationRepository;
+use Chill\MainBundle\Repository\UserRepositoryInterface;
 use Chill\MainBundle\Security\Resolver\CenterResolverManagerInterface;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\Person;
@@ -55,7 +56,7 @@ final class ActivityController extends AbstractController

    private ActivityTypeCategoryRepository $activityTypeCategoryRepository;

-    private ActivityTypeRepository $activityTypeRepository;
+    private ActivityTypeRepositoryInterface $activityTypeRepository;

    private CenterResolverManagerInterface $centerResolver;

@@ -73,9 +74,11 @@ final class ActivityController extends AbstractController

    private ThirdPartyRepository $thirdPartyRepository;

+    private UserRepositoryInterface $userRepository;
+
    public function __construct(
        ActivityACLAwareRepositoryInterface $activityACLAwareRepository,
-        ActivityTypeRepository $activityTypeRepository,
+        ActivityTypeRepositoryInterface $activityTypeRepository,
        ActivityTypeCategoryRepository $activityTypeCategoryRepository,
        PersonRepository $personRepository,
        ThirdPartyRepository $thirdPartyRepository,
@@ -86,6 +89,7 @@ final class ActivityController extends AbstractController
        EventDispatcherInterface $eventDispatcher,
        LoggerInterface $logger,
        SerializerInterface $serializer,
+        UserRepositoryInterface $userRepository,
        CenterResolverManagerInterface $centerResolver
    ) {
        $this->activityACLAwareRepository = $activityACLAwareRepository;
@@ -100,6 +104,7 @@ final class ActivityController extends AbstractController
        $this->eventDispatcher = $eventDispatcher;
        $this->logger = $logger;
        $this->serializer = $serializer;
+        $this->userRepository = $userRepository;
        $this->centerResolver = $centerResolver;
    }

@@ -371,7 +376,7 @@ final class ActivityController extends AbstractController
        if ($request->query->has('activityData')) {
            $activityData = $request->query->get('activityData');

-            if (array_key_exists('durationTime', $activityData)) {
+            if (array_key_exists('durationTime', $activityData) && $activityType->getDurationTimeVisible() > 0) {
                $durationTimeInMinutes = $activityData['durationTime'];
                $hours = floor($durationTimeInMinutes / 60);
                $minutes = $durationTimeInMinutes % 60;
@@ -390,26 +395,36 @@ final class ActivityController extends AbstractController
                }
            }

-            if (array_key_exists('personsId', $activityData)) {
+            if (array_key_exists('personsId', $activityData) && $activityType->getPersonsVisible() > 0) {
                foreach ($activityData['personsId'] as $personId) {
                    $concernedPerson = $this->personRepository->find($personId);
                    $entity->addPerson($concernedPerson);
                }
            }

-            if (array_key_exists('professionalsId', $activityData)) {
+            if (array_key_exists('professionalsId', $activityData) && $activityType->getThirdPartiesVisible() > 0) {
                foreach ($activityData['professionalsId'] as $professionalsId) {
                    $professional = $this->thirdPartyRepository->find($professionalsId);
                    $entity->addThirdParty($professional);
                }
            }

-            if (array_key_exists('location', $activityData)) {
+            if (array_key_exists('usersId', $activityData) && $activityType->getUsersVisible() > 0) {
+                foreach ($activityData['usersId'] as $userId) {
+                    $user = $this->userRepository->find($userId);
+
+                    if (null !== $user) {
+                        $entity->addUser($user);
+                    }
+                }
+            }
+
+            if (array_key_exists('location', $activityData) && $activityType->getLocationVisible() > 0) {
                $location = $this->locationRepository->find($activityData['location']);
                $entity->setLocation($location);
            }

-            if (array_key_exists('comment', $activityData)) {
+            if (array_key_exists('comment', $activityData) && $activityType->getCommentVisible() > 0) {
                $comment = new CommentEmbeddable();
                $comment->setComment($activityData['comment']);
                $comment->setUserId($this->getUser()->getid());
--- a/src/Bundle/ChillActivityBundle/Controller/ActivityReasonCategoryController.php
+++ b/src/Bundle/ChillActivityBundle/Controller/ActivityReasonCategoryController.php
@@ -1,14 +1,14 @@
 <?php

-/**
+declare(strict_types=1);
+
+/*
 * Chill is a software for social workers
 *
 * For the full copyright and license information, please view
 * the LICENSE file that was distributed with this source code.
 */

-declare(strict_types=1);
-
 namespace Chill\ActivityBundle\Controller;

 use Chill\ActivityBundle\Entity\ActivityReasonCategory;
--- a/src/Bundle/ChillActivityBundle/Controller/ActivityReasonController.php
+++ b/src/Bundle/ChillActivityBundle/Controller/ActivityReasonController.php
@@ -1,14 +1,14 @@
 <?php

-/**
+declare(strict_types=1);
+
+/*
 * Chill is a software for social workers
 *
 * For the full copyright and license information, please view
 * the LICENSE file that was distributed with this source code.
 */

-declare(strict_types=1);
-
 namespace Chill\ActivityBundle\Controller;

 use Chill\ActivityBundle\Entity\ActivityReason;
--- a/src/Bundle/ChillActivityBundle/Controller/AdminActivityPresenceController.php
+++ b/src/Bundle/ChillActivityBundle/Controller/AdminActivityPresenceController.php
@@ -1,14 +1,14 @@
 <?php

-/**
+declare(strict_types=1);
+
+/*
 * Chill is a software for social workers
 *
 * For the full copyright and license information, please view
 * the LICENSE file that was distributed with this source code.
 */

-declare(strict_types=1);
-
 namespace Chill\ActivityBundle\Controller;

 use Chill\MainBundle\CRUD\Controller\CRUDController;
--- a/src/Bundle/ChillActivityBundle/Controller/AdminActivityTypeCategoryController.php
+++ b/src/Bundle/ChillActivityBundle/Controller/AdminActivityTypeCategoryController.php
@@ -1,14 +1,14 @@
 <?php

-/**
+declare(strict_types=1);
+
+/*
 * Chill is a software for social workers
 *
 * For the full copyright and license information, please view
 * the LICENSE file that was distributed with this source code.
 */

-declare(strict_types=1);
-
 namespace Chill\ActivityBundle\Controller;

 use Chill\MainBundle\CRUD\Controller\CRUDController;
--- a/src/Bundle/ChillActivityBundle/Controller/AdminActivityTypeController.php
+++ b/src/Bundle/ChillActivityBundle/Controller/AdminActivityTypeController.php
@@ -1,14 +1,14 @@
 <?php

-/**
+declare(strict_types=1);
+
+/*
 * Chill is a software for social workers
 *
 * For the full copyright and license information, please view
 * the LICENSE file that was distributed with this source code.
 */

-declare(strict_types=1);
-
 namespace Chill\ActivityBundle\Controller;

 use Chill\MainBundle\CRUD\Controller\CRUDController;
--- a/src/Bundle/ChillActivityBundle/Controller/AdminController.php
+++ b/src/Bundle/ChillActivityBundle/Controller/AdminController.php
@@ -1,14 +1,14 @@
 <?php

-/**
+declare(strict_types=1);
+
+/*
 * Chill is a software for social workers
 *
 * For the full copyright and license information, please view
 * the LICENSE file that was distributed with this source code.
 */

-declare(strict_types=1);
-
 namespace Chill\ActivityBundle\Controller;

 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
--- a/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivity.php
+++ b/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivity.php
@@ -1,14 +1,14 @@
 <?php

-/**
+declare(strict_types=1);
+
+/*
 * Chill is a software for social workers
 *
 * For the full copyright and license information, please view
 * the LICENSE file that was distributed with this source code.
 */

-declare(strict_types=1);
-
 namespace Chill\ActivityBundle\DataFixtures\ORM;

 use Chill\ActivityBundle\Entity\Activity;
--- a/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityNotifications.php
+++ b/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityNotifications.php
@@ -1,14 +1,14 @@
 <?php

-/**
+declare(strict_types=1);
+
+/*
 * Chill is a software for social workers
 *
 * For the full copyright and license information, please view
 * the LICENSE file that was distributed with this source code.
 */

-declare(strict_types=1);
-
 namespace Chill\ActivityBundle\DataFixtures\ORM;

 use Chill\ActivityBundle\Entity\Activity;
--- a/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityReason.php
+++ b/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityReason.php
@@ -1,14 +1,14 @@
 <?php

-/**
+declare(strict_types=1);
+
+/*
 * Chill is a software for social workers
 *
 * For the full copyright and license information, please view
 * the LICENSE file that was distributed with this source code.
 */

-declare(strict_types=1);
-
 namespace Chill\ActivityBundle\DataFixtures\ORM;

 use Chill\ActivityBundle\Entity\ActivityReason;
--- a/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityReasonCategory.php
+++ b/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityReasonCategory.php
@@ -1,14 +1,14 @@
 <?php

-/**
+declare(strict_types=1);
+
+/*
 * Chill is a software for social workers
 *
 * For the full copyright and license information, please view
 * the LICENSE file that was distributed with this source code.
 */

-declare(strict_types=1);
-
 namespace Chill\ActivityBundle\DataFixtures\ORM;

 use Chill\ActivityBundle\Entity\ActivityReasonCategory;
--- a/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityType.php
+++ b/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityType.php
@@ -1,14 +1,14 @@
 <?php

-/**
+declare(strict_types=1);
+
+/*
 * Chill is a software for social workers
 *
 * For the full copyright and license information, please view
 * the LICENSE file that was distributed with this source code.
 */

-declare(strict_types=1);
-
 namespace Chill\ActivityBundle\DataFixtures\ORM;

 use Chill\ActivityBundle\Entity\ActivityType;
--- a/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityTypeCategory.php
+++ b/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityTypeCategory.php
@@ -1,14 +1,14 @@
 <?php

-/**
+declare(strict_types=1);
+
+/*
 * Chill is a software for social workers
 *
 * For the full copyright and license information, please view
 * the LICENSE file that was distributed with this source code.
 */

-declare(strict_types=1);
-
 namespace Chill\ActivityBundle\DataFixtures\ORM;

 use Chill\ActivityBundle\Entity\ActivityTypeCategory;
--- a/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivitytACL.php
+++ b/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivitytACL.php
@@ -1,14 +1,14 @@
 <?php

-/**
+declare(strict_types=1);
+
+/*
 * Chill is a software for social workers
 *
 * For the full copyright and license information, please view
 * the LICENSE file that was distributed with this source code.
 */

-declare(strict_types=1);
-
 namespace Chill\ActivityBundle\DataFixtures\ORM;

 use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
--- a/src/Bundle/ChillActivityBundle/DependencyInjection/ChillActivityExtension.php
+++ b/src/Bundle/ChillActivityBundle/DependencyInjection/ChillActivityExtension.php
@@ -1,14 +1,14 @@
 <?php

-/**
+declare(strict_types=1);
+
+/*
 * Chill is a software for social workers
 *
 * For the full copyright and license information, please view
 * the LICENSE file that was distributed with this source code.
 */

-declare(strict_types=1);
-
 namespace Chill\ActivityBundle\DependencyInjection;

 use Chill\ActivityBundle\Security\Authorization\ActivityVoter;
--- a/src/Bundle/ChillActivityBundle/DependencyInjection/Configuration.php
+++ b/src/Bundle/ChillActivityBundle/DependencyInjection/Configuration.php
@@ -1,14 +1,14 @@
 <?php

-/**
+declare(strict_types=1);
+
+/*
 * Chill is a software for social workers
 *
 * For the full copyright and license information, please view
 * the LICENSE file that was distributed with this source code.
 */

-declare(strict_types=1);
-
 namespace Chill\ActivityBundle\DependencyInjection;

 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
--- a/src/Bundle/ChillActivityBundle/Entity/Activity.php
+++ b/src/Bundle/ChillActivityBundle/Entity/Activity.php
@@ -1,14 +1,14 @@
 <?php

-/**
+declare(strict_types=1);
+
+/*
 * Chill is a software for social workers
 *
 * For the full copyright and license information, please view
 * the LICENSE file that was distributed with this source code.
 */

-declare(strict_types=1);
-
 namespace Chill\ActivityBundle\Entity;

 use Chill\ActivityBundle\Validator\Constraints as ActivityValidator;
--- a/src/Bundle/ChillActivityBundle/Entity/ActivityPresence.php
+++ b/src/Bundle/ChillActivityBundle/Entity/ActivityPresence.php
@@ -1,14 +1,14 @@
 <?php

-/**
+declare(strict_types=1);
+
+/*
 * Chill is a software for social workers
 *
 * For the full copyright and license information, please view
 * the LICENSE file that was distributed with this source code.
 */

-declare(strict_types=1);
-
 namespace Chill\ActivityBundle\Entity;

 use Doctrine\ORM\Mapping as ORM;
--- a/src/Bundle/ChillActivityBundle/Entity/ActivityReason.php
+++ b/src/Bundle/ChillActivityBundle/Entity/ActivityReason.php
@@ -1,14 +1,14 @@
 <?php

-/**
+declare(strict_types=1);
+
+/*
 * Chill is a software for social workers
 *
 * For the full copyright and license information, please view
 * the LICENSE file that was distributed with this source code.
 */

-declare(strict_types=1);
-
 namespace Chill\ActivityBundle\Entity;

 use Doctrine\ORM\Mapping as ORM;
--- a/src/Bundle/ChillActivityBundle/Entity/ActivityReasonCategory.php
+++ b/src/Bundle/ChillActivityBundle/Entity/ActivityReasonCategory.php
@@ -1,14 +1,14 @@
 <?php

-/**
+declare(strict_types=1);
+
+/*
 * Chill is a software for social workers
 *
 * For the full copyright and license information, please view
 * the LICENSE file that was distributed with this source code.
 */

-declare(strict_types=1);
-
 namespace Chill\ActivityBundle\Entity;

 use Doctrine\Common\Collections\ArrayCollection;
--- a/src/Bundle/ChillActivityBundle/Entity/ActivityType.php
+++ b/src/Bundle/ChillActivityBundle/Entity/ActivityType.php
@@ -1,14 +1,14 @@
 <?php

-/**
+declare(strict_types=1);
+
+/*
 * Chill is a software for social workers
 *
 * For the full copyright and license information, please view
 * the LICENSE file that was distributed with this source code.
 */

-declare(strict_types=1);
-
 namespace Chill\ActivityBundle\Entity;

 use Doctrine\ORM\Mapping as ORM;
@@ -516,6 +516,11 @@ class ActivityType
        return $this->userVisible;
    }

+    public function hasCategory(): bool
+    {
+        return null !== $this->getCategory();
+    }
+
    /**
     * Is active
     * return true if the type is active.
--- a/src/Bundle/ChillActivityBundle/Entity/ActivityTypeCategory.php
+++ b/src/Bundle/ChillActivityBundle/Entity/ActivityTypeCategory.php
@@ -1,14 +1,14 @@
 <?php

-/**
+declare(strict_types=1);
+
+/*
 * Chill is a software for social workers
 *
 * For the full copyright and license information, please view
 * the LICENSE file that was distributed with this source code.
 */

-declare(strict_types=1);
-
 namespace Chill\ActivityBundle\Entity;

 use Doctrine\ORM\Mapping as ORM;
--- a/src/Bundle/ChillActivityBundle/EntityListener/ActivityEntityListener.php
+++ b/src/Bundle/ChillActivityBundle/EntityListener/ActivityEntityListener.php
@@ -1,14 +1,14 @@
 <?php

-/**
+declare(strict_types=1);
+
+/*
 * Chill is a software for social workers
 *
 * For the full copyright and license information, please view
 * the LICENSE file that was distributed with this source code.
 */

-declare(strict_types=1);
-
 namespace Chill\ActivityBundle\EntityListener;

 use Chill\ActivityBundle\Entity\Activity;
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/BySocialActionAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/BySocialActionAggregator.php
@@ -2,15 +2,22 @@

 declare(strict_types=1);

+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\ActivityBundle\Export\Aggregator\ACPAggregators;

 use Chill\ActivityBundle\Export\Declarations;
 use Chill\MainBundle\Export\AggregatorInterface;
 use Chill\PersonBundle\Repository\SocialWork\SocialActionRepository;
 use Chill\PersonBundle\Templating\Entity\SocialActionRender;
-use Closure;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
+use function in_array;

 class BySocialActionAggregator implements AggregatorInterface
 {
@@ -26,13 +33,42 @@ class BySocialActionAggregator implements AggregatorInterface
        $this->actionRepository = $actionRepository;
    }

+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        if (!in_array('actsocialaction', $qb->getAllAliases(), true)) {
+            $qb->leftJoin('activity.socialActions', 'actsocialaction');
+        }
+
+        $qb->addSelect('actsocialaction.id AS socialaction_aggregator');
+        $qb->addGroupBy('socialaction_aggregator');
+    }
+
+    public function applyOn(): string
+    {
+        return Declarations::ACTIVITY_ACP;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        // no form
+    }
+
    public function getLabels($key, array $values, $data)
    {
-        return function($value) {
+        return function ($value) {
            if ('_header' === $value) {
                return 'Social action';
            }

+            if (null === $value) {
+                return '';
+            }
+
            $sa = $this->actionRepository->find($value);

            return $this->actionRender->renderString($sa, []);
@@ -44,40 +80,8 @@ class BySocialActionAggregator implements AggregatorInterface
        return ['socialaction_aggregator'];
    }

-    public function buildForm(FormBuilderInterface $builder)
-    {
-        // no form
-    }
-
    public function getTitle(): string
    {
        return 'Group activity by linked socialaction';
    }
-
-    public function addRole()
-    {
-        return null;
-    }
-
-    public function alterQuery(QueryBuilder $qb, $data)
-    {
-        if(!in_array('socialaction', $qb->getAllAliases())) {
-            $qb->join('activity.socialActions', 'socialaction');
-        }
-
-        $qb->addSelect('socialaction.id AS socialaction_aggregator');
-
-        $groupBy = $qb->getDQLPart('groupBy');
-
-        if (!empty($groupBy)) {
-            $qb->addGroupBy('socialaction_aggregator');
-        } else {
-            $qb->groupBy('socialaction_aggregator');
-        }
-    }
-
-    public function applyOn(): string
-    {
-        return Declarations::ACTIVITY_ACP;
-    }
-}
+}
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/BySocialIssueAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/BySocialIssueAggregator.php
@@ -2,22 +2,29 @@

 declare(strict_types=1);

+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\ActivityBundle\Export\Aggregator\ACPAggregators;

 use Chill\ActivityBundle\Export\Declarations;
 use Chill\MainBundle\Export\AggregatorInterface;
 use Chill\PersonBundle\Repository\SocialWork\SocialIssueRepository;
 use Chill\PersonBundle\Templating\Entity\SocialIssueRender;
-use Closure;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
+use function in_array;

 class BySocialIssueAggregator implements AggregatorInterface
 {
-    private SocialIssueRepository $issueRepository;
-
    private SocialIssueRender $issueRender;

+    private SocialIssueRepository $issueRepository;
+
    public function __construct(
        SocialIssueRepository $issueRepository,
        SocialIssueRender $issueRender
@@ -26,14 +33,42 @@ class BySocialIssueAggregator implements AggregatorInterface
        $this->issueRender = $issueRender;
    }

+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        if (!in_array('actsocialissue', $qb->getAllAliases(), true)) {
+            $qb->leftJoin('activity.socialIssues', 'actsocialissue');
+        }
+
+        $qb->addSelect('actsocialissue.id AS socialissue_aggregator');
+        $qb->addGroupBy('socialissue_aggregator');
+    }
+
+    public function applyOn(): string
+    {
+        return Declarations::ACTIVITY_ACP;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        // no form
+    }
+
    public function getLabels($key, array $values, $data)
    {
        return function ($value): string {
-
-            if ($value === '_header') {
+            if ('_header' === $value) {
                return 'Social issues';
            }

+            if (null === $value) {
+                return '';
+            }
+
            $i = $this->issueRepository->find($value);

            return $this->issueRender->renderString($i, []);
@@ -45,40 +80,8 @@ class BySocialIssueAggregator implements AggregatorInterface
        return ['socialissue_aggregator'];
    }

-    public function buildForm(FormBuilderInterface $builder)
-    {
-        // no form
-    }
-
    public function getTitle(): string
    {
        return 'Group activity by linked socialissue';
    }
-
-    public function addRole()
-    {
-        return null;
-    }
-
-    public function alterQuery(QueryBuilder $qb, $data)
-    {
-        if (!in_array('socialissue', $qb->getAllAliases())) {
-            $qb->join('activity.socialIssues', 'socialissue');
-        }
-
-        $qb->addSelect('socialissue.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::ACTIVITY_ACP;
-    }
-}
+}
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/ByThirdpartyAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/ByThirdpartyAggregator.php
@@ -2,22 +2,29 @@

 declare(strict_types=1);

+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\ActivityBundle\Export\Aggregator\ACPAggregators;

 use Chill\ActivityBundle\Export\Declarations;
 use Chill\MainBundle\Export\AggregatorInterface;
 use Chill\ThirdPartyBundle\Repository\ThirdPartyRepository;
 use Chill\ThirdPartyBundle\Templating\Entity\ThirdPartyRender;
-use Closure;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
+use function in_array;

 class ByThirdpartyAggregator implements AggregatorInterface
 {
-    private ThirdPartyRepository $thirdPartyRepository;
-
    private ThirdPartyRender $thirdPartyRender;

+    private ThirdPartyRepository $thirdPartyRepository;
+
    public function __construct(
        ThirdPartyRepository $thirdPartyRepository,
        ThirdPartyRender $thirdPartyRender
@@ -26,13 +33,42 @@ class ByThirdpartyAggregator implements AggregatorInterface
        $this->thirdPartyRender = $thirdPartyRender;
    }

+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        if (!in_array('acttparty', $qb->getAllAliases(), true)) {
+            $qb->leftJoin('activity.thirdParties', 'acttparty');
+        }
+
+        $qb->addSelect('acttparty.id AS thirdparty_aggregator');
+        $qb->addGroupBy('thirdparty_aggregator');
+    }
+
+    public function applyOn(): string
+    {
+        return Declarations::ACTIVITY_ACP;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        // no form
+    }
+
    public function getLabels($key, array $values, $data)
    {
        return function ($value): string {
-            if ($value === '_header') {
+            if ('_header' === $value) {
                return 'Accepted thirdparty';
            }

+            if (null === $value) {
+                return '';
+            }
+
            $tp = $this->thirdPartyRepository->find($value);

            return $this->thirdPartyRender->renderString($tp, []);
@@ -44,40 +80,8 @@ class ByThirdpartyAggregator implements AggregatorInterface
        return ['thirdparty_aggregator'];
    }

-    public function buildForm(FormBuilderInterface $builder)
-    {
-        // no form
-    }
-
    public function getTitle(): string
    {
        return 'Group activity by linked thirdparties';
    }
-
-    public function addRole()
-    {
-        return null;
-    }
-
-    public function alterQuery(QueryBuilder $qb, $data)
-    {
-        if (!in_array('thirdparty', $qb->getAllAliases())) {
-            $qb->join('activity.thirdParties', 'thirdparty');
-        }
-
-        $qb->addSelect('thirdparty.id AS thirdparty_aggregator');
-
-        $groupBy = $qb->getDQLPart('groupBy');
-
-        if (!empty($groupBy)) {
-            $qb->addGroupBy('thirdparty_aggregator');
-        } else {
-            $qb->groupBy('thirdparty_aggregator');
-        }
-    }
-
-    public function applyOn(): string
-    {
-        return Declarations::ACTIVITY_ACP;
-    }
-}
+}
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/ByUserAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/ByUserAggregator.php
@@ -2,22 +2,29 @@

 declare(strict_types=1);

+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\ActivityBundle\Export\Aggregator\ACPAggregators;

 use Chill\ActivityBundle\Export\Declarations;
 use Chill\MainBundle\Export\AggregatorInterface;
 use Chill\MainBundle\Repository\UserRepository;
 use Chill\MainBundle\Templating\Entity\UserRender;
-use Closure;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
+use function in_array;

 class ByUserAggregator implements AggregatorInterface
 {
-    private UserRepository $userRepository;
-
    private UserRender $userRender;

+    private UserRepository $userRepository;
+
    public function __construct(
        UserRepository $userRepository,
        UserRender $userRender
@@ -26,13 +33,42 @@ class ByUserAggregator implements AggregatorInterface
        $this->userRender = $userRender;
    }

+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        if (!in_array('actusers', $qb->getAllAliases(), true)) {
+            $qb->leftJoin('activity.users', 'actusers');
+        }
+
+        $qb->addSelect('actusers.id AS users_aggregator');
+        $qb->addGroupBy('users_aggregator');
+    }
+
+    public function applyOn(): string
+    {
+        return Declarations::ACTIVITY_ACP;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        // no form
+    }
+
    public function getLabels($key, array $values, $data)
    {
        return function ($value): string {
-            if ($value === '_header') {
+            if ('_header' === $value) {
                return 'Accepted users';
            }

+            if (null === $value) {
+                return '';
+            }
+
            $u = $this->userRepository->find($value);

            return $this->userRender->renderString($u, []);
@@ -44,40 +80,8 @@ class ByUserAggregator implements AggregatorInterface
        return ['users_aggregator'];
    }

-    public function buildForm(FormBuilderInterface $builder)
-    {
-        // no form
-    }
-
    public function getTitle(): string
    {
        return 'Group activity by linked users';
    }
-
-    public function addRole()
-    {
-        return null;
-    }
-
-    public function alterQuery(QueryBuilder $qb, $data)
-    {
-        if (!in_array('user', $qb->getAllAliases())) {
-            $qb->join('activity.users', 'user');
-        }
-
-        $qb->addSelect('user.id AS users_aggregator');
-
-        $groupBy = $qb->getDQLPart('groupBy');
-
-        if (!empty($groupBy)) {
-            $qb->addGroupBy('users_aggregator');
-        } else {
-            $qb->groupBy('users_aggregator');
-        }
-    }
-
-    public function applyOn(): string
-    {
-        return Declarations::ACTIVITY_ACP;
-    }
-}
+}
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/DateAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/DateAggregator.php
@@ -2,11 +2,17 @@

 declare(strict_types=1);

+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\ActivityBundle\Export\Aggregator\ACPAggregators;

 use Chill\ActivityBundle\Export\Declarations;
 use Chill\MainBundle\Export\AggregatorInterface;
-use Closure;
 use Doctrine\ORM\QueryBuilder;
 use RuntimeException;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
@@ -21,7 +27,7 @@ class DateAggregator implements AggregatorInterface
        'by year' => 'year',
    ];

-    private CONST DEFAULT_CHOICE = 'year';
+    private const DEFAULT_CHOICE = 'year';

    private TranslatorInterface $translator;

@@ -31,21 +37,69 @@ class DateAggregator implements AggregatorInterface
        $this->translator = $translator;
    }

+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        $order = null;
+
+        switch ($data['frequency']) {
+            case 'month':
+                $fmt = 'YYYY-MM';
+
+                break;
+
+            case 'week':
+                $fmt = 'YYYY-IW';
+
+                break;
+
+            case 'year':
+                $fmt = 'YYYY'; $order = 'DESC';
+
+                break; // order DESC does not works !
+
+            default:
+                throw new RuntimeException(sprintf("The frequency data '%s' is invalid.", $data['frequency']));
+        }
+
+        $qb->addSelect(sprintf("TO_CHAR(activity.date, '%s') AS date_aggregator", $fmt));
+        $qb->addGroupBy('date_aggregator');
+        $qb->addOrderBy('date_aggregator', $order);
+    }
+
+    public function applyOn(): string
+    {
+        return Declarations::ACTIVITY_ACP;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        $builder->add('frequency', ChoiceType::class, [
+            'choices' => self::CHOICES,
+            'multiple' => false,
+            'expanded' => true,
+            'empty_data' => self::DEFAULT_CHOICE,
+            'data' => self::DEFAULT_CHOICE,
+        ]);
+    }
+
    public function getLabels($key, array $values, $data)
    {
-        return function ($value) use ($data): string {
-            if ($value === '_header') {
-                return 'by '. $data['frequency'];
+        return static function ($value) use ($data): string {
+            if ('_header' === $value) {
+                return 'by ' . $data['frequency'];
            }
+
+            if (null === $value) {
+                return '';
+            }
+
            switch ($data['frequency']) {
                case 'month':
-                    $month = \DateTime::createFromFormat('!m', $value);
-                    return sprintf(
-                        "%02d (%s)",
-                        $value,
-                        $month->format('M')
-                    );
-
                case 'week':
                    //return $this->translator->trans('for week') .' '. $value ;

@@ -63,67 +117,8 @@ class DateAggregator implements AggregatorInterface
        return ['date_aggregator'];
    }

-    public function buildForm(FormBuilderInterface $builder)
-    {
-        $builder->add('frequency', ChoiceType::class, [
-            'choices' => self::CHOICES,
-            'multiple' => false,
-            'expanded' => true,
-            'empty_data' => self::DEFAULT_CHOICE,
-            'data' => self::DEFAULT_CHOICE,
-        ]);
-    }
-
    public function getTitle(): string
    {
        return 'Group activity by date';
    }
-
-    public function addRole()
-    {
-        return null;
-    }
-
-    public function alterQuery(QueryBuilder $qb, $data)
-    {
-        $order = null;
-
-        switch ($data['frequency']) {
-            case 'month':
-                $fmt = 'MM'; break;
-
-            case 'week':
-                $fmt = 'IW'; break;
-
-            case 'year':
-                $fmt = 'YYYY'; $order = 'DESC'; break;
-
-            default:
-                throw new RuntimeException(sprintf("The frequency data '%s' is invalid.", $data['frequency']));
-        }
-
-        $qb->addSelect(sprintf("TO_CHAR(activity.date, '%s') AS date_aggregator", $fmt));
-
-        $groupBy = $qb->getDQLPart('groupBy');
-
-        if (!empty($groupBy)) {
-            $qb->addGroupBy('date_aggregator');
-        } else {
-            $qb->groupBy('date_aggregator');
-        }
-
-        $orderBy = $qb->getDQLPart('orderBy');
-
-        if (!empty($orderBy)) {
-            $qb->addOrderBy('date_aggregator', $order);
-        } else {
-            $qb->orderBy('date_aggregator', $order);
-        }
-    }
-
-    public function applyOn(): string
-    {
-        return Declarations::ACTIVITY_ACP;
-    }
-
-}
+}
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/LocationTypeAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/LocationTypeAggregator.php
@@ -2,15 +2,22 @@

 declare(strict_types=1);

+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\ActivityBundle\Export\Aggregator\ACPAggregators;

 use Chill\ActivityBundle\Export\Declarations;
 use Chill\MainBundle\Export\AggregatorInterface;
 use Chill\MainBundle\Repository\LocationTypeRepository;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
-use Closure;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
+use function in_array;

 class LocationTypeAggregator implements AggregatorInterface
 {
@@ -26,13 +33,42 @@ class LocationTypeAggregator implements AggregatorInterface
        $this->translatableStringHelper = $translatableStringHelper;
    }

+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        if (!in_array('actloc', $qb->getAllAliases(), true)) {
+            $qb->leftJoin('activity.location', 'actloc');
+        }
+
+        $qb->addSelect('IDENTITY(actloc.locationType) AS locationtype_aggregator');
+        $qb->addGroupBy('locationtype_aggregator');
+    }
+
+    public function applyOn(): string
+    {
+        return Declarations::ACTIVITY_ACP;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        // no form
+    }
+
    public function getLabels($key, array $values, $data)
    {
        return function ($value): string {
-            if ($value === '_header') {
+            if ('_header' === $value) {
                return 'Accepted locationtype';
            }

+            if (null === $value) {
+                return '';
+            }
+
            $lt = $this->locationTypeRepository->find($value);

            return $this->translatableStringHelper->localize(
@@ -46,41 +82,8 @@ class LocationTypeAggregator implements AggregatorInterface
        return ['locationtype_aggregator'];
    }

-    public function buildForm(FormBuilderInterface $builder)
-    {
-        // no form
-    }
-
    public function getTitle(): string
    {
        return 'Group activity by locationtype';
    }
-
-    public function addRole()
-    {
-        return null;
-    }
-
-    public function alterQuery(QueryBuilder $qb, $data)
-    {
-        if (!in_array('location', $qb->getAllAliases())) {
-            $qb->join('activity.location', 'location');
-        }
-
-        $qb->addSelect('IDENTITY(location.locationType) AS locationtype_aggregator');
-
-        $groupBy = $qb->getDQLPart('groupBy');
-
-        if (!empty($groupBy)) {
-            $qb->addGroupBy('locationtype_aggregator');
-        } else {
-            $qb->groupBy('locationtype_aggregator');
-        }
-    }
-
-    public function applyOn(): string
-    {
-        return Declarations::ACTIVITY_ACP;
-    }
-
-}
+}
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/UserScopeAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/UserScopeAggregator.php
@@ -2,15 +2,22 @@

 declare(strict_types=1);

+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\ActivityBundle\Export\Aggregator\ACPAggregators;

 use Chill\ActivityBundle\Export\Declarations;
 use Chill\MainBundle\Export\AggregatorInterface;
 use Chill\MainBundle\Repository\ScopeRepository;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
-use Closure;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
+use function in_array;

 class UserScopeAggregator implements AggregatorInterface
 {
@@ -26,13 +33,42 @@ class UserScopeAggregator implements AggregatorInterface
        $this->translatableStringHelper = $translatableStringHelper;
    }

+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        if (!in_array('actuser', $qb->getAllAliases(), true)) {
+            $qb->leftJoin('activity.user', 'actuser');
+        }
+
+        $qb->addSelect('IDENTITY(actuser.mainScope) AS userscope_aggregator');
+        $qb->addGroupBy('userscope_aggregator');
+    }
+
+    public function applyOn(): string
+    {
+        return Declarations::ACTIVITY_ACP;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        // no form
+    }
+
    public function getLabels($key, array $values, $data)
    {
        return function ($value): string {
-            if ($value === '_header') {
+            if ('_header' === $value) {
                return 'Scope';
            }

+            if (null === $value) {
+                return '';
+            }
+
            $s = $this->scopeRepository->find($value);

            return $this->translatableStringHelper->localize(
@@ -46,41 +82,8 @@ class UserScopeAggregator implements AggregatorInterface
        return ['userscope_aggregator'];
    }

-    public function buildForm(FormBuilderInterface $builder)
-    {
-        // no form
-    }
-
    public function getTitle(): string
    {
        return 'Group activity by userscope';
    }
-
-    public function addRole()
-    {
-        return null;
-    }
-
-    public function alterQuery(QueryBuilder $qb, $data)
-    {
-        if (!in_array('user', $qb->getAllAliases())) {
-            $qb->join('activity.user', 'user');
-        }
-
-        $qb->addSelect('IDENTITY(user.mainScope) AS userscope_aggregator');
-
-        $groupBy = $qb->getDQLPart('groupBy');
-
-        if (!empty($groupBy)) {
-            $qb->addGroupBy('userscope_aggregator');
-        } else {
-            $qb->groupBy('userscope_aggregator');
-        }
-    }
-
-    public function applyOn(): string
-    {
-        return Declarations::ACTIVITY_ACP;
-    }
-
-}
+}
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityTypeAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityTypeAggregator.php
@@ -1,63 +1,54 @@
 <?php

-/**
+declare(strict_types=1);
+
+/*
 * Chill is a software for social workers
 *
 * For the full copyright and license information, please view
 * the LICENSE file that was distributed with this source code.
 */

-declare(strict_types=1);
-
 namespace Chill\ActivityBundle\Export\Aggregator;

 use Chill\ActivityBundle\Export\Declarations;
-use Chill\ActivityBundle\Repository\ActivityTypeRepository;
-use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
+use Chill\ActivityBundle\Repository\ActivityTypeRepositoryInterface;
 use Chill\MainBundle\Export\AggregatorInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use Closure;
-use Doctrine\ORM\Query\Expr\Join;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\Security\Core\Role\Role;
+use function in_array;

 class ActivityTypeAggregator implements AggregatorInterface
 {
    public const KEY = 'activity_type_aggregator';

-    protected ActivityTypeRepository $activityTypeRepository;
+    protected ActivityTypeRepositoryInterface $activityTypeRepository;

    protected TranslatableStringHelperInterface $translatableStringHelper;

    public function __construct(
-        ActivityTypeRepository $activityTypeRepository,
+        ActivityTypeRepositoryInterface $activityTypeRepository,
        TranslatableStringHelperInterface $translatableStringHelper
    ) {
        $this->activityTypeRepository = $activityTypeRepository;
        $this->translatableStringHelper = $translatableStringHelper;
    }

-    public function addRole()
+    public function addRole(): ?string
    {
-        return new Role(ActivityStatsVoter::STATS);
+        return null;
    }

    public function alterQuery(QueryBuilder $qb, $data)
    {
-        if (!in_array('type', $qb->getAllAliases())) {
-            $qb->join('activity.activityType', 'type');
+        if (!in_array('acttype', $qb->getAllAliases(), true)) {
+            $qb->join('activity.activityType', 'acttype');
        }

        $qb->addSelect(sprintf('IDENTITY(activity.activityType) AS %s', self::KEY));
-
-        $groupby = $qb->getDQLPart('groupBy');
-
-        if (!empty($groupBy)) {
-            $qb->addGroupBy(self::KEY);
-        } else {
-            $qb->groupBy(self::KEY);
-        }
+        $qb->addGroupBy(self::KEY);
    }

    public function applyOn(): string
@@ -80,6 +71,10 @@ class ActivityTypeAggregator implements AggregatorInterface
                return 'Activity type';
            }

+            if (null === $value) {
+                return '';
+            }
+
            $t = $this->activityTypeRepository->find($value);

            return $this->translatableStringHelper->localize($t->getName());
@@ -95,23 +90,4 @@ class ActivityTypeAggregator implements AggregatorInterface
    {
        return 'Aggregate by activity type';
    }
-
-    /**
-     * Check if a join between Activity and another alias.
-     *
-     * @param Join[] $joins
-     * @param string $alias the alias to search for
-     *
-     * @return bool
-     */
-    private function checkJoinAlreadyDefined(array $joins, $alias)
-    {
-        foreach ($joins as $join) {
-            if ($join->getAlias() === $alias) {
-                return true;
-            }
-        }
-
-        return false;
-    }
 }
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityUserAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityUserAggregator.php
@@ -1,34 +1,32 @@
 <?php

-/**
+declare(strict_types=1);
+
+/*
 * Chill is a software for social workers
 *
 * For the full copyright and license information, please view
 * the LICENSE file that was distributed with this source code.
 */

-declare(strict_types=1);
-
 namespace Chill\ActivityBundle\Export\Aggregator;

 use Chill\ActivityBundle\Export\Declarations;
-use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
 use Chill\MainBundle\Export\AggregatorInterface;
 use Chill\MainBundle\Repository\UserRepository;
 use Chill\MainBundle\Templating\Entity\UserRender;
 use Closure;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\Security\Core\Role\Role;

 class ActivityUserAggregator implements AggregatorInterface
 {
    public const KEY = 'activity_user_id';

-    private UserRepository $userRepository;
-
    private UserRender $userRender;

+    private UserRepository $userRepository;
+
    public function __construct(
        UserRepository $userRepository,
        UserRender $userRender
@@ -37,9 +35,9 @@ class ActivityUserAggregator implements AggregatorInterface
        $this->userRender = $userRender;
    }

-    public function addRole()
+    public function addRole(): ?string
    {
-        return new Role(ActivityStatsVoter::STATS);
+        return null;
    }

    public function alterQuery(QueryBuilder $qb, $data)
@@ -63,14 +61,15 @@ class ActivityUserAggregator implements AggregatorInterface

    public function getLabels($key, $values, $data): Closure
    {
-        // preload users at once
-        $this->userRepository->findBy(['id' => $values]);
-
        return function ($value) {
            if ('_header' === $value) {
                return 'Activity user';
            }

+            if (null === $value) {
+                return '';
+            }
+
            $u = $this->userRepository->find($value);

            return $this->userRender->renderString($u, []);
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/PersonAggregators/ActivityReasonAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/PersonAggregators/ActivityReasonAggregator.php
@@ -1,20 +1,19 @@
 <?php

-/**
+declare(strict_types=1);
+
+/*
 * Chill is a software for social workers
 *
 * For the full copyright and license information, please view
 * the LICENSE file that was distributed with this source code.
 */

-declare(strict_types=1);
-
 namespace Chill\ActivityBundle\Export\Aggregator\PersonAggregators;

 use Chill\ActivityBundle\Export\Declarations;
 use Chill\ActivityBundle\Repository\ActivityReasonCategoryRepository;
 use Chill\ActivityBundle\Repository\ActivityReasonRepository;
-use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
 use Chill\MainBundle\Export\AggregatorInterface;
 use Chill\MainBundle\Export\ExportElementValidatedInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
@@ -24,11 +23,10 @@ use Doctrine\ORM\QueryBuilder;
 use RuntimeException;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\Security\Core\Role\Role;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;

-use function array_key_exists;
 use function count;
+use function in_array;

 class ActivityReasonAggregator implements AggregatorInterface, ExportElementValidatedInterface
 {
@@ -48,19 +46,19 @@ class ActivityReasonAggregator implements AggregatorInterface, ExportElementVali
        $this->translatableStringHelper = $translatableStringHelper;
    }

-    public function addRole()
+    public function addRole(): ?string
    {
-        return new Role(ActivityStatsVoter::STATS);
+        return null;
    }

    public function alterQuery(QueryBuilder $qb, $data)
    {
        // add select element
        if ('reasons' === $data['level']) {
-            $elem = 'reasons.id';
+            $elem = 'actreasons.id';
            $alias = 'activity_reasons_id';
        } elseif ('categories' === $data['level']) {
-            $elem = 'category.id';
+            $elem = 'actreasoncat.id';
            $alias = 'activity_categories_id';
        } else {
            throw new RuntimeException('The data provided are not recognized.');
@@ -69,29 +67,15 @@ class ActivityReasonAggregator implements AggregatorInterface, ExportElementVali
        $qb->addSelect($elem . ' as ' . $alias);

        // make a jointure only if needed
-        $join = $qb->getDQLPart('join');
-
-        if (
-            (
-                array_key_exists('activity', $join)
-            && !$this->checkJoinAlreadyDefined($join['activity'], 'reasons')
-            )
-            || (!array_key_exists('activity', $join))
-        ) {
-            $qb->add(
-                'join',
-                [
-                    'activity' => new Join(Join::INNER_JOIN, 'activity.reasons', 'reasons'),
-                ],
-                true
-            );
+        if (!in_array('actreasons', $qb->getAllAliases(), true)) {
+            $qb->innerJoin('activity.reasons', 'actreasons');
        }

        // join category if necessary
        if ('activity_categories_id' === $alias) {
            // add join only if needed
-            if (!$this->checkJoinAlreadyDefined($qb->getDQLPart('join')['activity'], 'category')) {
-                $qb->join('reasons.category', 'category');
+            if (!in_array('actreasoncat', $qb->getAllAliases(), true)) {
+                $qb->join('actreasons.category', 'actreasoncat');
            }
        }

@@ -195,23 +179,4 @@ class ActivityReasonAggregator implements AggregatorInterface, ExportElementVali
                ->addViolation();
        }
    }
-
-    /**
-     * Check if a join between Activity and another alias.
-     *
-     * @param Join[] $joins
-     * @param string $alias the alias to search for
-     *
-     * @return bool
-     */
-    private function checkJoinAlreadyDefined(array $joins, $alias)
-    {
-        foreach ($joins as $join) {
-            if ($join->getAlias() === $alias) {
-                return true;
-            }
-        }
-
-        return false;
-    }
 }
--- a/src/Bundle/ChillActivityBundle/Export/Declarations.php
+++ b/src/Bundle/ChillActivityBundle/Export/Declarations.php
@@ -1,14 +1,14 @@
 <?php

-/**
+declare(strict_types=1);
+
+/*
 * Chill is a software for social workers
 *
 * For the full copyright and license information, please view
 * the LICENSE file that was distributed with this source code.
 */

-declare(strict_types=1);
-
 namespace Chill\ActivityBundle\Export;

 /**
@@ -18,7 +18,7 @@ abstract class Declarations
 {
    public const ACTIVITY = 'activity';

-    public const ACTIVITY_ACP = "activity_linked_to_acp";
+    public const ACTIVITY_ACP = 'activity_linked_to_acp';

-    public const ACTIVITY_PERSON = "activity_linked_to_person";
+    public const ACTIVITY_PERSON = 'activity_linked_to_person';
 }
--- a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/AvgActivityDuration.php
+++ b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/AvgActivityDuration.php
@@ -1,5 +1,14 @@
 <?php

+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\ActivityBundle\Export\Export\LinkedToACP;

 use Chill\ActivityBundle\Entity\Activity;
@@ -8,13 +17,12 @@ use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
 use Chill\MainBundle\Export\ExportInterface;
 use Chill\MainBundle\Export\FormatterInterface;
 use Chill\MainBundle\Export\GroupedExportInterface;
-use Closure;
+use Chill\PersonBundle\Export\Declarations as PersonDeclarations;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\Query;
-use Doctrine\ORM\QueryBuilder;
+use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\Security\Core\Role\Role;

 class AvgActivityDuration implements ExportInterface, GroupedExportInterface
 {
@@ -28,12 +36,6 @@ class AvgActivityDuration implements ExportInterface, GroupedExportInterface

    public function buildForm(FormBuilderInterface $builder)
    {
-        // TODO: Implement buildForm() method.
-    }
-
-    public function getTitle(): string
-    {
-        return 'Average activity linked to an accompanying period duration';
    }

    public function getAllowedFormattersTypes(): array
@@ -46,6 +48,11 @@ class AvgActivityDuration implements ExportInterface, GroupedExportInterface
        return 'Average activities linked to an accompanying period duration by various parameters.';
    }

+    public function getGroup(): string
+    {
+        return 'Exports of activities linked to an accompanying period';
+    }
+
    public function getLabels($key, array $values, $data)
    {
        if ('export_avg_activity_duration' !== $key) {
@@ -65,6 +72,11 @@ class AvgActivityDuration implements ExportInterface, GroupedExportInterface
        return $qb->getQuery()->getResult(Query::HYDRATE_SCALAR);
    }

+    public function getTitle(): string
+    {
+        return 'Average activity linked to an accompanying period duration';
+    }
+
    public function getType(): string
    {
        return Declarations::ACTIVITY;
@@ -72,18 +84,19 @@ class AvgActivityDuration implements ExportInterface, GroupedExportInterface

    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
    {
-        $qb = $this->repository->createQueryBuilder('activity')
-            ->join('activity.accompanyingPeriod', 'acp')
-        ;
+        $qb = $this->repository->createQueryBuilder('activity');

-        $qb->select('AVG(activity.durationTime) as export_avg_activity_duration');
+        $qb
+            ->join('activity.accompanyingPeriod', 'acp')
+            ->select('AVG(activity.durationTime) as export_avg_activity_duration')
+            ->andWhere($qb->expr()->isNotNull('activity.durationTime'));

        return $qb;
    }

-    public function requiredRole(): Role
+    public function requiredRole(): string
    {
-        return new Role(ActivityStatsVoter::STATS);
+        return ActivityStatsVoter::STATS;
    }

    public function supportsModifiers(): array
@@ -91,13 +104,7 @@ class AvgActivityDuration implements ExportInterface, GroupedExportInterface
        return [
            Declarations::ACTIVITY,
            Declarations::ACTIVITY_ACP,
-            //PersonDeclarations::ACP_TYPE,
+            PersonDeclarations::ACP_TYPE,
        ];
    }
-
-    public function getGroup(): string
-    {
-        return 'Exports of activities linked to an accompanying period';
-    }
-
-}
+}
--- a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/AvgActivityVisitDuration.php
+++ b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/AvgActivityVisitDuration.php
@@ -1,5 +1,14 @@
 <?php

+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\ActivityBundle\Export\Export\LinkedToACP;

 use Chill\ActivityBundle\Entity\Activity;
@@ -8,13 +17,12 @@ use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
 use Chill\MainBundle\Export\ExportInterface;
 use Chill\MainBundle\Export\FormatterInterface;
 use Chill\MainBundle\Export\GroupedExportInterface;
-use Closure;
+use Chill\PersonBundle\Export\Declarations as PersonDeclarations;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\Query;
-use Doctrine\ORM\QueryBuilder;
+use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\Security\Core\Role\Role;

 class AvgActivityVisitDuration implements ExportInterface, GroupedExportInterface
 {
@@ -31,11 +39,6 @@ class AvgActivityVisitDuration implements ExportInterface, GroupedExportInterfac
        // TODO: Implement buildForm() method.
    }

-    public function getTitle(): string
-    {
-        return 'Average activity linked to an accompanying period visit duration';
-    }
-
    public function getAllowedFormattersTypes(): array
    {
        return [FormatterInterface::TYPE_TABULAR];
@@ -46,6 +49,11 @@ class AvgActivityVisitDuration implements ExportInterface, GroupedExportInterfac
        return 'Average activities linked to an accompanying period visit duration by various parameters.';
    }

+    public function getGroup(): string
+    {
+        return 'Exports of activities linked to an accompanying period';
+    }
+
    public function getLabels($key, array $values, $data)
    {
        if ('export_avg_activity_visit_duration' !== $key) {
@@ -65,6 +73,11 @@ class AvgActivityVisitDuration implements ExportInterface, GroupedExportInterfac
        return $qb->getQuery()->getResult(Query::HYDRATE_SCALAR);
    }

+    public function getTitle(): string
+    {
+        return 'Average activity linked to an accompanying period visit duration';
+    }
+
    public function getType(): string
    {
        return Declarations::ACTIVITY;
@@ -72,18 +85,19 @@ class AvgActivityVisitDuration implements ExportInterface, GroupedExportInterfac

    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
    {
-        $qb = $this->repository->createQueryBuilder('activity')
-            ->join('activity.accompanyingPeriod', 'acp')
-        ;
+        $qb = $this->repository->createQueryBuilder('activity');

-        $qb->select('AVG(activity.travelTime) as export_avg_activity_visit_duration');
+        $qb
+            ->join('activity.accompanyingPeriod', 'acp')
+            ->select('AVG(activity.travelTime) as export_avg_activity_visit_duration')
+            ->andWhere($qb->expr()->isNotNull('activity.travelTime'));

        return $qb;
    }

-    public function requiredRole(): Role
+    public function requiredRole(): string
    {
-        return new Role(ActivityStatsVoter::STATS);
+        return ActivityStatsVoter::STATS;
    }

    public function supportsModifiers(): array
@@ -91,13 +105,7 @@ class AvgActivityVisitDuration implements ExportInterface, GroupedExportInterfac
        return [
            Declarations::ACTIVITY,
            Declarations::ACTIVITY_ACP,
-            //PersonDeclarations::ACP_TYPE,
+            PersonDeclarations::ACP_TYPE,
        ];
    }
-
-    public function getGroup(): string
-    {
-        return 'Exports of activities linked to an accompanying period';
-    }
-
-}
+}
--- a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/CountActivity.php
+++ b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/CountActivity.php
@@ -1,14 +1,14 @@
 <?php

-/**
+declare(strict_types=1);
+
+/*
 * Chill is a software for social workers
 *
 * For the full copyright and license information, please view
 * the LICENSE file that was distributed with this source code.
 */

-declare(strict_types=1);
-
 namespace Chill\ActivityBundle\Export\Export\LinkedToACP;

 use Chill\ActivityBundle\Entity\Activity;
@@ -23,14 +23,14 @@ use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\Query;
 use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\Security\Core\Role\Role;
+use function in_array;

 class CountActivity implements ExportInterface, GroupedExportInterface
 {
    protected EntityRepository $repository;

    public function __construct(
-         EntityManagerInterface $em
+        EntityManagerInterface $em
    ) {
        $this->repository = $em->getRepository(Activity::class);
    }
@@ -49,6 +49,11 @@ class CountActivity implements ExportInterface, GroupedExportInterface
        return 'Count activities linked to an accompanying period by various parameters.';
    }

+    public function getGroup(): string
+    {
+        return 'Exports of activities linked to an accompanying period';
+    }
+
    public function getLabels($key, array $values, $data)
    {
        if ('export_count_activity' !== $key) {
@@ -80,18 +85,20 @@ class CountActivity implements ExportInterface, GroupedExportInterface

    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
    {
-        $qb = $this->repository->createQueryBuilder('activity')
-            ->join('activity.accompanyingPeriod', 'acp')
-        ;
+        $qb = $this->repository->createQueryBuilder('activity');
+
+        if (!in_array('acp', $qb->getAllAliases(), true)) {
+            $qb->join('activity.accompanyingPeriod', 'acp');
+        }
+
+        $qb->select('COUNT(DISTINCT activity.id) as export_count_activity');

-        $qb->select('COUNT(activity.id) as export_count_activity');
-        
        return $qb;
    }

-    public function requiredRole(): Role
+    public function requiredRole(): string
    {
-        return new Role(ActivityStatsVoter::STATS);
+        return ActivityStatsVoter::STATS;
    }

    public function supportsModifiers(): array
@@ -99,12 +106,7 @@ class CountActivity implements ExportInterface, GroupedExportInterface
        return [
            Declarations::ACTIVITY,
            Declarations::ACTIVITY_ACP,
-            //PersonDeclarations::ACP_TYPE,
+            PersonDeclarations::ACP_TYPE,
        ];
    }
-
-    public function getGroup(): string
-    {
-        return 'Exports of activities linked to an accompanying period';
-    }
 }
--- a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/SumActivityDuration.php
+++ b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/SumActivityDuration.php
@@ -1,5 +1,14 @@
 <?php

+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\ActivityBundle\Export\Export\LinkedToACP;

 use Chill\ActivityBundle\Entity\Activity;
@@ -8,13 +17,13 @@ use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
 use Chill\MainBundle\Export\ExportInterface;
 use Chill\MainBundle\Export\FormatterInterface;
 use Chill\MainBundle\Export\GroupedExportInterface;
-use Closure;
+use Chill\PersonBundle\Export\Declarations as PersonDeclarations;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\Query;
-use Doctrine\ORM\QueryBuilder;
+use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\Security\Core\Role\Role;
+use function in_array;

 class SumActivityDuration implements ExportInterface, GroupedExportInterface
 {
@@ -31,11 +40,6 @@ class SumActivityDuration implements ExportInterface, GroupedExportInterface
        // TODO: Implement buildForm() method.
    }

-    public function getTitle(): string
-    {
-        return 'Sum activity linked to an accompanying period duration';
-    }
-
    public function getAllowedFormattersTypes(): array
    {
        return [FormatterInterface::TYPE_TABULAR];
@@ -46,6 +50,11 @@ class SumActivityDuration implements ExportInterface, GroupedExportInterface
        return 'Sum activities linked to an accompanying period duration by various parameters.';
    }

+    public function getGroup(): string
+    {
+        return 'Exports of activities linked to an accompanying period';
+    }
+
    public function getLabels($key, array $values, $data)
    {
        if ('export_sum_activity_duration' !== $key) {
@@ -65,6 +74,11 @@ class SumActivityDuration implements ExportInterface, GroupedExportInterface
        return $qb->getQuery()->getResult(Query::HYDRATE_SCALAR);
    }

+    public function getTitle(): string
+    {
+        return 'Sum activity linked to an accompanying period duration';
+    }
+
    public function getType(): string
    {
        return Declarations::ACTIVITY;
@@ -72,18 +86,21 @@ class SumActivityDuration implements ExportInterface, GroupedExportInterface

    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
    {
-        $qb = $this->repository->createQueryBuilder('activity')
-            ->join('activity.accompanyingPeriod', 'acp')
-        ;
+        $qb = $this->repository->createQueryBuilder('activity');

-        $qb->select('SUM(activity.durationTime) as export_sum_activity_duration');
+        if (!in_array('acp', $qb->getAllAliases(), true)) {
+            $qb->join('activity.accompanyingPeriod', 'acp');
+        }
+
+        $qb->select('SUM(activity.durationTime) as export_sum_activity_duration')
+            ->andWhere($qb->expr()->isNotNull('activity.durationTime'));

        return $qb;
    }

-    public function requiredRole(): Role
+    public function requiredRole(): string
    {
-        return new Role(ActivityStatsVoter::STATS);
+        return ActivityStatsVoter::STATS;
    }

    public function supportsModifiers(): array
@@ -91,13 +108,7 @@ class SumActivityDuration implements ExportInterface, GroupedExportInterface
        return [
            Declarations::ACTIVITY,
            Declarations::ACTIVITY_ACP,
-            //PersonDeclarations::ACP_TYPE,
+            PersonDeclarations::ACP_TYPE,
        ];
    }
-
-    public function getGroup(): string
-    {
-        return 'Exports of activities linked to an accompanying period';
-    }
-
-}
+}
--- a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/SumActivityVisitDuration.php
+++ b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/SumActivityVisitDuration.php
@@ -1,5 +1,14 @@
 <?php

+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\ActivityBundle\Export\Export\LinkedToACP;

 use Chill\ActivityBundle\Entity\Activity;
@@ -8,13 +17,13 @@ use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
 use Chill\MainBundle\Export\ExportInterface;
 use Chill\MainBundle\Export\FormatterInterface;
 use Chill\MainBundle\Export\GroupedExportInterface;
-use Closure;
+use Chill\PersonBundle\Export\Declarations as PersonDeclarations;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\Query;
-use Doctrine\ORM\QueryBuilder;
+use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\Security\Core\Role\Role;
+use function in_array;

 class SumActivityVisitDuration implements ExportInterface, GroupedExportInterface
 {
@@ -31,11 +40,6 @@ class SumActivityVisitDuration implements ExportInterface, GroupedExportInterfac
        // TODO: Implement buildForm() method.
    }

-    public function getTitle(): string
-    {
-        return 'Sum activity linked to an accompanying period visit duration';
-    }
-
    public function getAllowedFormattersTypes(): array
    {
        return [FormatterInterface::TYPE_TABULAR];
@@ -46,6 +50,11 @@ class SumActivityVisitDuration implements ExportInterface, GroupedExportInterfac
        return 'Sum activities linked to an accompanying period visit duration by various parameters.';
    }

+    public function getGroup(): string
+    {
+        return 'Exports of activities linked to an accompanying period';
+    }
+
    public function getLabels($key, array $values, $data)
    {
        if ('export_sum_activity_visit_duration' !== $key) {
@@ -65,6 +74,11 @@ class SumActivityVisitDuration implements ExportInterface, GroupedExportInterfac
        return $qb->getQuery()->getResult(Query::HYDRATE_SCALAR);
    }

+    public function getTitle(): string
+    {
+        return 'Sum activity linked to an accompanying period visit duration';
+    }
+
    public function getType(): string
    {
        return Declarations::ACTIVITY;
@@ -72,18 +86,21 @@ class SumActivityVisitDuration implements ExportInterface, GroupedExportInterfac

    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
    {
-        $qb = $this->repository->createQueryBuilder('activity')
-            ->join('activity.accompanyingPeriod', 'acp')
-        ;
+        $qb = $this->repository->createQueryBuilder('activity');

-        $qb->select('SUM(activity.travelTime) as export_sum_activity_visit_duration');
+        if (!in_array('acp', $qb->getAllAliases(), true)) {
+            $qb->join('activity.accompanyingPeriod', 'acp');
+        }
+
+        $qb->select('SUM(activity.travelTime) as export_sum_activity_visit_duration')
+            ->andWhere($qb->expr()->isNotNull('activity.travelTime'));

        return $qb;
    }

-    public function requiredRole(): Role
+    public function requiredRole(): string
    {
-        return new Role(ActivityStatsVoter::STATS);
+        return ActivityStatsVoter::STATS;
    }

    public function supportsModifiers(): array
@@ -91,12 +108,7 @@ class SumActivityVisitDuration implements ExportInterface, GroupedExportInterfac
        return [
            Declarations::ACTIVITY,
            Declarations::ACTIVITY_ACP,
-            //PersonDeclarations::ACP_TYPE,
+            PersonDeclarations::ACP_TYPE,
        ];
    }
-
-    public function getGroup(): string
-    {
-        return 'Exports of activities linked to an accompanying period';
-    }
-}
+}
--- a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/CountActivity.php
+++ b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/CountActivity.php
@@ -1,27 +1,27 @@
 <?php

-/**
+declare(strict_types=1);
+
+/*
 * Chill is a software for social workers
 *
 * For the full copyright and license information, please view
 * the LICENSE file that was distributed with this source code.
 */

-declare(strict_types=1);
-
 namespace Chill\ActivityBundle\Export\Export\LinkedToPerson;

+use Chill\ActivityBundle\Export\Declarations;
 use Chill\ActivityBundle\Repository\ActivityRepository;
 use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
 use Chill\MainBundle\Export\ExportInterface;
 use Chill\MainBundle\Export\FormatterInterface;
 use Chill\MainBundle\Export\GroupedExportInterface;
-use Chill\ActivityBundle\Export\Declarations;
 use Chill\PersonBundle\Export\Declarations as PersonDeclarations;
 use Doctrine\ORM\Query;
 use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\Security\Core\Role\Role;
+use function in_array;

 class CountActivity implements ExportInterface, GroupedExportInterface
 {
@@ -47,6 +47,11 @@ class CountActivity implements ExportInterface, GroupedExportInterface
        return 'Count activities linked to a person by various parameters.';
    }

+    public function getGroup(): string
+    {
+        return 'Exports of activities linked to a person';
+    }
+
    public function getLabels($key, array $values, $data)
    {
        if ('export_count_activity' !== $key) {
@@ -80,23 +85,24 @@ class CountActivity implements ExportInterface, GroupedExportInterface
    {
        $centers = array_map(static fn ($el) => $el['center'], $acl);

-        $qb = $this->activityRepository->createQueryBuilder('activity')
-            ->join('activity.person', 'person')
-        ;
+        $qb = $this->activityRepository->createQueryBuilder('activity');
+
+        if (!in_array('person', $qb->getAllAliases(), true)) {
+            $qb->join('activity.person', 'person');
+        }

        $qb->select('COUNT(activity.id) as export_count_activity');

        $qb
            ->where($qb->expr()->in('person.center', ':centers'))
-            ->setParameter('centers', $centers)
-        ;
+            ->setParameter('centers', $centers);

        return $qb;
    }

-    public function requiredRole()
+    public function requiredRole(): string
    {
-        return new Role(ActivityStatsVoter::STATS);
+        return ActivityStatsVoter::STATS;
    }

    public function supportsModifiers()
@@ -104,12 +110,7 @@ class CountActivity implements ExportInterface, GroupedExportInterface
        return [
            Declarations::ACTIVITY,
            Declarations::ACTIVITY_PERSON,
-            //PersonDeclarations::PERSON_TYPE,
+            PersonDeclarations::PERSON_TYPE,
        ];
    }
-
-    public function getGroup(): string
-    {
-        return 'Exports of activities linked to a person';
-    }
 }
--- a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/ListActivity.php
+++ b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/ListActivity.php
@@ -1,35 +1,34 @@
 <?php

-/**
+declare(strict_types=1);
+
+/*
 * Chill is a software for social workers
 *
 * For the full copyright and license information, please view
 * the LICENSE file that was distributed with this source code.
 */

-declare(strict_types=1);
-
 namespace Chill\ActivityBundle\Export\Export\LinkedToPerson;

 use Chill\ActivityBundle\Entity\ActivityReason;
+use Chill\ActivityBundle\Export\Declarations;
 use Chill\ActivityBundle\Repository\ActivityRepository;
 use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
 use Chill\MainBundle\Export\FormatterInterface;
 use Chill\MainBundle\Export\GroupedExportInterface;
 use Chill\MainBundle\Export\ListInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
+use Chill\PersonBundle\Export\Declarations as PersonDeclarations;
 use DateTime;
 use Doctrine\DBAL\Exception\InvalidArgumentException;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Query;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 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;
-use Chill\ActivityBundle\Export\Declarations;
-use Chill\PersonBundle\Export\Declarations as PersonDeclarations;

 use function array_key_exists;
 use function count;
@@ -100,6 +99,11 @@ class ListActivity implements ListInterface, GroupedExportInterface
        return 'List activities linked to a person description';
    }

+    public function getGroup(): string
+    {
+        return 'Exports of activities linked to a person';
+    }
+
    public function getLabels($key, array $values, $data)
    {
        switch ($key) {
@@ -207,8 +211,8 @@ class ListActivity implements ListInterface, GroupedExportInterface
        $qb
            ->from('ChillActivityBundle:Activity', 'activity')
            ->join('activity.person', 'person')
-            ->join('person.center', 'center')
-            ->andWhere('center IN (:authorized_centers)')
+            ->join('actperson.center', 'actcenter')
+            ->andWhere('actcenter IN (:authorized_centers)')
            ->setParameter('authorized_centers', $centers);

        foreach ($this->fields as $f) {
@@ -235,8 +239,8 @@ class ListActivity implements ListInterface, GroupedExportInterface
                        break;

                    case 'user_username':
-                        $qb->join('activity.user', 'user');
-                        $qb->addSelect('user.username AS user_username');
+                        $qb->join('activity.user', 'actuser');
+                        $qb->addSelect('actuser.username AS user_username');

                        break;

@@ -270,9 +274,9 @@ class ListActivity implements ListInterface, GroupedExportInterface
        return $qb;
    }

-    public function requiredRole()
+    public function requiredRole(): string
    {
-        return new Role(ActivityStatsVoter::LISTS);
+        return ActivityStatsVoter::LISTS;
    }

    public function supportsModifiers()
@@ -283,9 +287,4 @@ class ListActivity implements ListInterface, GroupedExportInterface
            //PersonDeclarations::PERSON_TYPE,
        ];
    }
-
-    public function getGroup(): string
-    {
-        return 'Exports of activities linked to a person';
-    }
 }
--- a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/StatActivityDuration.php
+++ b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/StatActivityDuration.php
@@ -1,16 +1,17 @@
 <?php

-/**
+declare(strict_types=1);
+
+/*
 * Chill is a software for social workers
 *
 * For the full copyright and license information, please view
 * the LICENSE file that was distributed with this source code.
 */

-declare(strict_types=1);
-
 namespace Chill\ActivityBundle\Export\Export\LinkedToPerson;

+use Chill\ActivityBundle\Export\Declarations;
 use Chill\ActivityBundle\Repository\ActivityRepository;
 use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
 use Chill\MainBundle\Entity\Center;
@@ -18,11 +19,9 @@ use Chill\MainBundle\Export\ExportInterface;
 use Chill\MainBundle\Export\FormatterInterface;
 use Chill\MainBundle\Export\GroupedExportInterface;
 use Chill\PersonBundle\Export\Declarations as PersonDeclarations;
-use Chill\ActivityBundle\Export\Declarations;
 use Doctrine\ORM\Query;
 use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\Security\Core\Role\Role;

 /**
 * This export allow to compute stats on activity duration.
@@ -67,6 +66,11 @@ class StatActivityDuration implements ExportInterface, GroupedExportInterface
        }
    }

+    public function getGroup(): string
+    {
+        return 'Exports of activities linked to a person';
+    }
+
    public function getLabels($key, array $values, $data)
    {
        if ('export_stat_activity' !== $key) {
@@ -117,14 +121,14 @@ class StatActivityDuration implements ExportInterface, GroupedExportInterface

        return $qb->select($select)
            ->join('activity.person', 'person')
-            ->join('person.center', 'center')
-            ->where($qb->expr()->in('center', ':centers'))
+            ->join('actperson.center', 'actcenter')
+            ->where($qb->expr()->in('actcenter', ':centers'))
            ->setParameter(':centers', $centers);
    }

-    public function requiredRole()
+    public function requiredRole(): string
    {
-        return new Role(ActivityStatsVoter::STATS);
+        return ActivityStatsVoter::STATS;
    }

    public function supportsModifiers()
@@ -135,9 +139,4 @@ class StatActivityDuration implements ExportInterface, GroupedExportInterface
            //PersonDeclarations::PERSON_TYPE,
        ];
    }
-
-    public function getGroup(): string
-    {
-        return 'Exports of activities linked to a person';
-    }
 }
--- a/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/ActivityTypeFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/ActivityTypeFilter.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);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\ActivityBundle\Export\Filter\ACPFilters;
+
+use Chill\ActivityBundle\Entity\Activity;
+use Chill\ActivityBundle\Entity\ActivityType;
+use Chill\ActivityBundle\Repository\ActivityTypeRepositoryInterface;
+use Chill\MainBundle\Export\FilterInterface;
+use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
+use Chill\PersonBundle\Export\Declarations;
+use Doctrine\ORM\Query\Expr;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
+use Symfony\Component\Form\FormBuilderInterface;
+use function in_array;
+
+class ActivityTypeFilter implements FilterInterface
+{
+    private ActivityTypeRepositoryInterface $activityTypeRepository;
+
+    private TranslatableStringHelperInterface $translatableStringHelper;
+
+    public function __construct(
+        ActivityTypeRepositoryInterface $activityTypeRepository,
+        TranslatableStringHelperInterface $translatableStringHelper
+    ) {
+        $this->activityTypeRepository = $activityTypeRepository;
+        $this->translatableStringHelper = $translatableStringHelper;
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        if (!in_array('activity', $qb->getAllAliases(), true)) {
+            $qb->join(Activity::class, 'activity', Expr\Join::WITH, 'activity.accompanyingPeriod = acp');
+        }
+
+        $clause = $qb->expr()->in('activity.activityType', ':selected_activity_types');
+
+        $qb->andWhere($clause);
+        $qb->setParameter('selected_activity_types', $data['types']);
+    }
+
+    public function applyOn()
+    {
+        return Declarations::ACP_TYPE;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        $builder->add('accepted_activitytypes', EntityType::class, [
+            'class' => ActivityType::class,
+            'choices' => $this->activityTypeRepository->findAllActive(),
+            'choice_label' => function (ActivityType $aty) {
+                return
+                    ($aty->hasCategory() ? $this->translatableStringHelper->localize($aty->getCategory()->getName()) . ' > ' : '')
+                    .
+                    $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(', ', $types),
+        ]];
+    }
+
+    public function getTitle(): string
+    {
+        return 'Filter accompanying course by activity type';
+    }
+}
--- a/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/BySocialActionFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/BySocialActionFilter.php
@@ -2,16 +2,24 @@

 declare(strict_types=1);

+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\ActivityBundle\Export\Filter\ACPFilters;

-use Chill\MainBundle\Export\FilterInterface;
 use Chill\ActivityBundle\Export\Declarations;
+use Chill\MainBundle\Export\FilterInterface;
 use Chill\PersonBundle\Entity\SocialWork\SocialAction;
 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 BySocialActionFilter implements FilterInterface
 {
@@ -22,6 +30,36 @@ class BySocialActionFilter implements FilterInterface
        $this->actionRender = $actionRender;
    }

+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        $where = $qb->getDQLPart('where');
+
+        if (!in_array('actsocialaction', $qb->getAllAliases(), true)) {
+            $qb->join('activity.socialActions', 'actsocialaction');
+        }
+
+        $clause = $qb->expr()->in('actsocialaction.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::ACTIVITY_ACP;
+    }
+
    public function buildForm(FormBuilderInterface $builder)
    {
        $builder->add('accepted_socialactions', EntityType::class, [
@@ -34,11 +72,6 @@ class BySocialActionFilter implements FilterInterface
        ]);
    }

-    public function getTitle(): string
-    {
-        return 'Filter activity by linked socialaction';
-    }
-
    public function describeAction($data, $format = 'string'): array
    {
        $actions = [];
@@ -48,38 +81,12 @@ class BySocialActionFilter implements FilterInterface
        }

        return ['Filtered activity by linked socialaction: only %actions%', [
-            '%actions%' => implode(", ou ", $actions)
+            '%actions%' => implode(', ou ', $actions),
        ]];
    }

-    public function addRole()
+    public function getTitle(): string
    {
-        return null;
+        return 'Filter activity by linked socialaction';
    }
-
-    public function alterQuery(QueryBuilder $qb, $data)
-    {
-        $where = $qb->getDQLPart('where');
-
-        if (!in_array('socialaction', $qb->getAllAliases())) {
-            $qb->join('activity.socialActions', 'socialaction');
-        }
-
-        $clause = $qb->expr()->in('socialaction.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::ACTIVITY_ACP;
-    }
-
-}
+}
--- a/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/BySocialIssueFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/BySocialIssueFilter.php
@@ -2,16 +2,24 @@

 declare(strict_types=1);

+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\ActivityBundle\Export\Filter\ACPFilters;

-use Chill\MainBundle\Export\FilterInterface;
 use Chill\ActivityBundle\Export\Declarations;
+use Chill\MainBundle\Export\FilterInterface;
 use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
 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 function in_array;

 class BySocialIssueFilter implements FilterInterface
 {
@@ -22,37 +30,7 @@ class BySocialIssueFilter implements FilterInterface
        $this->issueRender = $issueRender;
    }

-    public function buildForm(FormBuilderInterface $builder)
-    {
-        $builder->add('accepted_socialissues', EntityType::class, [
-            'class' => SocialIssue::class,
-            'choice_label' => function(SocialIssue $si) {
-                return $this->issueRender->renderString($si, []);
-            },
-            'multiple' => true,
-            'expanded' => true,
-        ]);
-    }
-
-    public function getTitle(): string
-    {
-        return 'Filter activity by linked socialissue';
-    }
-
-    public function describeAction($data, $format = 'string'): array
-    {
-        $issues = [];
-
-        foreach ($data['accepted_socialissues'] as $si) {
-            $issues[] = $this->issueRender->renderString($si, []);
-        }
-
-        return ['Filtered activity by linked socialissue: only %issues%', [
-            '%issues%' => implode(", ou ", $issues)
-        ]];
-    }
-
-    public function addRole()
+    public function addRole(): ?string
    {
        return null;
    }
@@ -61,11 +39,11 @@ class BySocialIssueFilter implements FilterInterface
    {
        $where = $qb->getDQLPart('where');

-        if (!in_array('socialissue', $qb->getAllAliases())) {
-            $qb->join('activity.socialIssues', 'socialissue');
+        if (!in_array('actsocialissue', $qb->getAllAliases(), true)) {
+            $qb->join('activity.socialIssues', 'actsocialissue');
        }

-        $clause = $qb->expr()->in('socialissue.id', ':socialissues');
+        $clause = $qb->expr()->in('actsocialissue.id', ':socialissues');

        if ($where instanceof Andx) {
            $where->add($clause);
@@ -77,9 +55,38 @@ class BySocialIssueFilter implements FilterInterface
        $qb->setParameter('socialissues', $data['accepted_socialissues']);
    }

-    public  function applyOn(): string
+    public function applyOn(): string
    {
        return Declarations::ACTIVITY_ACP;
    }

-}
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        $builder->add('accepted_socialissues', EntityType::class, [
+            'class' => SocialIssue::class,
+            'choice_label' => function (SocialIssue $si) {
+                return $this->issueRender->renderString($si, []);
+            },
+            'multiple' => true,
+            'expanded' => true,
+        ]);
+    }
+
+    public function describeAction($data, $format = 'string'): array
+    {
+        $issues = [];
+
+        foreach ($data['accepted_socialissues'] as $si) {
+            $issues[] = $this->issueRender->renderString($si, []);
+        }
+
+        return ['Filtered activity by linked socialissue: only %issues%', [
+            '%issues%' => implode(', ou ', $issues),
+        ]];
+    }
+
+    public function getTitle(): string
+    {
+        return 'Filter activity by linked socialissue';
+    }
+}
--- a/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/ByUserFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/ByUserFilter.php
@@ -2,16 +2,24 @@

 declare(strict_types=1);

+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\ActivityBundle\Export\Filter\ACPFilters;

+use Chill\ActivityBundle\Export\Declarations;
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Export\FilterInterface;
-use Chill\ActivityBundle\Export\Declarations;
 use Chill\MainBundle\Templating\Entity\UserRender;
 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 ByUserFilter implements FilterInterface
 {
@@ -22,6 +30,36 @@ class ByUserFilter implements FilterInterface
        $this->userRender = $userRender;
    }

+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        $where = $qb->getDQLPart('where');
+
+        if (!in_array('actusers', $qb->getAllAliases(), true)) {
+            $qb->join('activity.users', 'actusers');
+        }
+
+        $clause = $qb->expr()->in('actusers.id', ':users');
+
+        if ($where instanceof Andx) {
+            $where->add($clause);
+        } else {
+            $where = $qb->expr()->andX($clause);
+        }
+
+        $qb->add('where', $where);
+        $qb->setParameter('users', $data['accepted_users']);
+    }
+
+    public function applyOn(): string
+    {
+        return Declarations::ACTIVITY_ACP;
+    }
+
    public function buildForm(FormBuilderInterface $builder)
    {
        $builder->add('accepted_users', EntityType::class, [
@@ -34,11 +72,6 @@ class ByUserFilter implements FilterInterface
        ]);
    }

-    public function getTitle(): string
-    {
-        return 'Filter activity by linked users';
-    }
-
    public function describeAction($data, $format = 'string'): array
    {
        $users = [];
@@ -48,37 +81,12 @@ class ByUserFilter implements FilterInterface
        }

        return ['Filtered activity by linked users: only %users%', [
-            '%users%' => implode(", ou ", $users)
+            '%users%' => implode(', ou ', $users),
        ]];
    }

-    public function addRole()
+    public function getTitle(): string
    {
-        return null;
+        return 'Filter activity by linked users';
    }
-
-    public function alterQuery(QueryBuilder $qb, $data)
-    {
-        $where = $qb->getDQLPart('where');
-
-        if (!in_array('user', $qb->getAllAliases())) {
-            $qb->join('activity.users', 'user');
-        }
-
-        $clause = $qb->expr()->in('user.id', ':users');
-
-        if ($where instanceof Andx) {
-            $where->add($clause);
-        } else {
-            $where = $qb->expr()->andX($clause);
-        }
-
-        $qb->add('where', $where);
-        $qb->setParameter('users', $data['accepted_users']);
-    }
-
-    public  function applyOn(): string
-    {
-         return Declarations::ACTIVITY_ACP;
-    }
-}
+}
--- a/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/EmergencyFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/EmergencyFilter.php
@@ -2,10 +2,17 @@

 declare(strict_types=1);

+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\ActivityBundle\Export\Filter\ACPFilters;

-use Chill\MainBundle\Export\FilterInterface;
 use Chill\ActivityBundle\Export\Declarations;
+use Chill\MainBundle\Export\FilterInterface;
 use Doctrine\ORM\Query\Expr\Andx;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
@@ -19,7 +26,7 @@ class EmergencyFilter implements FilterInterface
        'activity is not emergency' => false,
    ];

-    private CONST DEFAULT_CHOICE = false;
+    private const DEFAULT_CHOICE = false;

    private TranslatorInterface $translator;

@@ -28,36 +35,7 @@ class EmergencyFilter implements FilterInterface
        $this->translator = $translator;
    }

-    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 getTitle(): string
-    {
-        return 'Filter activity by emergency';
-    }
-
-    public function describeAction($data, $format = 'string'): array
-    {
-        foreach (self::CHOICES as $k => $v) {
-            if ($v === $data['accepted_emergency']) {
-                $choice = $k;
-            }
-        }
-
-        return ['Filtered activity by emergency: only %emergency%', [
-            '%emergency%' => $this->translator->trans($choice)
-        ]];
-    }
-
-    public function addRole()
+    public function addRole(): ?string
    {
        return null;
    }
@@ -78,9 +56,37 @@ class EmergencyFilter implements FilterInterface
        $qb->setParameter('emergency', $data['accepted_emergency']);
    }

-    public  function applyOn(): string
+    public function applyOn(): string
    {
-         return Declarations::ACTIVITY_ACP;
+        return Declarations::ACTIVITY_ACP;
    }

-}
+    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 activity by emergency: only %emergency%', [
+            '%emergency%' => $this->translator->trans($choice),
+        ]];
+    }
+
+    public function getTitle(): string
+    {
+        return 'Filter activity by emergency';
+    }
+}
--- a/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/LocationTypeFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/LocationTypeFilter.php
@@ -2,16 +2,24 @@

 declare(strict_types=1);

+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\ActivityBundle\Export\Filter\ACPFilters;

+use Chill\ActivityBundle\Export\Declarations;
 use Chill\MainBundle\Entity\LocationType;
 use Chill\MainBundle\Export\FilterInterface;
-use Chill\ActivityBundle\Export\Declarations;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
 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 LocationTypeFilter implements FilterInterface
 {
@@ -22,11 +30,40 @@ class LocationTypeFilter implements FilterInterface
        $this->translatableStringHelper = $translatableStringHelper;
    }

+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        if (!in_array('actloc', $qb->getAllAliases(), true)) {
+            $qb->join('activity.location', 'actloc');
+        }
+
+        $where = $qb->getDQLPart('where');
+        $clause = $qb->expr()->in('actloc.locationType', ':locationtype');
+
+        if ($where instanceof Andx) {
+            $where->add($clause);
+        } else {
+            $where = $qb->expr()->andX($clause);
+        }
+
+        $qb->add('where', $where);
+        $qb->setParameter('locationtype', $data['accepted_locationtype']);
+    }
+
+    public function applyOn(): string
+    {
+        return Declarations::ACTIVITY_ACP;
+    }
+
    public function buildForm(FormBuilderInterface $builder)
    {
        $builder->add('accepted_locationtype', EntityType::class, [
            'class' => LocationType::class,
-            'choice_label' => function(LocationType $type) {
+            'choice_label' => function (LocationType $type) {
                return $this->translatableStringHelper->localize($type->getTitle());
            },
            'multiple' => true,
@@ -34,11 +71,6 @@ class LocationTypeFilter implements FilterInterface
        ]);
    }

-    public function getTitle(): string
-    {
-        return 'Filter activity by locationtype';
-    }
-
    public function describeAction($data, $format = 'string'): array
    {
        $types = [];
@@ -50,36 +82,12 @@ class LocationTypeFilter implements FilterInterface
        }

        return ['Filtered activity by locationtype: only %types%', [
-            '%types%' => implode(", ou ", $types)
+            '%types%' => implode(', ou ', $types),
        ]];
    }

-    public function addRole()
+    public function getTitle(): string
    {
-        return null;
+        return 'Filter activity by locationtype';
    }
-
-    public function alterQuery(QueryBuilder $qb, $data)
-    {
-        if (!in_array('location', $qb->getAllAliases())) {
-            $qb->join('activity.location', 'location');
-        }
-
-        $where = $qb->getDQLPart('where');
-        $clause = $qb->expr()->in('location.locationType', ':locationtype');
-
-        if ($where instanceof Andx) {
-            $where->add($clause);
-        } else {
-            $where = $qb->expr()->andX($clause);
-        }
-
-        $qb->add('where', $where);
-        $qb->setParameter('locationtype', $data['accepted_locationtype']);
-    }
-
-    public  function applyOn(): string
-    {
-         return Declarations::ACTIVITY_ACP;
-    }
-}
+}
--- a/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/SentReceivedFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/SentReceivedFilter.php
@@ -2,11 +2,18 @@

 declare(strict_types=1);

+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\ActivityBundle\Export\Filter\ACPFilters;

 use Chill\ActivityBundle\Entity\Activity;
-use Chill\MainBundle\Export\FilterInterface;
 use Chill\ActivityBundle\Export\Declarations;
+use Chill\MainBundle\Export\FilterInterface;
 use Doctrine\ORM\Query\Expr\Andx;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
@@ -20,7 +27,7 @@ class SentReceivedFilter implements FilterInterface
        'is received' => Activity::SENTRECEIVED_RECEIVED,
    ];

-    private CONST DEFAULT_CHOICE = Activity::SENTRECEIVED_SENT;
+    private const DEFAULT_CHOICE = Activity::SENTRECEIVED_SENT;

    private TranslatorInterface $translator;

@@ -29,32 +36,7 @@ class SentReceivedFilter implements FilterInterface
        $this->translator = $translator;
    }

-    public function buildForm(FormBuilderInterface $builder)
-    {
-        $builder->add('accepted_sentreceived', ChoiceType::class, [
-            'choices' => self::CHOICES,
-            'multiple' => false,
-            'expanded' => true,
-            'empty_data' => self::DEFAULT_CHOICE,
-            'data' => self::DEFAULT_CHOICE,
-        ]);
-    }
-
-    public function getTitle(): string
-    {
-        return 'Filter activity by sentreceived';
-    }
-
-    public function describeAction($data, $format = 'string'): array
-    {
-        $sentreceived = array_flip(self::CHOICES)[$data['accepted_sentreceived']];
-
-        return ['Filtered activity by sentreceived: only %sentreceived%', [
-            '%sentreceived%' => $this->translator->trans($sentreceived)
-        ]];
-    }
-
-    public function addRole()
+    public function addRole(): ?string
    {
        return null;
    }
@@ -75,8 +57,33 @@ class SentReceivedFilter implements FilterInterface
        $qb->setParameter('sentreceived', $data['accepted_sentreceived']);
    }

-    public  function applyOn(): string
+    public function applyOn(): string
    {
-         return Declarations::ACTIVITY_ACP;
+        return Declarations::ACTIVITY_ACP;
    }
-}
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        $builder->add('accepted_sentreceived', 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
+    {
+        $sentreceived = array_flip(self::CHOICES)[$data['accepted_sentreceived']];
+
+        return ['Filtered activity by sentreceived: only %sentreceived%', [
+            '%sentreceived%' => $this->translator->trans($sentreceived),
+        ]];
+    }
+
+    public function getTitle(): string
+    {
+        return 'Filter activity by sentreceived';
+    }
+}
--- a/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/UserFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/UserFilter.php
@@ -2,11 +2,18 @@

 declare(strict_types=1);

+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\ActivityBundle\Export\Filter\ACPFilters;

+use Chill\ActivityBundle\Export\Declarations;
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Export\FilterInterface;
-use Chill\ActivityBundle\Export\Declarations;
 use Chill\MainBundle\Templating\Entity\UserRender;
 use Doctrine\ORM\Query\Expr\Andx;
 use Doctrine\ORM\QueryBuilder;
@@ -22,38 +29,7 @@ class UserFilter implements FilterInterface
        $this->userRender = $userRender;
    }

-    public function buildForm(FormBuilderInterface $builder)
-    {
-        $builder->add('accepted_users', EntityType::class, [
-            'class' => User::class,
-            'choice_label' => function (User $u) {
-                return $this->userRender->renderString($u, []);
-            },
-            'multiple' => true,
-            'expanded' => true,
-            'label' => 'Creators'
-        ]);
-    }
-
-    public function getTitle(): string
-    {
-        return 'Filter activity by user';
-    }
-
-    public function describeAction($data, $format = 'string'): array
-    {
-        $users = [];
-
-        foreach ($data['accepted_users'] as $u) {
-            $users[] = $this->userRender->renderString($u, []);
-        }
-
-        return ['Filtered activity by user: only %users%', [
-            '%users%' => implode(", ou ", $users)
-        ]];
-    }
-
-    public function addRole()
+    public function addRole(): ?string
    {
        return null;
    }
@@ -74,9 +50,39 @@ class UserFilter implements FilterInterface
        $qb->setParameter('users', $data['accepted_users']);
    }

-    public  function applyOn(): string
+    public function applyOn(): string
    {
-         return Declarations::ACTIVITY_ACP;
+        return Declarations::ACTIVITY_ACP;
    }

-}
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        $builder->add('accepted_users', EntityType::class, [
+            'class' => User::class,
+            'choice_label' => function (User $u) {
+                return $this->userRender->renderString($u, []);
+            },
+            'multiple' => true,
+            'expanded' => true,
+            'label' => 'Creators',
+        ]);
+    }
+
+    public function describeAction($data, $format = 'string'): array
+    {
+        $users = [];
+
+        foreach ($data['accepted_users'] as $u) {
+            $users[] = $this->userRender->renderString($u, []);
+        }
+
+        return ['Filtered activity by user: only %users%', [
+            '%users%' => implode(', ou ', $users),
+        ]];
+    }
+
+    public function getTitle(): string
+    {
+        return 'Filter activity by user';
+    }
+}
--- a/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/UserScopeFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/UserScopeFilter.php
@@ -2,16 +2,24 @@

 declare(strict_types=1);

+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\ActivityBundle\Export\Filter\ACPFilters;

+use Chill\ActivityBundle\Export\Declarations;
 use Chill\MainBundle\Entity\Scope;
 use Chill\MainBundle\Export\FilterInterface;
-use Chill\ActivityBundle\Export\Declarations;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
 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 UserScopeFilter implements FilterInterface
 {
@@ -22,6 +30,36 @@ class UserScopeFilter implements FilterInterface
        $this->translatableStringHelper = $translatableStringHelper;
    }

+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        if (!in_array('actuser', $qb->getAllAliases(), true)) {
+            $qb->join('activity.user', 'actuser');
+        }
+
+        $where = $qb->getDQLPart('where');
+
+        $clause = $qb->expr()->in('actuser.mainScope', ':userscope');
+
+        if ($where instanceof Andx) {
+            $where->add($clause);
+        } else {
+            $where = $qb->expr()->andX($clause);
+        }
+
+        $qb->add('where', $where);
+        $qb->setParameter('userscope', $data['accepted_userscope']);
+    }
+
+    public function applyOn(): string
+    {
+        return Declarations::ACTIVITY_ACP;
+    }
+
    public function buildForm(FormBuilderInterface $builder)
    {
        $builder->add('accepted_userscope', EntityType::class, [
@@ -32,15 +70,10 @@ class UserScopeFilter implements FilterInterface
                );
            },
            'multiple' => true,
-            'expanded' => true
+            'expanded' => true,
        ]);
    }

-    public function getTitle(): string
-    {
-        return 'Filter activity by userscope';
-    }
-
    public function describeAction($data, $format = 'string'): array
    {
        $scopes = [];
@@ -52,38 +85,12 @@ class UserScopeFilter implements FilterInterface
        }

        return ['Filtered activity by userscope: only %scopes%', [
-            '%scopes%' => implode(", ou ", $scopes)
+            '%scopes%' => implode(', ou ', $scopes),
        ]];
    }

-    public function addRole()
+    public function getTitle(): string
    {
-        return null;
+        return 'Filter activity by userscope';
    }
-
-    public function alterQuery(QueryBuilder $qb, $data)
-    {
-        if (!in_array('user', $qb->getAllAliases())) {
-            $qb->join('activity.user', 'user');
-        }
-
-        $where = $qb->getDQLPart('where');
-
-        $clause = $qb->expr()->in('user.mainScope', ':userscope');
-
-        if ($where instanceof Andx) {
-            $where->add($clause);
-        } else {
-            $where = $qb->expr()->andX($clause);
-        }
-
-        $qb->add('where', $where);
-        $qb->setParameter('userscope', $data['accepted_userscope']);
-    }
-
-    public  function applyOn(): string
-    {
-         return Declarations::ACTIVITY_ACP;
-    }
-
-}
+}
--- a/src/Bundle/ChillActivityBundle/Export/Filter/ActivityDateFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/ActivityDateFilter.php
@@ -1,14 +1,14 @@
 <?php

-/**
+declare(strict_types=1);
+
+/*
 * Chill is a software for social workers
 *
 * For the full copyright and license information, please view
 * the LICENSE file that was distributed with this source code.
 */

-declare(strict_types=1);
-
 namespace Chill\ActivityBundle\Export\Filter;

 use Chill\ActivityBundle\Export\Declarations;
@@ -33,7 +33,7 @@ class ActivityDateFilter implements FilterInterface
        $this->translator = $translator;
    }

-    public function addRole()
+    public function addRole(): ?string
    {
        return null;
    }
@@ -73,8 +73,7 @@ class ActivityDateFilter implements FilterInterface
            ->add('date_to', ChillDateType::class, [
                'label' => 'Activities before this date',
                'data' => new DateTime(),
-            ])
-        ;
+            ]);

        $builder->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) {
            /** @var \Symfony\Component\Form\FormInterface $filterForm */
--- a/src/Bundle/ChillActivityBundle/Export/Filter/ActivityTypeFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/ActivityTypeFilter.php
@@ -1,64 +1,53 @@
 <?php

-/**
+declare(strict_types=1);
+
+/*
 * Chill is a software for social workers
 *
 * For the full copyright and license information, please view
 * the LICENSE file that was distributed with this source code.
 */

-declare(strict_types=1);
-
 namespace Chill\ActivityBundle\Export\Filter;

 use Chill\ActivityBundle\Entity\ActivityType;
 use Chill\ActivityBundle\Export\Declarations;
-use Chill\ActivityBundle\Repository\ActivityTypeRepository;
-use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
+use Chill\ActivityBundle\Repository\ActivityTypeRepositoryInterface;
 use Chill\MainBundle\Export\ExportElementValidatedInterface;
 use Chill\MainBundle\Export\FilterInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
-use Doctrine\ORM\Query\Expr;
-use Doctrine\ORM\Query\Expr\Join;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\Security\Core\Role\Role;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;

 use function count;

 class ActivityTypeFilter implements ExportElementValidatedInterface, FilterInterface
 {
-    protected ActivityTypeRepository $activityTypeRepository;
+    protected ActivityTypeRepositoryInterface $activityTypeRepository;

    protected TranslatableStringHelperInterface $translatableStringHelper;

    public function __construct(
        TranslatableStringHelperInterface $translatableStringHelper,
-        ActivityTypeRepository $activityTypeRepository
+        ActivityTypeRepositoryInterface $activityTypeRepository
    ) {
        $this->translatableStringHelper = $translatableStringHelper;
        $this->activityTypeRepository = $activityTypeRepository;
    }

-    public function addRole()
+    public function addRole(): ?string
    {
-        return new Role(ActivityStatsVoter::STATS);
+        return null;
    }

    public function alterQuery(QueryBuilder $qb, $data)
    {
-        $where = $qb->getDQLPart('where');
        $clause = $qb->expr()->in('activity.activityType', ':selected_activity_types');

-        if ($where instanceof Expr\Andx) {
-            $where->add($clause);
-        } else {
-            $where = $qb->expr()->andX($clause);
-        }
-
-        $qb->add('where', $where);
+        $qb->andWhere($clause);
        $qb->setParameter('selected_activity_types', $data['types']);
    }

@@ -70,11 +59,26 @@ class ActivityTypeFilter implements ExportElementValidatedInterface, FilterInter
    public function buildForm(FormBuilderInterface $builder)
    {
        $builder->add('types', EntityType::class, [
+            'choices' => $this->activityTypeRepository->findAllActive(),
            'class' => ActivityType::class,
-            'choice_label' => fn (ActivityType $type) => $this->translatableStringHelper->localize($type->getName()),
-            'group_by' => fn (ActivityType $type) => $this->translatableStringHelper->localize($type->getCategory()->getName()),
+            'choice_label' => function (ActivityType $aty) {
+                return
+                    ($aty->hasCategory() ? $this->translatableStringHelper->localize($aty->getCategory()->getName()) . ' > ' : '')
+                    .
+                    $this->translatableStringHelper->localize($aty->getName());
+            },
+            'group_by' => function (ActivityType $type) {
+                if (!$type->hasCategory()) {
+                    return null;
+                }
+
+                return $this->translatableStringHelper->localize($type->getCategory()->getName());
+            },
            'multiple' => true,
            'expanded' => false,
+            'attr' => [
+                'class' => 'select2',
+            ],
        ]);
    }

@@ -104,23 +108,4 @@ class ActivityTypeFilter implements ExportElementValidatedInterface, FilterInter
                ->addViolation();
        }
    }
-
-    /**
-     * Check if a join between Activity and Reason is already defined.
-     *
-     * @param Join[] $joins
-     * @param mixed $alias
-     *
-     * @return bool
-     */
-    private function checkJoinAlreadyDefined(array $joins, $alias)
-    {
-        foreach ($joins as $join) {
-            if ($join->getAlias() === $alias) {
-                return true;
-            }
-        }
-
-        return false;
-    }
 }
--- a/src/Bundle/ChillActivityBundle/Export/Filter/PersonFilters/ActivityReasonFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/PersonFilters/ActivityReasonFilter.php
@@ -1,34 +1,31 @@
 <?php

-/**
+declare(strict_types=1);
+
+/*
 * Chill is a software for social workers
 *
 * For the full copyright and license information, please view
 * the LICENSE file that was distributed with this source code.
 */

-declare(strict_types=1);
-
 namespace Chill\ActivityBundle\Export\Filter\PersonFilters;

 use Chill\ActivityBundle\Entity\ActivityReason;
 use Chill\ActivityBundle\Export\Declarations;
 use Chill\ActivityBundle\Repository\ActivityReasonRepository;
-use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
 use Chill\MainBundle\Export\ExportElementValidatedInterface;
 use Chill\MainBundle\Export\FilterInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use Doctrine\ORM\Query\Expr;
-use Doctrine\ORM\Query\Expr\Join;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\Security\Core\Role\Role;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;

-use function array_key_exists;
 use function count;
+use function in_array;

 class ActivityReasonFilter implements ExportElementValidatedInterface, FilterInterface
 {
@@ -44,9 +41,9 @@ class ActivityReasonFilter implements ExportElementValidatedInterface, FilterInt
        $this->activityReasonRepository = $activityReasonRepository;
    }

-    public function addRole()
+    public function addRole(): ?string
    {
-        return new Role(ActivityStatsVoter::STATS);
+        return null;
    }

    public function alterQuery(QueryBuilder $qb, $data)
@@ -54,20 +51,9 @@ class ActivityReasonFilter implements ExportElementValidatedInterface, FilterInt
        $where = $qb->getDQLPart('where');
        $join = $qb->getDQLPart('join');
        $clause = $qb->expr()->in('reasons', ':selected_activity_reasons');
-        //dump($join);
-        // add a join to reasons only if needed
-        if (
-            (
-                array_key_exists('activity', $join)
-            && !$this->checkJoinAlreadyDefined($join['activity'], 'reasons')
-            )
-            || (!array_key_exists('activity', $join))
-        ) {
-            $qb->add(
-                'join',
-                ['activity' => new Join(Join::INNER_JOIN, 'activity.reasons', 'reasons')],
-                true
-            );
+
+        if (!in_array('actreasons', $qb->getAllAliases(), true)) {
+            $qb->join('activity.reasons', 'actreasons');
        }

        if ($where instanceof Expr\Andx) {
@@ -125,21 +111,4 @@ class ActivityReasonFilter implements ExportElementValidatedInterface, FilterInt
                ->addViolation();
        }
    }
-
-    /**
-     * Check if a join between Activity and Reason is already defined.
-     *
-     * @param Join[] $joins
-     * @param mixed $alias
-     */
-    private function checkJoinAlreadyDefined(array $joins, $alias): bool
-    {
-        foreach ($joins as $join) {
-            if ($join->getAlias() === $alias) {
-                return true;
-            }
-        }
-
-        return false;
-    }
 }
--- a/src/Bundle/ChillActivityBundle/Export/Filter/PersonFilters/PersonHavingActivityBetweenDateFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/PersonFilters/PersonHavingActivityBetweenDateFilter.php
@@ -1,16 +1,17 @@
 <?php

-/**
+declare(strict_types=1);
+
+/*
 * Chill is a software for social workers
 *
 * For the full copyright and license information, please view
 * the LICENSE file that was distributed with this source code.
 */

-declare(strict_types=1);
-
 namespace Chill\ActivityBundle\Export\Filter\PersonFilters;

+use Chill\ActivityBundle\Entity\Activity;
 use Chill\ActivityBundle\Entity\ActivityReason;
 use Chill\ActivityBundle\Repository\ActivityReasonRepository;
 use Chill\MainBundle\Export\ExportElementValidatedInterface;
@@ -52,17 +53,17 @@ class PersonHavingActivityBetweenDateFilter implements ExportElementValidatedInt
        $this->translator = $translator;
    }

-    public function addRole()
+    public function addRole(): ?string
    {
        return null;
    }

    public function alterQuery(QueryBuilder $qb, $data)
    {
-        // create a query for activity
+        // create a subquery for activity
        $sqb = $qb->getEntityManager()->createQueryBuilder();
        $sqb->select('person_person_having_activity.id')
-            ->from('ChillActivityBundle:Activity', 'activity_person_having_activity')
+            ->from(Activity::class, 'activity_person_having_activity')
            ->join('activity_person_having_activity.person', 'person_person_having_activity');

        // add clause between date
@@ -197,7 +198,7 @@ class PersonHavingActivityBetweenDateFilter implements ExportElementValidatedInt

    public function getTitle()
    {
-        return 'Filtered by person having an activity in a period';
+        return 'Filter by person having an activity in a period';
    }

    public function validateForm($data, ExecutionContextInterface $context)
--- a/src/Bundle/ChillActivityBundle/Form/ActivityPresenceType.php
+++ b/src/Bundle/ChillActivityBundle/Form/ActivityPresenceType.php
@@ -1,14 +1,14 @@
 <?php

-/**
+declare(strict_types=1);
+
+/*
 * Chill is a software for social workers
 *
 * For the full copyright and license information, please view
 * the LICENSE file that was distributed with this source code.
 */

-declare(strict_types=1);
-
 namespace Chill\ActivityBundle\Form;

 use Chill\ActivityBundle\Entity\ActivityPresence;
--- a/src/Bundle/ChillActivityBundle/Form/ActivityReasonCategoryType.php
+++ b/src/Bundle/ChillActivityBundle/Form/ActivityReasonCategoryType.php
@@ -1,14 +1,14 @@
 <?php

-/**
+declare(strict_types=1);
+
+/*
 * Chill is a software for social workers
 *
 * For the full copyright and license information, please view
 * the LICENSE file that was distributed with this source code.
 */

-declare(strict_types=1);
-
 namespace Chill\ActivityBundle\Form;

 use Chill\MainBundle\Form\Type\TranslatableStringFormType;
--- a/src/Bundle/ChillActivityBundle/Form/ActivityReasonType.php
+++ b/src/Bundle/ChillActivityBundle/Form/ActivityReasonType.php
@@ -1,14 +1,14 @@
 <?php

-/**
+declare(strict_types=1);
+
+/*
 * Chill is a software for social workers
 *
 * For the full copyright and license information, please view
 * the LICENSE file that was distributed with this source code.
 */

-declare(strict_types=1);
-
 namespace Chill\ActivityBundle\Form;

 use Chill\ActivityBundle\Form\Type\TranslatableActivityReasonCategory;
--- a/src/Bundle/ChillActivityBundle/Form/ActivityType.php
+++ b/src/Bundle/ChillActivityBundle/Form/ActivityType.php
@@ -1,14 +1,14 @@
 <?php

-/**
+declare(strict_types=1);
+
+/*
 * Chill is a software for social workers
 *
 * For the full copyright and license information, please view
 * the LICENSE file that was distributed with this source code.
 */

-declare(strict_types=1);
-
 namespace Chill\ActivityBundle\Form;

 use Chill\ActivityBundle\Entity\Activity;
--- a/src/Bundle/ChillActivityBundle/Form/ActivityTypeCategoryType.php
+++ b/src/Bundle/ChillActivityBundle/Form/ActivityTypeCategoryType.php
@@ -1,14 +1,14 @@
 <?php

-/**
+declare(strict_types=1);
+
+/*
 * Chill is a software for social workers
 *
 * For the full copyright and license information, please view
 * the LICENSE file that was distributed with this source code.
 */

-declare(strict_types=1);
-
 namespace Chill\ActivityBundle\Form;

 use Chill\ActivityBundle\Entity\ActivityTypeCategory;
--- a/src/Bundle/ChillActivityBundle/Form/ActivityTypeType.php
+++ b/src/Bundle/ChillActivityBundle/Form/ActivityTypeType.php
@@ -1,14 +1,14 @@
 <?php

-/**
+declare(strict_types=1);
+
+/*
 * Chill is a software for social workers
 *
 * For the full copyright and license information, please view
 * the LICENSE file that was distributed with this source code.
 */

-declare(strict_types=1);
-
 namespace Chill\ActivityBundle\Form;

 use Chill\ActivityBundle\Entity\ActivityTypeCategory;
--- a/src/Bundle/ChillActivityBundle/Form/Type/ActivityFieldPresence.php
+++ b/src/Bundle/ChillActivityBundle/Form/Type/ActivityFieldPresence.php
@@ -1,14 +1,14 @@
 <?php

-/**
+declare(strict_types=1);
+
+/*
 * Chill is a software for social workers
 *
 * For the full copyright and license information, please view
 * the LICENSE file that was distributed with this source code.
 */

-declare(strict_types=1);
-
 namespace Chill\ActivityBundle\Form\Type;

 use Chill\ActivityBundle\Entity\ActivityType;
--- a/src/Bundle/ChillActivityBundle/Form/Type/TranslatableActivityReason.php
+++ b/src/Bundle/ChillActivityBundle/Form/Type/TranslatableActivityReason.php
@@ -1,14 +1,14 @@
 <?php

-/**
+declare(strict_types=1);
+
+/*
 * Chill is a software for social workers
 *
 * For the full copyright and license information, please view
 * the LICENSE file that was distributed with this source code.
 */

-declare(strict_types=1);
-
 namespace Chill\ActivityBundle\Form\Type;

 use Chill\ActivityBundle\Entity\ActivityReason;
--- a/src/Bundle/ChillActivityBundle/Form/Type/TranslatableActivityReasonCategory.php
+++ b/src/Bundle/ChillActivityBundle/Form/Type/TranslatableActivityReasonCategory.php
@@ -1,14 +1,14 @@
 <?php

-/**
+declare(strict_types=1);
+
+/*
 * Chill is a software for social workers
 *
 * For the full copyright and license information, please view
 * the LICENSE file that was distributed with this source code.
 */

-declare(strict_types=1);
-
 namespace Chill\ActivityBundle\Form\Type;

 use Doctrine\ORM\EntityRepository;
--- a/src/Bundle/ChillActivityBundle/Form/Type/TranslatableActivityType.php
+++ b/src/Bundle/ChillActivityBundle/Form/Type/TranslatableActivityType.php
@@ -1,59 +1,44 @@
 <?php

-/**
+declare(strict_types=1);
+
+/*
 * Chill is a software for social workers
 *
 * For the full copyright and license information, please view
 * the LICENSE file that was distributed with this source code.
 */

-declare(strict_types=1);
-
 namespace Chill\ActivityBundle\Form\Type;

 use Chill\ActivityBundle\Entity\ActivityType;
-use Chill\ActivityBundle\Repository\ActivityTypeRepository;
+use Chill\ActivityBundle\Repository\ActivityTypeRepositoryInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
-use Doctrine\DBAL\Types\Types;
-use Doctrine\ORM\QueryBuilder;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;

 class TranslatableActivityType extends AbstractType
 {
-    protected ActivityTypeRepository $activityTypeRepository;
+    protected ActivityTypeRepositoryInterface $activityTypeRepository;

    protected TranslatableStringHelperInterface $translatableStringHelper;

    public function __construct(
        TranslatableStringHelperInterface $helper,
-        ActivityTypeRepository $activityTypeRepository
+        ActivityTypeRepositoryInterface $activityTypeRepository
    ) {
        $this->translatableStringHelper = $helper;
        $this->activityTypeRepository = $activityTypeRepository;
    }

-    public function buildForm(FormBuilderInterface $builder, array $options)
-    {
-        /** @var QueryBuilder $qb */
-        $qb = $options['query_builder'];
-
-        if (true === $options['active_only']) {
-            $qb->where($qb->expr()->eq('at.active', ':active'));
-            $qb->setParameter('active', true, Types::BOOLEAN);
-        }
-    }
-
    public function configureOptions(OptionsResolver $resolver)
    {
        $resolver->setDefaults(
            [
                'class' => ActivityType::class,
                'active_only' => true,
-                'query_builder' => $this->activityTypeRepository
-                    ->createQueryBuilder('at'),
+                'choices' => $this->activityTypeRepository->findAllActive(),
                'choice_label' => function (ActivityType $type) {
                    return $this->translatableStringHelper->localize($type->getName());
                },
--- a/src/Bundle/ChillActivityBundle/Menu/AccompanyingCourseMenuBuilder.php
+++ b/src/Bundle/ChillActivityBundle/Menu/AccompanyingCourseMenuBuilder.php
@@ -1,14 +1,14 @@
 <?php

-/**
+declare(strict_types=1);
+
+/*
 * Chill is a software for social workers
 *
 * For the full copyright and license information, please view
 * the LICENSE file that was distributed with this source code.
 */

-declare(strict_types=1);
-
 namespace Chill\ActivityBundle\Menu;

 use Chill\ActivityBundle\Security\Authorization\ActivityVoter;
--- a/src/Bundle/ChillActivityBundle/Menu/AdminMenuBuilder.php
+++ b/src/Bundle/ChillActivityBundle/Menu/AdminMenuBuilder.php
@@ -1,14 +1,14 @@
 <?php

-/**
+declare(strict_types=1);
+
+/*
 * Chill is a software for social workers
 *
 * For the full copyright and license information, please view
 * the LICENSE file that was distributed with this source code.
 */

-declare(strict_types=1);
-
 namespace Chill\ActivityBundle\Menu;

 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
--- a/src/Bundle/ChillActivityBundle/Menu/PersonMenuBuilder.php
+++ b/src/Bundle/ChillActivityBundle/Menu/PersonMenuBuilder.php
@@ -1,14 +1,14 @@
 <?php

-/**
+declare(strict_types=1);
+
+/*
 * Chill is a software for social workers
 *
 * For the full copyright and license information, please view
 * the LICENSE file that was distributed with this source code.
 */

-declare(strict_types=1);
-
 namespace Chill\ActivityBundle\Menu;

 use Chill\ActivityBundle\Security\Authorization\ActivityVoter;
--- a/src/Bundle/ChillActivityBundle/Notification/ActivityNotificationHandler.php
+++ b/src/Bundle/ChillActivityBundle/Notification/ActivityNotificationHandler.php
@@ -1,14 +1,14 @@
 <?php

-/**
+declare(strict_types=1);
+
+/*
 * Chill is a software for social workers
 *
 * For the full copyright and license information, please view
 * the LICENSE file that was distributed with this source code.
 */

-declare(strict_types=1);
-
 namespace Chill\ActivityBundle\Notification;

 use Chill\ActivityBundle\Entity\Activity;
--- a/src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepository.php
+++ b/src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepository.php
@@ -1,14 +1,14 @@
 <?php

-/**
+declare(strict_types=1);
+
+/*
 * Chill is a software for social workers
 *
 * For the full copyright and license information, please view
 * the LICENSE file that was distributed with this source code.
 */

-declare(strict_types=1);
-
 namespace Chill\ActivityBundle\Repository;

 use Chill\ActivityBundle\Entity\Activity;
--- a/Show More
+++ b/Show More