Revert "Fixed: [export][activity type filter for acp] fix filter for acp, by activity type"

This reverts commit 5fea61c450.

.changes/v2.6.0.md

@@ -1,21 +0,0 @@
-## v2.6.0 - 2023-09-14
-### Feature
-* ([#133](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/133)) Add locations in Aside Activity. By default, suggest user location, otherwise a select with all locations. 
-* ([#133](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/133)) Adapt Aside Activity exports: display location, filter by location, group by location 
-* Use the CRUD controller for center entity + add the isActive property to be able to mask instances of Center that are no longer in use. 
-### Fixed
-* ([#107](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/107)) reinstate the fusion of duplicate persons 
-* Missing translation in Work Actions exports 
-* Reimplement the mission type filter on tasks, only for instances that have a config parameter indicating true for this. 
-* ([#135](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/135)) Corrects a typing error in 2 filters, which caused an 
-error when trying to reedit a saved export
-
- 
-* ([#136](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/136)) [household] when moving a person to a sharing position to a not-sharing position on the same household on the same date, remove the previous household membership on the same household. This fix duplicate member. 
-* Add missing translation for comment field placeholder in repositionning household editor.
- 
-* Do not send an email to creator twice when adding a comment to a notification 
-* ([#107](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/107)) Fix gestion doublon functionality to work with chill bundles v2 
-### UX
-* Uniformize badge-person in household banner (background, size)
- 

.changes/v2.6.1.md

@@ -1,3 +0,0 @@
-## v2.6.1 - 2023-09-14
-### Fixed
-* Filter out active centers in exports, which uses a different PickCenterType. 

.changes/v2.6.2.md

@@ -1,3 +0,0 @@
-## v2.6.2 - 2023-09-18
-### Fixed
-* Fix doctrine mapping of AbstractTaskPlaceEvent and SingleTaskPlaceEvent: id property moved. 

.changes/v2.6.3.md

@@ -1,4 +0,0 @@
-## v2.6.3 - 2023-09-19
-### Fixed
-* Remove id property from document 
-mappedsuperclass 

.changes/v2.7.0.md

@@ -1,6 +0,0 @@
-## v2.7.0 - 2023-09-27
-### Feature
-* ([#155](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/155)) The regulation list load accompanying periods by exact postal code (address associated with postal code), and not by the content of the postal code (postal code with same code's string) 
-### Fixed
-* ([#142](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/142)) Fix the label of filter ActivityTypeFilter to a more obvious one 
-* ([#140](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/140)) [export] Fix association of filter "filter location by type" which did not appears on "list of activities" 

.changes/v2.8.0.md

@@ -1,19 +0,0 @@
-## v2.8.0 - 2023-10-05
-
-### Feature
-
-* ([#162](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/162)) Reassigning list: when reassigning courses to a new user, the job associated with the course become the one of the new user (if any)
-* Reassining list: the length of the list is increased to 100 courses
-
-### Fixed
-
-* ([#143](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/143)) Fix filter "accompanying course by social action" to avoid duplication in list
-* ([#164](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/164)) View a third party: avoid errors when a contact has a civility
-* ([#163](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/163)) Fix the filters and aggregators on exports "count peoples"
-* ([#143](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/143)) From the database, avoid the creation of location history for same period and at same dates
-
-### Traduction francophone des principaux changements
-
-- Fonctionnalité: Réassigner les parcours en lot: lorsque des parcours sont réassignés "en lot", les parcours sont maintenant associés au métier du nouveau référent;
-- Correction: certaines causes qui créaient des doublons dans les listes ont été corrigées;
-- Correction des associations entre l'export "nombre de personnes" et les filtres et regroupements associés

.changes/v2.9.0.md

@@ -1,23 +0,0 @@
-## v2.9.0 - 2023-10-17
-### Feature
-* ([#147](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/147)) Add history to scopes and to jobs in administrator section. When user job or main scope of user is changed, automaticaly add a new row in history.
-* ([#146](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/146)) Allow closing motives to be identified as 'canceling the accompanying period' + don't take canceled accompanying periods into account
-* [export] add an aggregator for activities: group by job scope's creator aggregator
-* DX: prepare the code for the upgrade to symfony 5.4
-
-### Traductions francophones des principaux changements
-
-- ajout de l'historique des services et métiers pour les utilisateurs. Les exports, filtres et regroupements sont adaptés pour tenir compte du métier et du service
-  de l'utilisateur au moment de l'échange, de sa désignation comme agent traitant de l'échange ou du moment du rendez-vous ([#147](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/147)))
-- modification des motifs de cloture des parcours: ajout d'un chanmp "annule le parcours", qui permet d'indiquer que le motif "annule" le parcours. Les parcours annulés n'apparaissent
-  pas dans les statistiques
-- ajouter d'un regroupement pour les échanges: grouper par métier et service du créateur de l'échange
-
-
-### Possible BC break in configuration
-
-This release remove the use of deprecated package [symfony/templating](https://symfony.com/components/Templating).
-
-If you use this package in your own bundle (usually `src/` directory, or other dependencies), you should add this dependencies in your local composer.json (`composer require symfony/templating`).
-
-But if you do not need this any more, you must ensure that the configuration key `framework.templating` is removed. This is usually located into `config/packages/framework.yaml`. [See here an example](https://gitea.champs-libres.be/Chill-project/chill-skeleton-basic/commit/cc716beaecc239e6a189f3db62ea95f169a37505#diff-df607fe73ff82c569824a7392edf5e760e998efe)

.changes/v2.9.1.md

@@ -1,3 +0,0 @@
-## v2.9.1 - 2023-10-17
-### Fixed
-* Fix the handling of activity form when editing or creating an activity in an accompanying period with multiple centers 

.changes/v2.9.2.md

@@ -1,3 +0,0 @@
-## v2.9.2 - 2023-10-17
-### Fixed
-* Fix possible null values in string's entities 

.env.test

@@ -3,39 +3,3 @@
 # Run tests from root to adapt your own environment
 KERNEL_CLASS='App\Kernel'
 APP_SECRET='$ecretf0rt3st'
-
-ADMIN_PASSWORD=password
-
-LOCALE=fr
-REDIS_URL=redis
-REDIS_PORT=6379
-REDIS_URL=redis://${REDIS_HOST}:${REDIS_PORT}
-
-JWT_SECRET_KEY=%kernel.project_dir%/config/jwt/private.pem
-JWT_PUBLIC_KEY=%kernel.project_dir%/config/jwt/public.pem
-JWT_PASSPHRASE=2a30f6ba26521a2613821da35f28386e
-
-TWILIO_SID=~
-TWILIO_SECRET=~
-DEFAULT_CARRIER_CODE=BE
-
-ADD_ADDRESS_DEFAULT_COUNTRY=BE
-
-ADD_ADDRESS_MAP_CENTER_X=50.8443
-ADD_ADDRESS_MAP_CENTER_Y=4.3523
-ADD_ADDRESS_MAP_CENTER_Z=15
-
-SHORT_MESSAGE_DSN=null://null
-MESSENGER_TRANSPORT_DSN=sync://
-###< symfony/messenger ###
-
-###> doctrine/doctrine-bundle ###
-# Format described at https://www.doctrine-project.org/projects/doctrine-dbal/en/latest/reference/configuration.html#connecting-using-a-url
-# IMPORTANT: You MUST configure your server version, either here or in config/packages/doctrine.yaml
-#
-DATABASE_URL="postgresql://postgres:postgres@db:5432/test?serverVersion=14&charset=utf8"
-###< doctrine/doctrine-bundle ###
-
-ASYNC_UPLOAD_TEMP_URL_KEY=
-ASYNC_UPLOAD_TEMP_URL_BASE_PATH=
-ASYNC_UPLOAD_TEMP_URL_CONTAINER=

.gitlab-ci.yml

@@ -3,7 +3,7 @@
 # Select what we should cache between builds
 cache:
     paths:
-        - /vendor/
+        - tests/app/vendor/
         - .cache
 
 # Bring in any services we need http://docs.gitlab.com/ee/ci/docker/using_docker_images.html#what-is-a-service
@@ -23,10 +23,12 @@ variables:
     # configure database access
     DATABASE_URL: postgresql://postgres:postgres@db:5432/postgres?serverVersion=14&charset=utf8
     # fetch the chill-app using git submodules
-    # GIT_SUBMODULE_STRATEGY: recursive
+    GIT_SUBMODULE_STRATEGY: recursive
     REDIS_HOST: redis
     REDIS_PORT: 6379
     REDIS_URL: redis://redis:6379
+    # change vendor dir to make the app install into tests/apps
+    COMPOSER_VENDOR_DIR: tests/app/vendor
     DEFAULT_CARRIER_CODE: BE
 
 stages:
@@ -48,7 +50,7 @@ build:
         expire_in: 30 min
         paths:
             - bin
-            - vendor/
+            - tests/app/vendor/
 
 code_style:
     stage: Tests
@@ -62,7 +64,7 @@ code_style:
         expire_in: 30 min
         paths:
             - bin
-            - vendor/
+            - tests/app/vendor/
 
 phpstan_tests:
     stage: Tests
@@ -76,14 +78,13 @@ phpstan_tests:
         expire_in: 30 min
         paths:
             - bin
-            - vendor/
+            - tests/app/vendor/
 
 rector_tests:
     stage: Tests
     image: gitea.champs-libres.be/chill-project/chill-skeleton-basic/base-image:php82
     script:
-        - tests/console cache:clear
-        - bin/rector process --dry-run
+        - bin/rector --dry-run
     cache:
         paths:
             - .cache/
@@ -91,7 +92,7 @@ rector_tests:
         expire_in: 30 min
         paths:
             - bin
-            - vendor/
+            - tests/app/vendor/
 
 # psalm_tests:
 #     stage: Tests
@@ -108,17 +109,19 @@ rector_tests:
 unit_tests:
     stage: Tests
     image: gitea.champs-libres.be/chill-project/chill-skeleton-basic/base-image:php82
+    # until we fix testes
+    allow_failure: true
     script:
-        - php tests/console doctrine:migrations:migrate -n --env=test
-        - php tests/console chill:db:sync-views --env=test
-        - php -d memory_limit=2G tests/console cache:clear --env=test
-        - php -d memory_limit=3G tests/console doctrine:fixtures:load -n
-        - php -d memory_limit=4G bin/phpunit --colors=never --exclude-group dbIntensive
+        - php tests/app/bin/console doctrine:migrations:migrate -n
+        - php -d memory_limit=2G tests/app/bin/console cache:clear --env=dev
+        - php -d memory_limit=3G tests/app/bin/console doctrine:fixtures:load -n
+        - php -d memory_limit=2G tests/app/bin/console cache:clear --env=test
+        - php -d memory_limit=4G bin/phpunit --colors=never
     artifacts:
         expire_in: 30 min
         paths:
             - bin
-            - vendor/
+            - tests/app/vendor/
 
 release:
     stage: Deploy

.gitmodules

@@ -1,3 +1,6 @@
 [submodule "_exts/sphinx-php"]
 	path = _exts/sphinx-php
 	url = https://github.com/fabpot/sphinx-php.git
+[submodule "tests/app"]
+	path = tests/app
+	url = https://gitlab.com/Chill-projet/chill-app.git

.php-cs-fixer.dist.php

@@ -91,7 +91,7 @@ $rules = array_merge(
     [
         '@PhpCsFixer' => true,
         '@PhpCsFixer:risky' => false,
-        '@Symfony' => true,
+        '@Symfony' => false,
         '@Symfony:risky' => false,
         'ordered_class_elements' => [
             'order' => [
@@ -111,13 +111,13 @@ $rules = array_merge(
                 'method_private',
             ],
             'sort_algorithm' => 'alpha',
-        ],
+        ]
     ],
     $rules,
     $riskyRules,
     $untilFullSwitchToPhp8,
 );
 
-$rules['header_comment']['header'] = trim(file_get_contents(__DIR__.'/resource/header.txt'));
+$rules['header_comment']['header'] = trim(file_get_contents(__DIR__ . '/resource/header.txt'));
 
 return $config->setRules($rules);

CHANGELOG.md

@@ -6,100 +6,6 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html),
 and is generated by [Changie](https://github.com/miniscruff/changie).
 
 
-## v2.9.2 - 2023-10-17
-### Fixed
-* Fix possible null values in string's entities 
-
-## v2.9.1 - 2023-10-17
-### Fixed
-* Fix the handling of activity form when editing or creating an activity in an accompanying period with multiple centers 
-
-## v2.9.0 - 2023-10-17
-### Feature
-* ([#147](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/147)) Add history to scopes and to jobs in administrator section. When user job or main scope of user is changed, automaticaly add a new row in history.
-* ([#146](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/146)) Allow closing motives to be identified as 'canceling the accompanying period' + don't take canceled accompanying periods into account
-* [export] add an aggregator for activities: group by job scope's creator aggregator
-* DX: prepare the code for the upgrade to symfony 5.4
-
-### Traductions francophones des principaux changements
-
-- ajout de l'historique des services et métiers pour les utilisateurs. Les exports, filtres et regroupements sont adaptés pour tenir compte du métier et du service
-  de l'utilisateur au moment de l'échange, de sa désignation comme agent traitant de l'échange ou du moment du rendez-vous ([#147](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/147)))
-- modification des motifs de cloture des parcours: ajout d'un chanmp "annule le parcours", qui permet d'indiquer que le motif "annule" le parcours. Les parcours annulés n'apparaissent
-  pas dans les statistiques
-- ajouter d'un regroupement pour les échanges: grouper par métier et service du créateur de l'échange
-
-
-### Possible BC break in configuration
-
-This release remove the use of deprecated package [symfony/templating](https://symfony.com/components/Templating).
-
-If you use this package in your own bundle (usually `src/` directory, or other dependencies), you should add this dependencies in your local composer.json (`composer require symfony/templating`).
-
-But if you do not need this any more, you must ensure that the configuration key `framework.templating` is removed. This is usually located into `config/packages/framework.yaml`. [See here an example](https://gitea.champs-libres.be/Chill-project/chill-skeleton-basic/commit/cc716beaecc239e6a189f3db62ea95f169a37505#diff-df607fe73ff82c569824a7392edf5e760e998efe)
-
-## v2.8.0 - 2023-10-05
-
-### Feature
-
-* ([#162](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/162)) Reassigning list: when reassigning courses to a new user, the job associated with the course become the one of the new user (if any)
-* Reassining list: the length of the list is increased to 100 courses
-
-### Fixed
-
-* ([#143](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/143)) Fix filter "accompanying course by social action" to avoid duplication in list
-* ([#164](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/164)) View a third party: avoid errors when a contact has a civility
-* ([#163](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/163)) Fix the filters and aggregators on exports "count peoples"
-* ([#143](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/143)) From the database, avoid the creation of location history for same period and at same dates
-
-### Traduction francophone des principaux changements
-
-- Fonctionnalité: Réassigner les parcours en lot: lorsque des parcours sont réassignés "en lot", les parcours sont maintenant associés au métier du nouveau référent;
-- Correction: certaines causes qui créaient des doublons dans les listes ont été corrigées;
-- Correction des associations entre l'export "nombre de personnes" et les filtres et regroupements associés
-
-## v2.7.0 - 2023-09-27
-### Feature
-* ([#155](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/155)) The regulation list load accompanying periods by exact postal code (address associated with postal code), and not by the content of the postal code (postal code with same code's string) 
-### Fixed
-* ([#142](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/142)) Fix the label of filter ActivityTypeFilter to a more obvious one 
-* ([#140](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/140)) [export] Fix association of filter "filter location by type" which did not appears on "list of activities" 
-
-## v2.6.3 - 2023-09-19
-### Fixed
-* Remove id property from document 
-mappedsuperclass 
-
-## v2.6.2 - 2023-09-18
-### Fixed
-* Fix doctrine mapping of AbstractTaskPlaceEvent and SingleTaskPlaceEvent: id property moved. 
-
-## v2.6.1 - 2023-09-14
-### Fixed
-* Filter out active centers in exports, which uses a different PickCenterType. 
-
-## v2.6.0 - 2023-09-14
-### Feature
-* ([#133](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/133)) Add locations in Aside Activity. By default, suggest user location, otherwise a select with all locations. 
-* ([#133](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/133)) Adapt Aside Activity exports: display location, filter by location, group by location 
-* Use the CRUD controller for center entity + add the isActive property to be able to mask instances of Center that are no longer in use. 
-### Fixed
-* ([#107](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/107)) reinstate the fusion of duplicate persons 
-* Missing translation in Work Actions exports 
-* Reimplement the mission type filter on tasks, only for instances that have a config parameter indicating true for this. 
-* ([#135](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/135)) Corrects a typing error in 2 filters, which caused an 
-error when trying to reedit a saved export
-
- 
-* ([#136](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/136)) [household] when moving a person to a sharing position to a not-sharing position on the same household on the same date, remove the previous household membership on the same household. This fix duplicate member. 
-* Add missing translation for comment field placeholder in repositionning household editor.
- 
-* Do not send an email to creator twice when adding a comment to a notification 
-* ([#107](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/107)) Fix gestion doublon functionality to work with chill bundles v2 
-### UX
-* Uniformize badge-person in household banner (background, size)
- 
-
 ## v2.5.3 - 2023-07-20
 ### Fixed
 * ([#132](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/132)) Rendez-vous documents created would appear in all documents lists of all persons with an accompanying period. Or statements are now added to the where clause to filter out documents that come from unrelated accompanying period/ or person rendez-vous. 

CONTRIBUTING.md

@@ -40,7 +40,7 @@ About once a year, the core team discusses the opportunity to invite new members
 
 ### Core Membership Revocation
 
-A Chill Core membership can be revoked for any of the following reasons:
+A Symfony Core membership can be revoked for any of the following reasons:
 
 - Refusal to follow the rules and policies stated in this document;
 - Lack of activity for the past six months;

composer.json

@@ -8,7 +8,7 @@
         "social worker"
     ],
     "require": {
-        "php": "^8.2",
+        "php": "^7.4|^8.2",
         "ext-json": "*",
         "ext-openssl": "*",
         "ext-redis": "*",
@@ -48,6 +48,7 @@
         "symfony/monolog-bundle": "^3.5",
         "symfony/security-bundle": "^4.4",
         "symfony/serializer": "^5.3",
+        "symfony/templating": "^4.4",
         "symfony/translation": "^4.4",
         "symfony/twig-bundle": "^4.4",
         "symfony/validator": "^4.4",
@@ -75,7 +76,7 @@
         "phpunit/phpunit": ">= 7.5",
         "psalm/plugin-phpunit": "^0.18.4",
         "psalm/plugin-symfony": "^4.0.2",
-        "rector/rector": "^0.17.7",
+        "rector/rector": "^0.15.23",
         "symfony/debug-bundle": "^5.1",
         "symfony/dotenv": "^4.4",
         "symfony/maker-bundle": "^1.20",
@@ -97,6 +98,7 @@
             "Chill\\DocGeneratorBundle\\": "src/Bundle/ChillDocGeneratorBundle",
             "Chill\\DocStoreBundle\\": "src/Bundle/ChillDocStoreBundle",
             "Chill\\EventBundle\\": "src/Bundle/ChillEventBundle",
+            "Chill\\FamilyMemberBundle\\": "src/Bundle/ChillFamilyMemberBundle",
             "Chill\\MainBundle\\": "src/Bundle/ChillMainBundle",
             "Chill\\PersonBundle\\": "src/Bundle/ChillPersonBundle",
             "Chill\\ReportBundle\\": "src/Bundle/ChillReportBundle",
@@ -108,7 +110,7 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "App\\": "tests/",
+            "App\\": "tests/app/src/",
             "Chill\\DocGeneratorBundle\\Tests\\": "src/Bundle/ChillDocGeneratorBundle/tests",
             "Chill\\WopiBundle\\Tests\\": "src/Bundle/ChillDocGeneratorBundle/tests",
             "Chill\\Utils\\Rector\\Tests\\": "utils/rector/tests"
@@ -121,15 +123,16 @@
             "ocramius/package-versions": true,
             "phpro/grumphp": true,
             "phpstan/extension-installer": true,
-            "roave/you-are-using-it-wrong": true,
-            "symfony/runtime": true
+            "roave/you-are-using-it-wrong": true
         },
         "bin-dir": "bin",
         "optimize-autoloader": true,
-        "sort-packages": true
+        "sort-packages": true,
+        "vendor-dir": "tests/app/vendor"
     },
     "scripts": {
         "auto-scripts": {
+            "assets:install %PUBLIC_DIR%": "symfony-cmd",
             "cache:clear": "symfony-cmd"
         }
     }

docs/source/_static/code/exports/CountPerson.php

@@ -54,9 +54,18 @@ class CountPerson implements ExportInterface
     public function getLabels($key, array $values, $data)
     {
         // the Closure which will be executed by the formatter.
-        return fn($value) => match ($value) {
-            '_header' => $this->getTitle(),
-            default => $value,
+        return function ($value) {
+            switch ($value) {
+                case '_header':
+                    // we have to process specifically the '_header' string,
+                    // which will be used by the formatter to show a column title
+                    return $this->getTitle();
+
+                default:
+                    // for all value, we do not process them and return them
+                    // immediatly
+                    return $value;
+            }
         };
     }
 
@@ -85,7 +94,7 @@ class CountPerson implements ExportInterface
     public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
     {
         // we gather all center the user choose.
-        $centers = array_map(static fn ($el) => $el['center'], $acl);
+        $centers = array_map(static fn($el) => $el['center'], $acl);
 
         $qb = $this->entityManager->createQueryBuilder();
 

docs/source/development/FAQ.rst

@@ -1,36 +0,0 @@
-.. Copyright (C)  2014 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".
-
-.. _faq:
-
-
-Frequently asked questions
-####################
-
-Continuous integration
-***********
-
-Pipeline fails, but php-cs-fixer doesn't alert me when running it locally ?
-========================================
-
-It is possible that you run php-cs-fixer on your local instance of chill and no fixes are made.
-Everything seems fine, so you push. However once the pipeline is run in gitlab, you're notified that it failed due to php
-cs errors.
-
-In this case it's likely that you have to update your version of php-cs-fixer.
-php-cs-fixer is installed when building the docker image: https://gitea.champs-libres.be/Chill-project/chill-skeleton-basic/src/branch/main/Dockerfile#L50
-
-Consequently, to update php-cs-fixer we have to update the image by building it again.
-
-For this the following commands can be used,
-
-.. code-block:: php
-
-    docker compose build --pull php
-    # replace existing containers
-    docker compose up -d --force-recreate php

docs/source/development/index.rst

@@ -9,7 +9,7 @@
 Development
 ###########
 
-As Chill relies on the `symfony <http://symfony.com>`_ framework, reading the framework's documentation should answer most of your questions. We are explaining here some tips to work with Chill, and help with things we've encountered.
+As Chill rely on the `symfony <http://symfony.com>`_ framework, reading the framework's documentation should answer most of your questions. We are explaining here some tips to work with Chill, and things we provide to encounter our needs.
 
 .. toctree::
     :maxdepth: 2
@@ -37,7 +37,6 @@ As Chill relies on the `symfony <http://symfony.com>`_ framework, reading the fr
     Cron Jobs <cronjob.rst>
     Info about entities <entity-info.rst>
     Info about database (in French) <database-principles.rst>
-    Developer FAQ <FAQ.rst>
 
 Layout and UI
 **************

docs/source/development/pagination/example.php

@@ -13,7 +13,7 @@ namespace Chill\MyBundle\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 
-class example extends \Symfony\Bundle\FrameworkBundle\Controller\AbstractController
+class example extends Controller
 {
     public function yourAction()
     {

docs/source/development/useful-snippets/controller-secured-for-person.php

@@ -16,7 +16,7 @@ use Chill\PersonBundle\Security\Authorization\PersonVoter;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Symfony\Component\Security\Core\Role\Role;
 
-class ConsultationController extends \Symfony\Bundle\FrameworkBundle\Controller\AbstractController
+class ConsultationController extends Controller
 {
     /**
      * @param int $id personId
@@ -43,7 +43,7 @@ class ConsultationController extends \Symfony\Bundle\FrameworkBundle\Controller\
 
         $circles = $authorizationHelper->getReachableCircles(
             $this->getUser(),
-            ConsultationVoter::SEE,
+            new Role(ConsultationVoter::SEE),
             $person->getCenter()
         );
 

docs/source/development/user-interface/widgets/ChillMainConfiguration.php

@@ -23,18 +23,25 @@ class ChillMainConfiguration implements ConfigurationInterface
 {
     use AddWidgetConfigurationTrait;
 
+    /**
+     * @var ContainerBuilder
+     */
+    private $containerBuilder;
+
     public function __construct(
         array $widgetFactories,
-        private readonly ContainerBuilder $containerBuilder
+        ContainerBuilder $containerBuilder
     ) {
         // we register here widget factories (see below)
         $this->setWidgetFactories($widgetFactories);
+        // we will need the container builder later...
+        $this->containerBuilder = $containerBuilder;
     }
 
     public function getConfigTreeBuilder()
     {
-        $treeBuilder = new TreeBuilder('chill_main');
-        $rootNode = $treeBuilder->getRootNode();
+        $treeBuilder = new TreeBuilder();
+        $rootNode = $treeBuilder->root('chill_main');
 
         $rootNode
             ->children()
@@ -49,7 +56,7 @@ class ChillMainConfiguration implements ConfigurationInterface
             ->end() // end of widgets
             ->end() // end of root/children
             ->end() // end of root
-        ;
+;
 
         return $treeBuilder;
     }

docs/source/development/user-interface/widgets/ChillPersonAddAPersonWidget.php

@@ -87,7 +87,7 @@ class ChillPersonAddAPersonWidget implements WidgetInterface
         // show only the person from the authorized centers
         $and = $qb->expr()->andX();
         $centers = $this->authorizationHelper
-            ->getReachableCenters($this->getUser(), PersonVoter::SEE);
+            ->getReachableCenters($this->getUser(), new Role(PersonVoter::SEE));
         $and->add($qb->expr()->in('person.center', ':centers'));
         $qb->setParameter('centers', $centers);
 

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

exports_alias_conventions.md

@@ -21,6 +21,7 @@ These are alias conventions :
 |                                         | AccompanyingPeriodInfo::class           | not existing (using custom WITH clause)    | acpinfo                                |
 | 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                                 |

package.json

@@ -31,9 +31,7 @@
     "typescript": "^4.7.2",
     "vue-loader": "^17.0.0",
     "webpack": "^5.75.0",
-    "webpack-cli": "^5.0.1",
-      "chart.js": "^4.2.1",
-      "vue-chartjs": "^5.2.0"
+    "webpack-cli": "^5.0.1"
   },
   "dependencies": {
     "@fullcalendar/core": "^6.1.4",

phpunit.xml.dist

@@ -2,51 +2,26 @@
 
 <!-- https://phpunit.readthedocs.io/en/latest/configuration.html -->
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="tests/app/vendor/phpunit/phpunit/phpunit.xsd"
          backupGlobals="false"
          colors="true"
-         bootstrap="tests/bootstrap.php"
+         bootstrap="tests/app/tests/bootstrap.php"
 >
     <php>
         <ini name="error_reporting" value="-1" />
         <server name="APP_ENV" value="test" force="true" />
-        <env name="SYMFONY_DEPRECATIONS_HELPER" value="max[direct]=0&amp;max[indirect]=999999" />
+        <env name="SYMFONY_DEPRECATIONS_HELPER" value="weak" />
         <server name="SHELL_VERBOSITY" value="-1" />
-        <env name="KERNEL_CLASS" value="\App\Kernel" />
     </php>
 
     <testsuites>
-        <!--
-        <testsuite name="ActivityBundle">
-            <directory suffix="Test.php">src/Bundle/ChillActivityBundle/Tests/</directory>
-        </testsuite>
-        -->
-        <testsuite name="AsideActivityBundle">
-            <directory suffix="Test.php">src/Bundle/ChillAsideActivityBundle/src/Tests/</directory>
-        </testsuite>
-        <testsuite name="BudgetBundle">
-            <directory suffix="Test.php">src/Bundle/ChillBudgetBundle/Tests/</directory>
-        </testsuite>
-        <testsuite name="CalendarBundle">
-            <directory suffix="Test.php">src/Bundle/ChillCalendarBundle/Tests/</directory>
-        </testsuite>
-        <!-- Missing CustomFieldBundle -->
-        <testsuite name="DocGeneratorBundle">
-            <directory suffix="Test.php">src/Bundle/ChillDocGeneratorBundle/tests/</directory>
-        </testsuite>
-        <testsuite name="DocStoreBundle">
-            <directory suffix="Test.php">src/Bundle/ChillDocStoreBundle/Tests/</directory>
-        </testsuite>
-        <!--
-        <testsuite name="EventBundle">
-            <directory suffix="Test.php">src/Bundle/ChillEventBundle/tests/</directory>
-        </testsuite>
-        -->
        <testsuite name="MainBundle">
          <directory suffix="Test.php">src/Bundle/ChillMainBundle/Tests/</directory>
        </testsuite>
        <testsuite name="PersonBundle">
          <directory suffix="Test.php">src/Bundle/ChillPersonBundle/Tests/</directory>
+         <!-- test for export will be runned later -->
+         <exclude>src/Bundle/ChillPersonBundle/Tests/Export/*</exclude>
          <!-- we are rewriting accompanying periods... Work in progress -->
          <exclude>src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingPeriodControllerTest.php</exclude>
          <!-- we are rewriting address, Work in progress -->
@@ -56,18 +31,14 @@
          <!-- temporarily removed, the time to find a fix -->
          <exclude>src/Bundle/ChillPersonBundle/Tests/Controller/PersonDuplicateControllerViewTest.php</exclude>
         </testsuite>
-        <!--
-        <testsuite name="ReportBundle">
-            <directory suffix="Test.php">src/Bundle/ChillReportBundle/Tests/</directory>
+        <testsuite name="AsideActivityBundle">
+          <directory suffix="Test.php">src/Bundle/ChillAsideActivityBundle/src/Tests/</directory>
         </testsuite>
-        -->
-        <!--
-        <testsuite name="TaskBundle">
-            <directory suffix="Test.php">src/Bundle/ChillTaskBundle/Tests</directory>
+        <testsuite name="CalendarBundle">
+            <directory suffix="Test.php">src/Bundle/ChillCalendarBundle/Tests/</directory>
         </testsuite>
-        -->
-        <testsuite name="ThirdPartyBundle">
-            <directory suffix="Test.php">src/Bundle/ChillThirdPartyBundle/Tests</directory>
+        <testsuite name="DocGeneratorBundle">
+            <directory suffix="Test.php">src/Bundle/ChillDocGeneratorBundle/tests/</directory>
         </testsuite>
         <testsuite name="WopiBundle">
             <directory suffix="Test.php">src/Bundle/ChillWopiBundle/tests/</directory>

rector.php

@@ -2,13 +2,6 @@
 
 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.
- */
-
 use Rector\CodeQuality\Rector\Class_\InlineConstructorDefaultToPropertyRector;
 use Rector\Config\RectorConfig;
 use Rector\Set\ValueObject\LevelSetList;
@@ -19,9 +12,6 @@ return static function (RectorConfig $rectorConfig): void {
         __DIR__ . '/src',
     ]);
 
-    $rectorConfig->symfonyContainerXml(__DIR__ . '/var/cache/dev/testsApp_KernelDevDebugContainer.xml');
-    $rectorConfig->symfonyContainerPhp(__DIR__ . '/tests/symfony-container.php');
-
     //$rectorConfig->cacheClass(\Rector\Caching\ValueObject\Storage\FileCacheStorage::class);
     //$rectorConfig->cacheDirectory(__DIR__ . '/.cache/rector');
 
@@ -31,25 +21,43 @@ return static function (RectorConfig $rectorConfig): void {
 
     //define sets of rules
     $rectorConfig->sets([
-        LevelSetList::UP_TO_PHP_82,
-        \Rector\Symfony\Set\SymfonyLevelSetList::UP_TO_SYMFONY_44,
-        \Rector\Doctrine\Set\DoctrineSetList::DOCTRINE_CODE_QUALITY,
-        \Rector\PHPUnit\Set\PHPUnitLevelSetList::UP_TO_PHPUNIT_90,
+        LevelSetList::UP_TO_PHP_74
     ]);
 
-    // some routes are added twice if it remains activated
-    // $rectorConfig->rule(\Rector\Symfony\Configs\Rector\ClassMethod\AddRouteAnnotationRector::class);
-
     // chill rules
-    //$rectorConfig->rule(\Chill\Utils\Rector\Rector\ChillBundleAddFormDefaultDataOnExportFilterAggregatorRector::class);
+    $rectorConfig->rule(\Chill\Utils\Rector\Rector\ChillBundleAddFormDefaultDataOnExportFilterAggregatorRector::class);
 
     // skip some path...
     $rectorConfig->skip([
+        // make rector stuck for some files
+        \Rector\Php56\Rector\FunctionLike\AddDefaultValueForUndefinedVariableRector::class,
+
         // we need to discuss this: are we going to have FALSE in tests instead of an error ?
         \Rector\Php71\Rector\FuncCall\CountOnNullRector::class,
 
-        // we must adapt service definition
-        \Rector\Symfony\Symfony28\Rector\MethodCall\GetToConstructorInjectionRector::class,
-        \Rector\Symfony\Symfony34\Rector\Closure\ContainerGetNameToTypeInTestsRector::class,
+        // must merge MR500 and review a typing of "ArrayCollection" in entities
+        \Rector\TypeDeclaration\Rector\Property\TypedPropertyFromAssignsRector::class,
+
+        // remove all PHP80 rules, in order to activate them one by one
+        \Rector\Php80\Rector\ClassMethod\AddParamBasedOnParentClassMethodRector::class,
+        \Rector\Php80\Rector\Class_\AnnotationToAttributeRector::class,
+        \Rector\Php80\Rector\Switch_\ChangeSwitchToMatchRector::class,
+        \Rector\Php80\Rector\FuncCall\ClassOnObjectRector::class,
+        \Rector\Php80\Rector\ClassConstFetch\ClassOnThisVariableObjectRector::class,
+        \Rector\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector::class,
+        \Rector\Php80\Rector\Class_\DoctrineAnnotationClassToAttributeRector::class,
+        \Rector\Php80\Rector\ClassMethod\FinalPrivateToPrivateVisibilityRector::class,
+        \Rector\Php80\Rector\Ternary\GetDebugTypeRector::class,
+        \Rector\Php80\Rector\FunctionLike\MixedTypeRector::class,
+        \Rector\Php80\Rector\Property\NestedAnnotationToAttributeRector::class,
+        \Rector\Php80\Rector\FuncCall\Php8ResourceReturnToObjectRector::class,
+        \Rector\Php80\Rector\Catch_\RemoveUnusedVariableInCatchRector::class,
+        \Rector\Php80\Rector\ClassMethod\SetStateToStaticRector::class,
+        \Rector\Php80\Rector\NotIdentical\StrContainsRector::class,
+        \Rector\Php80\Rector\Identical\StrEndsWithRector::class,
+        \Rector\Php80\Rector\Identical\StrStartsWithRector::class,
+        \Rector\Php80\Rector\Class_\StringableForToStringRector::class,
+        \Rector\Php80\Rector\FuncCall\TokenGetAllToObjectRector::class,
+        \Rector\Php80\Rector\FunctionLike\UnionTypesRector::class
     ]);
 };

src/Bundle/ChillActivityBundle/ChillActivityBundle.php

@@ -13,4 +13,6 @@ namespace Chill\ActivityBundle;
 
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
-class ChillActivityBundle extends Bundle {}
+class ChillActivityBundle extends Bundle
+{
+}

src/Bundle/ChillActivityBundle/Controller/ActivityController.php

@@ -18,6 +18,7 @@ use Chill\ActivityBundle\Repository\ActivityACLAwareRepositoryInterface;
 use Chill\ActivityBundle\Repository\ActivityRepository;
 use Chill\ActivityBundle\Repository\ActivityTypeCategoryRepository;
 use Chill\ActivityBundle\Repository\ActivityTypeRepositoryInterface;
+use Chill\ActivityBundle\Repository\ActivityUserJobRepository;
 use Chill\ActivityBundle\Security\Authorization\ActivityVoter;
 use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable;
 use Chill\MainBundle\Entity\UserJob;
@@ -34,8 +35,11 @@ use Chill\PersonBundle\Privacy\PrivacyEvent;
 use Chill\PersonBundle\Repository\AccompanyingPeriodRepository;
 use Chill\PersonBundle\Repository\PersonRepository;
 use Chill\ThirdPartyBundle\Repository\ThirdPartyRepository;
+use DateTime;
 use Doctrine\ORM\EntityManagerInterface;
+use InvalidArgumentException;
 use Psr\Log\LoggerInterface;
+use RuntimeException;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\Form\Extension\Core\Type\HiddenType;
@@ -45,6 +49,7 @@ use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Serializer\SerializerInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
+use function array_key_exists;
 
 final class ActivityController extends AbstractController
 {
@@ -67,14 +72,15 @@ final class ActivityController extends AbstractController
         private readonly FilterOrderHelperFactoryInterface $filterOrderHelperFactory,
         private readonly TranslatableStringHelperInterface $translatableStringHelper,
         private readonly PaginatorFactory $paginatorFactory,
-    ) {}
+    ) {
+    }
 
     /**
      * Deletes a Activity entity.
      *
-     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/activity/{id}/delete", name="chill_activity_activity_delete", methods={"GET", "POST", "DELETE"})
+     * @param mixed $id
      */
-    public function deleteAction(Request $request, mixed $id)
+    public function deleteAction(Request $request, $id)
     {
         $view = null;
 
@@ -87,10 +93,10 @@ final class ActivityController extends AbstractController
         }
 
         if ($activity->getAccompanyingPeriod() instanceof AccompanyingPeriod) {
-            $view = '@ChillActivity/Activity/confirm_deleteAccompanyingCourse.html.twig';
+            $view = 'ChillActivityBundle:Activity:confirm_deleteAccompanyingCourse.html.twig';
             $accompanyingPeriod = $activity->getAccompanyingPeriod();
         } else {
-            $view = '@ChillActivity/Activity/confirm_deletePerson.html.twig';
+            $view = 'ChillActivityBundle:Activity:confirm_deletePerson.html.twig';
         }
 
         // TODO
@@ -98,7 +104,7 @@ final class ActivityController extends AbstractController
 
         $form = $this->createDeleteForm($activity->getId(), $person, $accompanyingPeriod);
 
-        if (Request::METHOD_DELETE === $request->getMethod()) {
+        if ($request->getMethod() === Request::METHOD_DELETE) {
             $form->handleRequest($request);
 
             if ($form->isValid()) {
@@ -131,6 +137,10 @@ final class ActivityController extends AbstractController
             }
         }
 
+        if (null === $view) {
+            throw $this->createNotFoundException('Template not found');
+        }
+
         return $this->render($view, [
             'activity' => $activity,
             'delete_form' => $form->createView(),
@@ -141,8 +151,6 @@ final class ActivityController extends AbstractController
 
     /**
      * Displays a form to edit an existing Activity entity.
-     *
-     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/activity/{id}/edit", name="chill_activity_activity_edit", methods={"GET", "POST", "PUT"})
      */
     public function editAction(int $id, Request $request): Response
     {
@@ -158,10 +166,10 @@ final class ActivityController extends AbstractController
         $person = $entity->getPerson();
 
         if ($entity->getAccompanyingPeriod() instanceof AccompanyingPeriod) {
-            $view = '@ChillActivity/Activity/editAccompanyingCourse.html.twig';
+            $view = 'ChillActivityBundle:Activity:editAccompanyingCourse.html.twig';
             $accompanyingPeriod = $entity->getAccompanyingPeriod();
         } else {
-            $view = '@ChillActivity/Activity/editPerson.html.twig';
+            $view = 'ChillActivityBundle:Activity:editPerson.html.twig';
         }
         // TODO
         // $this->denyAccessUnlessGranted('CHILL_ACTIVITY_UPDATE', $entity);
@@ -222,6 +230,10 @@ final class ActivityController extends AbstractController
         $this->eventDispatcher->dispatch(PrivacyEvent::PERSON_PRIVACY_EVENT, $event);
          */
 
+        if (null === $view) {
+            throw $this->createNotFoundException('Template not found');
+        }
+
         $activity_array = $this->serializer->normalize($entity, 'json', ['groups' => 'read']);
 
         return $this->render($view, [
@@ -236,8 +248,6 @@ final class ActivityController extends AbstractController
 
     /**
      * Lists all Activity entities.
-     *
-     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/activity/", name="chill_activity_activity_list")
      */
     public function listAction(Request $request): Response
     {
@@ -273,9 +283,9 @@ final class ActivityController extends AbstractController
                 'element_class' => Activity::class,
                 'action' => 'list',
             ]);
-            $this->eventDispatcher->dispatch($event, PrivacyEvent::PERSON_PRIVACY_EVENT);
+            $this->eventDispatcher->dispatch(PrivacyEvent::PERSON_PRIVACY_EVENT, $event);
 
-            $view = '@ChillActivity/Activity/listPerson.html.twig';
+            $view = 'ChillActivityBundle:Activity:listPerson.html.twig';
         } elseif ($accompanyingPeriod instanceof AccompanyingPeriod) {
             $this->denyAccessUnlessGranted(ActivityVoter::SEE, $accompanyingPeriod);
 
@@ -291,9 +301,9 @@ final class ActivityController extends AbstractController
                     $filterArgs
                 );
 
-            $view = '@ChillActivity/Activity/listAccompanyingCourse.html.twig';
+            $view = 'ChillActivityBundle:Activity:listAccompanyingCourse.html.twig';
         } else {
-            throw new \LogicException('Unsupported');
+            throw new \LogicException("Unsupported");
         }
 
         return $this->render(
@@ -310,6 +320,7 @@ final class ActivityController extends AbstractController
 
     private function buildFilterOrder(AccompanyingPeriod|Person $associated): FilterOrderHelper
     {
+
         $filterBuilder = $this->filterOrderHelperFactory->create(self::class);
         $types = $this->activityACLAwareRepository->findActivityTypeByAssociated($associated);
         $jobs = $this->activityACLAwareRepository->findUserJobByAssociated($associated);
@@ -323,28 +334,25 @@ final class ActivityController extends AbstractController
                 ->addEntityChoice('activity_types', 'activity_filter.Types', \Chill\ActivityBundle\Entity\ActivityType::class, $types, [
                     'choice_label' => function (\Chill\ActivityBundle\Entity\ActivityType $activityType) {
                         $text = match ($activityType->hasCategory()) {
-                            true => $this->translatableStringHelper->localize($activityType->getCategory()->getName()).' > ',
+                            true => $this->translatableStringHelper->localize($activityType->getCategory()->getName()) . ' > ',
                             false => '',
                         };
 
-                        return $text.$this->translatableStringHelper->localize($activityType->getName());
-                    },
+                        return $text . $this->translatableStringHelper->localize($activityType->getName());
+                    }
                 ]);
         }
 
         if (1 < count($jobs)) {
             $filterBuilder
                 ->addEntityChoice('jobs', 'activity_filter.Jobs', UserJob::class, $jobs, [
-                    'choice_label' => fn (UserJob $u) => $this->translatableStringHelper->localize($u->getLabel()),
+                    'choice_label' => fn (UserJob $u) => $this->translatableStringHelper->localize($u->getLabel())
                 ]);
         }
 
         return $filterBuilder->build();
     }
 
-    /**
-     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/activity/new", name="chill_activity_activity_new", methods={"POST", "GET"})
-     */
     public function newAction(Request $request): Response
     {
         $view = null;
@@ -352,16 +360,16 @@ final class ActivityController extends AbstractController
         [$person, $accompanyingPeriod] = $this->getEntity($request);
 
         if ($accompanyingPeriod instanceof AccompanyingPeriod) {
-            $view = '@ChillActivity/Activity/newAccompanyingCourse.html.twig';
+            $view = 'ChillActivityBundle:Activity:newAccompanyingCourse.html.twig';
         } elseif ($person instanceof Person) {
-            $view = '@ChillActivity/Activity/newPerson.html.twig';
+            $view = 'ChillActivityBundle:Activity:newPerson.html.twig';
         }
 
         $activityType_id = $request->get('activityType_id', 0);
         $activityType = $this->activityTypeRepository->find($activityType_id);
 
         if (isset($activityType) && !$activityType->isActive()) {
-            throw new \InvalidArgumentException('Activity type must be active');
+            throw new InvalidArgumentException('Activity type must be active');
         }
 
         $activityData = null;
@@ -396,45 +404,45 @@ final class ActivityController extends AbstractController
         }
 
         $entity->setActivityType($activityType);
-        $entity->setDate(new \DateTime('now'));
+        $entity->setDate(new DateTime('now'));
 
         if ($request->query->has('activityData')) {
             $activityData = $request->query->get('activityData');
 
-            if (\array_key_exists('durationTime', $activityData) && $activityType->getDurationTimeVisible() > 0) {
+            if (array_key_exists('durationTime', $activityData) && $activityType->getDurationTimeVisible() > 0) {
                 $durationTimeInMinutes = $activityData['durationTime'];
                 $hours = floor($durationTimeInMinutes / 60);
                 $minutes = $durationTimeInMinutes % 60;
-                $duration = \DateTime::createFromFormat('H:i', $hours.':'.$minutes);
+                $duration = DateTime::createFromFormat('H:i', $hours . ':' . $minutes);
 
                 if ($duration) {
                     $entity->setDurationTime($duration);
                 }
             }
 
-            if (\array_key_exists('date', $activityData)) {
-                $date = \DateTime::createFromFormat('Y-m-d', $activityData['date']);
+            if (array_key_exists('date', $activityData)) {
+                $date = DateTime::createFromFormat('Y-m-d', $activityData['date']);
 
                 if ($date) {
                     $entity->setDate($date);
                 }
             }
 
-            if (\array_key_exists('personsId', $activityData) && $activityType->getPersonsVisible() > 0) {
+            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) && $activityType->getThirdPartiesVisible() > 0) {
+            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('usersId', $activityData) && $activityType->getUsersVisible() > 0) {
+            if (array_key_exists('usersId', $activityData) && $activityType->getUsersVisible() > 0) {
                 foreach ($activityData['usersId'] as $userId) {
                     $user = $this->userRepository->find($userId);
 
@@ -444,16 +452,16 @@ final class ActivityController extends AbstractController
                 }
             }
 
-            if (\array_key_exists('location', $activityData) && $activityType->getLocationVisible() > 0) {
+            if (array_key_exists('location', $activityData) && $activityType->getLocationVisible() > 0) {
                 $location = $this->locationRepository->find($activityData['location']);
                 $entity->setLocation($location);
             }
 
-            if (\array_key_exists('comment', $activityData) && $activityType->getCommentVisible() > 0) {
+            if (array_key_exists('comment', $activityData) && $activityType->getCommentVisible() > 0) {
                 $comment = new CommentEmbeddable();
                 $comment->setComment($activityData['comment']);
                 $comment->setUserId($this->getUser()->getid());
-                $comment->setDate(new \DateTime('now'));
+                $comment->setDate(new DateTime('now'));
                 $entity->setComment($comment);
             }
         }
@@ -525,9 +533,6 @@ final class ActivityController extends AbstractController
         ]);
     }
 
-    /**
-     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/activity/select-type", name="chill_activity_activity_select_type")
-     */
     public function selectTypeAction(Request $request): Response
     {
         $view = null;
@@ -535,9 +540,9 @@ final class ActivityController extends AbstractController
         [$person, $accompanyingPeriod] = $this->getEntity($request);
 
         if ($accompanyingPeriod instanceof AccompanyingPeriod) {
-            $view = '@ChillActivity/Activity/selectTypeAccompanyingCourse.html.twig';
+            $view = 'ChillActivityBundle:Activity:selectTypeAccompanyingCourse.html.twig';
         } elseif ($person instanceof Person) {
-            $view = '@ChillActivity/Activity/selectTypePerson.html.twig';
+            $view = 'ChillActivityBundle:Activity:selectTypePerson.html.twig';
         }
 
         $data = [];
@@ -572,9 +577,6 @@ final class ActivityController extends AbstractController
         ]);
     }
 
-    /**
-     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/activity/{id}/show", name="chill_activity_activity_show")
-     */
     public function showAction(Request $request, int $id): Response
     {
         $entity = $this->activityRepository->find($id);
@@ -587,11 +589,11 @@ final class ActivityController extends AbstractController
         $person = $entity->getPerson();
 
         if ($accompanyingPeriod instanceof AccompanyingPeriod) {
-            $view = '@ChillActivity/Activity/showAccompanyingCourse.html.twig';
+            $view = 'ChillActivityBundle:Activity:showAccompanyingCourse.html.twig';
         } elseif ($person instanceof Person) {
-            $view = '@ChillActivity/Activity/showPerson.html.twig';
+            $view = 'ChillActivityBundle:Activity:showPerson.html.twig';
         } else {
-            throw new \RuntimeException('the activity should be linked with a period or person');
+            throw new RuntimeException('the activity should be linked with a period or person');
         }
 
         if (null !== $accompanyingPeriod) {
@@ -614,6 +616,10 @@ final class ActivityController extends AbstractController
         $this->eventDispatcher->dispatch(PrivacyEvent::PERSON_PRIVACY_EVENT, $event);
          */
 
+        if (null === $view) {
+            throw $this->createNotFoundException('Template not found');
+        }
+
         return $this->render($view, [
             'person' => $person,
             'accompanyingCourse' => $accompanyingPeriod,

src/Bundle/ChillActivityBundle/Controller/ActivityReasonCategoryController.php

@@ -24,8 +24,6 @@ class ActivityReasonCategoryController extends AbstractController
 {
     /**
      * Creates a new ActivityReasonCategory entity.
-     *
-     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/activityreasoncategory/create", name="chill_activity_activityreasoncategory_create", methods={"POST"})
      */
     public function createAction(Request $request)
     {
@@ -33,15 +31,15 @@ class ActivityReasonCategoryController extends AbstractController
         $form = $this->createCreateForm($entity);
         $form->handleRequest($request);
 
-        if ($form->isSubmitted() && $form->isValid()) {
+        if ($form->isValid()) {
             $em = $this->getDoctrine()->getManager();
             $em->persist($entity);
             $em->flush();
 
-            return $this->redirectToRoute('chill_activity_activityreasoncategory_show', ['id' => $entity->getId()]);
+            return $this->redirect($this->generateUrl('chill_activity_activityreasoncategory_show', ['id' => $entity->getId()]));
         }
 
-        return $this->render('@ChillActivity/ActivityReasonCategory/new.html.twig', [
+        return $this->render('ChillActivityBundle:ActivityReasonCategory:new.html.twig', [
             'entity' => $entity,
             'form' => $form->createView(),
         ]);
@@ -50,9 +48,9 @@ class ActivityReasonCategoryController extends AbstractController
     /**
      * Displays a form to edit an existing ActivityReasonCategory entity.
      *
-     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/activityreasoncategory/{id}/edit", name="chill_activity_activityreasoncategory_edit")
+     * @param mixed $id
      */
-    public function editAction(mixed $id)
+    public function editAction($id)
     {
         $em = $this->getDoctrine()->getManager();
 
@@ -64,7 +62,7 @@ class ActivityReasonCategoryController extends AbstractController
 
         $editForm = $this->createEditForm($entity);
 
-        return $this->render('@ChillActivity/ActivityReasonCategory/edit.html.twig', [
+        return $this->render('ChillActivityBundle:ActivityReasonCategory:edit.html.twig', [
             'entity' => $entity,
             'edit_form' => $editForm->createView(),
         ]);
@@ -72,8 +70,6 @@ class ActivityReasonCategoryController extends AbstractController
 
     /**
      * Lists all ActivityReasonCategory entities.
-     *
-     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/activityreasoncategory/", name="chill_activity_activityreasoncategory")
      */
     public function indexAction()
     {
@@ -81,22 +77,20 @@ class ActivityReasonCategoryController extends AbstractController
 
         $entities = $em->getRepository(\Chill\ActivityBundle\Entity\ActivityReasonCategory::class)->findAll();
 
-        return $this->render('@ChillActivity/ActivityReasonCategory/index.html.twig', [
+        return $this->render('ChillActivityBundle:ActivityReasonCategory:index.html.twig', [
             'entities' => $entities,
         ]);
     }
 
     /**
      * Displays a form to create a new ActivityReasonCategory entity.
-     *
-     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/activityreasoncategory/new", name="chill_activity_activityreasoncategory_new")
      */
     public function newAction()
     {
         $entity = new ActivityReasonCategory();
         $form = $this->createCreateForm($entity);
 
-        return $this->render('@ChillActivity/ActivityReasonCategory/new.html.twig', [
+        return $this->render('ChillActivityBundle:ActivityReasonCategory:new.html.twig', [
             'entity' => $entity,
             'form' => $form->createView(),
         ]);
@@ -105,9 +99,9 @@ class ActivityReasonCategoryController extends AbstractController
     /**
      * Finds and displays a ActivityReasonCategory entity.
      *
-     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/activityreasoncategory/{id}/show", name="chill_activity_activityreasoncategory_show")
+     * @param mixed $id
      */
-    public function showAction(mixed $id)
+    public function showAction($id)
     {
         $em = $this->getDoctrine()->getManager();
 
@@ -117,7 +111,7 @@ class ActivityReasonCategoryController extends AbstractController
             throw $this->createNotFoundException('Unable to find ActivityReasonCategory entity.');
         }
 
-        return $this->render('@ChillActivity/ActivityReasonCategory/show.html.twig', [
+        return $this->render('ChillActivityBundle:ActivityReasonCategory:show.html.twig', [
             'entity' => $entity,
         ]);
     }
@@ -125,9 +119,9 @@ class ActivityReasonCategoryController extends AbstractController
     /**
      * Edits an existing ActivityReasonCategory entity.
      *
-     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/activityreasoncategory/{id}/update", name="chill_activity_activityreasoncategory_update", methods={"POST", "PUT"})
+     * @param mixed $id
      */
-    public function updateAction(Request $request, mixed $id)
+    public function updateAction(Request $request, $id)
     {
         $em = $this->getDoctrine()->getManager();
 
@@ -140,13 +134,13 @@ class ActivityReasonCategoryController extends AbstractController
         $editForm = $this->createEditForm($entity);
         $editForm->handleRequest($request);
 
-        if ($editForm->isSubmitted() && $editForm->isValid()) {
+        if ($editForm->isValid()) {
             $em->flush();
 
-            return $this->redirectToRoute('chill_activity_activityreasoncategory_edit', ['id' => $id]);
+            return $this->redirect($this->generateUrl('chill_activity_activityreasoncategory_edit', ['id' => $id]));
         }
 
-        return $this->render('@ChillActivity/ActivityReasonCategory/edit.html.twig', [
+        return $this->render('ChillActivityBundle:ActivityReasonCategory:edit.html.twig', [
             'entity' => $entity,
             'edit_form' => $editForm->createView(),
         ]);

src/Bundle/ChillActivityBundle/Controller/ActivityReasonController.php

@@ -24,12 +24,15 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
  */
 class ActivityReasonController extends AbstractController
 {
-    public function __construct(private readonly ActivityReasonRepository $activityReasonRepository) {}
+    private ActivityReasonRepository $activityReasonRepository;
+
+    public function __construct(ActivityReasonRepository $activityReasonRepository)
+    {
+        $this->activityReasonRepository = $activityReasonRepository;
+    }
 
     /**
      * Creates a new ActivityReason entity.
-     *
-     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/activityreason/create", name="chill_activity_activityreason_create", methods={"POST"})
      */
     public function createAction(Request $request)
     {
@@ -37,15 +40,15 @@ class ActivityReasonController extends AbstractController
         $form = $this->createCreateForm($entity);
         $form->handleRequest($request);
 
-        if ($form->isSubmitted() && $form->isValid()) {
+        if ($form->isValid()) {
             $em = $this->getDoctrine()->getManager();
             $em->persist($entity);
             $em->flush();
 
-            return $this->redirectToRoute('chill_activity_activityreason', ['id' => $entity->getId()]);
+            return $this->redirect($this->generateUrl('chill_activity_activityreason', ['id' => $entity->getId()]));
         }
 
-        return $this->render('@ChillActivity/ActivityReason/new.html.twig', [
+        return $this->render('ChillActivityBundle:ActivityReason:new.html.twig', [
             'entity' => $entity,
             'form' => $form->createView(),
         ]);
@@ -54,9 +57,9 @@ class ActivityReasonController extends AbstractController
     /**
      * Displays a form to edit an existing ActivityReason entity.
      *
-     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/activityreason/{id}/edit", name="chill_activity_activityreason_edit")
+     * @param mixed $id
      */
-    public function editAction(mixed $id)
+    public function editAction($id)
     {
         $em = $this->getDoctrine()->getManager();
 
@@ -68,7 +71,7 @@ class ActivityReasonController extends AbstractController
 
         $editForm = $this->createEditForm($entity);
 
-        return $this->render('@ChillActivity/ActivityReason/edit.html.twig', [
+        return $this->render('ChillActivityBundle:ActivityReason:edit.html.twig', [
             'entity' => $entity,
             'edit_form' => $editForm->createView(),
         ]);
@@ -76,8 +79,6 @@ class ActivityReasonController extends AbstractController
 
     /**
      * Lists all ActivityReason entities.
-     *
-     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/activityreason/", name="chill_activity_activityreason")
      */
     public function indexAction()
     {
@@ -85,22 +86,20 @@ class ActivityReasonController extends AbstractController
 
         $entities = $this->activityReasonRepository->findAll();
 
-        return $this->render('@ChillActivity/ActivityReason/index.html.twig', [
+        return $this->render('ChillActivityBundle:ActivityReason:index.html.twig', [
             'entities' => $entities,
         ]);
     }
 
     /**
      * Displays a form to create a new ActivityReason entity.
-     *
-     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/activityreason/new", name="chill_activity_activityreason_new")
      */
     public function newAction()
     {
         $entity = new ActivityReason();
         $form = $this->createCreateForm($entity);
 
-        return $this->render('@ChillActivity/ActivityReason/new.html.twig', [
+        return $this->render('ChillActivityBundle:ActivityReason:new.html.twig', [
             'entity' => $entity,
             'form' => $form->createView(),
         ]);
@@ -109,9 +108,9 @@ class ActivityReasonController extends AbstractController
     /**
      * Finds and displays a ActivityReason entity.
      *
-     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/activityreason/{id}/show", name="chill_activity_activityreason_show")
+     * @param mixed $id
      */
-    public function showAction(mixed $id)
+    public function showAction($id)
     {
         $em = $this->getDoctrine()->getManager();
 
@@ -121,7 +120,7 @@ class ActivityReasonController extends AbstractController
             throw $this->createNotFoundException('Unable to find ActivityReason entity.');
         }
 
-        return $this->render('@ChillActivity/ActivityReason/show.html.twig', [
+        return $this->render('ChillActivityBundle:ActivityReason:show.html.twig', [
             'entity' => $entity,
         ]);
     }
@@ -129,9 +128,9 @@ class ActivityReasonController extends AbstractController
     /**
      * Edits an existing ActivityReason entity.
      *
-     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/activityreason/{id}/update", name="chill_activity_activityreason_update", methods={"POST", "PUT"})
+     * @param mixed $id
      */
-    public function updateAction(Request $request, mixed $id)
+    public function updateAction(Request $request, $id)
     {
         $em = $this->getDoctrine()->getManager();
 
@@ -144,13 +143,13 @@ class ActivityReasonController extends AbstractController
         $editForm = $this->createEditForm($entity);
         $editForm->handleRequest($request);
 
-        if ($editForm->isSubmitted() && $editForm->isValid()) {
+        if ($editForm->isValid()) {
             $em->flush();
 
-            return $this->redirectToRoute('chill_activity_activityreason', ['id' => $id]);
+            return $this->redirect($this->generateUrl('chill_activity_activityreason', ['id' => $id]));
         }
 
-        return $this->render('@ChillActivity/ActivityReason/edit.html.twig', [
+        return $this->render('ChillActivityBundle:ActivityReason:edit.html.twig', [
             'entity' => $entity,
             'edit_form' => $editForm->createView(),
         ]);

src/Bundle/ChillActivityBundle/Controller/AdminActivityPresenceController.php

@@ -24,7 +24,7 @@ class AdminActivityPresenceController extends CRUDController
      */
     protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator)
     {
-        /* @var \Doctrine\ORM\QueryBuilder $query */
+        /** @var \Doctrine\ORM\QueryBuilder $query */
         return $query->orderBy('e.id', 'ASC');
     }
 }

src/Bundle/ChillActivityBundle/Controller/AdminActivityTypeCategoryController.php

@@ -24,7 +24,7 @@ class AdminActivityTypeCategoryController extends CRUDController
      */
     protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator)
     {
-        /* @var \Doctrine\ORM\QueryBuilder $query */
+        /** @var \Doctrine\ORM\QueryBuilder $query */
         return $query->orderBy('e.ordering', 'ASC');
     }
 }

src/Bundle/ChillActivityBundle/Controller/AdminActivityTypeController.php

@@ -24,7 +24,7 @@ class AdminActivityTypeController extends CRUDController
      */
     protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator)
     {
-        /* @var \Doctrine\ORM\QueryBuilder $query */
+        /** @var \Doctrine\ORM\QueryBuilder $query */
         return $query->orderBy('e.ordering', 'ASC')
             ->addOrderBy('e.id', 'ASC');
     }

src/Bundle/ChillActivityBundle/Controller/AdminController.php

@@ -18,18 +18,11 @@ use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
  */
 class AdminController extends AbstractController
 {
-    /**
-     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/activity", name="chill_activity_admin_index")
-     */
     public function indexActivityAction()
     {
-        return $this->render('@ChillActivity/Admin/layout_activity.html.twig');
+        return $this->render('ChillActivityBundle:Admin:layout_activity.html.twig');
     }
 
-    /**
-     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/activity_redirect_to_main", name="chill_admin_aside_activity_redirect_to_admin_index", options={null})
-     * @\Symfony\Component\Routing\Annotation\Route(path="/{_locale}/admin/activity_redirect_to_main", name="chill_admin_activity_redirect_to_admin_index")
-     */
     public function redirectToAdminIndexAction()
     {
         return $this->redirectToRoute('chill_main_admin_central');

src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivity.php

@@ -25,11 +25,17 @@ class LoadActivity extends AbstractFixture implements OrderedFixtureInterface
 {
     use \Symfony\Component\DependencyInjection\ContainerAwareTrait;
 
-    private readonly \Faker\Generator $faker;
+    private EntityManagerInterface $em;
 
-    public function __construct(private readonly EntityManagerInterface $em)
+    /**
+     * @var \Faker\Generator
+     */
+    private $faker;
+
+    public function __construct(EntityManagerInterface $em)
     {
         $this->faker = FakerFactory::create('fr_FR');
+        $this->em = $em;
     }
 
     public function getOrder()

src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityReason.php

@@ -52,13 +52,13 @@ class LoadActivityReason extends AbstractFixture implements OrderedFixtureInterf
         ];
 
         foreach ($reasons as $r) {
-            echo 'Creating activity reason : '.$r['name']['en']."\n";
+            echo 'Creating activity reason : ' . $r['name']['en'] . "\n";
             $activityReason = (new ActivityReason())
-                ->setName($r['name'])
+                ->setName(($r['name']))
                 ->setActive(true)
                 ->setCategory($this->getReference($r['category']));
             $manager->persist($activityReason);
-            $reference = 'activity_reason_'.$r['name']['en'];
+            $reference = 'activity_reason_' . $r['name']['en'];
             $this->addReference($reference, $activityReason);
             static::$references[] = $reference;
         }

src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityReasonCategory.php

@@ -34,13 +34,13 @@ class LoadActivityReasonCategory extends AbstractFixture implements OrderedFixtu
         ];
 
         foreach ($categs as $c) {
-            echo 'Creating activity reason category : '.$c['name']['en']."\n";
+            echo 'Creating activity reason category : ' . $c['name']['en'] . "\n";
             $activityReasonCategory = (new ActivityReasonCategory())
-                ->setName($c['name'])
+                ->setName(($c['name']))
                 ->setActive(true);
             $manager->persist($activityReasonCategory);
             $this->addReference(
-                'cat_'.$c['name']['en'],
+                'cat_' . $c['name']['en'],
                 $activityReasonCategory
             );
         }

src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityType.php

@@ -54,14 +54,14 @@ class LoadActivityType extends Fixture implements OrderedFixtureInterface
         ];
 
         foreach ($types as $t) {
-            echo 'Creating activity type : '.$t['name']['fr'].' (cat:'.$t['category']." \n";
+            echo 'Creating activity type : ' . $t['name']['fr'] . ' (cat:' . $t['category'] . " \n";
             $activityType = (new ActivityType())
-                ->setName($t['name'])
-                ->setCategory($this->getReference('activity_type_cat_'.$t['category']))
+                ->setName(($t['name']))
+                ->setCategory($this->getReference('activity_type_cat_' . $t['category']))
                 ->setSocialIssuesVisible(1)
                 ->setSocialActionsVisible(1);
             $manager->persist($activityType);
-            $reference = 'activity_type_'.$t['name']['fr'];
+            $reference = 'activity_type_' . $t['name']['fr'];
             $this->addReference($reference, $activityType);
             static::$references[] = $reference;
         }

src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityTypeCategory.php

@@ -42,13 +42,13 @@ class LoadActivityTypeCategory extends Fixture implements OrderedFixtureInterfac
         ];
 
         foreach ($categories as $cat) {
-            echo 'Creating activity type category : '.$cat['ref']."\n";
+            echo 'Creating activity type category : ' . $cat['ref'] . "\n";
 
             $newCat = (new ActivityTypeCategory())
-                ->setName($cat['name']);
+                ->setName(($cat['name']));
 
             $manager->persist($newCat);
-            $reference = 'activity_type_cat_'.$cat['ref'];
+            $reference = 'activity_type_cat_' . $cat['ref'];
 
             $this->addReference($reference, $newCat);
             static::$references[] = $reference;

src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivitytACL.php

@@ -20,6 +20,8 @@ use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
 use Doctrine\Persistence\ObjectManager;
 
+use function in_array;
+
 /**
  * Add a role CHILL_ACTIVITY_UPDATE & CHILL_ACTIVITY_CREATE for all groups except administrative,
  * and a role CHILL_ACTIVITY_SEE for administrative.
@@ -38,10 +40,10 @@ class LoadActivitytACL extends AbstractFixture implements OrderedFixtureInterfac
 
             foreach (LoadScopes::$references as $scopeRef) {
                 $scope = $this->getReference($scopeRef);
-                // create permission group
+                //create permission group
                 switch ($permissionsGroup->getName()) {
                     case 'social':
-                        if ('administrative' === $scope->getName()['en']) {
+                        if ($scope->getName()['en'] === 'administrative') {
                             break 2; // we do not want any power on administrative
                         }
 
@@ -49,7 +51,7 @@ class LoadActivitytACL extends AbstractFixture implements OrderedFixtureInterfac
 
                     case 'administrative':
                     case 'direction':
-                        if (\in_array($scope->getName()['en'], ['administrative', 'social'], true)) {
+                        if (in_array($scope->getName()['en'], ['administrative', 'social'], true)) {
                             break 2; // we do not want any power on social or administrative
                         }
 
@@ -58,7 +60,7 @@ class LoadActivitytACL extends AbstractFixture implements OrderedFixtureInterfac
 
                 printf(
                     'Adding CHILL_ACTIVITY_UPDATE & CHILL_ACTIVITY_CREATE & CHILL_ACTIVITY_DELETE, and stats and list permissions to %s '
-                        ."permission group, scope '%s' \n",
+                        . "permission group, scope '%s' \n",
                     $permissionsGroup->getName(),
                     $scope->getName()['en']
                 );

src/Bundle/ChillActivityBundle/DependencyInjection/ChillActivityExtension.php

@@ -32,7 +32,7 @@ class ChillActivityExtension extends Extension implements PrependExtensionInterf
 
         $container->setParameter('chill_activity.form.time_duration', $config['form']['time_duration']);
 
-        $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../config'));
+        $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__ . '/../config'));
         $loader->load('services.yaml');
         $loader->load('services/export.yaml');
         $loader->load('services/repositories.yaml');
@@ -73,7 +73,7 @@ class ChillActivityExtension extends Extension implements PrependExtensionInterf
      */
     public function prependRoutes(ContainerBuilder $container)
     {
-        // add routes for custom bundle
+        //add routes for custom bundle
         $container->prependExtensionConfig('chill_main', [
             'routing' => [
                 'resources' => [

src/Bundle/ChillActivityBundle/DependencyInjection/Configuration.php

@@ -13,6 +13,7 @@ namespace Chill\ActivityBundle\DependencyInjection;
 
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
+
 use function is_int;
 
 /**
@@ -58,7 +59,7 @@ class Configuration implements ConfigurationInterface
             ->info('The number of seconds of this duration. Must be an integer.')
             ->cannotBeEmpty()
             ->validate()
-            ->ifTrue(static fn ($data) => !\is_int($data))->thenInvalid('The value %s is not a valid integer')
+            ->ifTrue(static fn ($data) => !is_int($data))->thenInvalid('The value %s is not a valid integer')
             ->end()
             ->end()
             ->scalarNode('label')

src/Bundle/ChillActivityBundle/Entity/Activity.php

@@ -36,6 +36,7 @@ use DateTime;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
+use Symfony\Component\Security\Core\User\UserInterface;
 use Symfony\Component\Serializer\Annotation\DiscriminatorMap;
 use Symfony\Component\Serializer\Annotation\Groups;
 use Symfony\Component\Serializer\Annotation\SerializedName;
@@ -45,15 +46,11 @@ use Symfony\Component\Validator\Constraints as Assert;
  * Class Activity.
  *
  * @ORM\Entity(repositoryClass="Chill\ActivityBundle\Repository\ActivityRepository")
- *
  * @ORM\Table(name="activity")
- *
  * @ORM\HasLifecycleCallbacks
- *
  * @DiscriminatorMap(typeProperty="type", mapping={
  *     "activity": Activity::class
  * })
- *
  * @ActivityValidator\ActivityValidity
  *
  * TODO see if necessary
@@ -68,84 +65,69 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
 
     use TrackUpdateTrait;
 
-    final public const SENTRECEIVED_RECEIVED = 'received';
+    public const SENTRECEIVED_RECEIVED = 'received';
 
-    final public const SENTRECEIVED_SENT = 'sent';
+    public const SENTRECEIVED_SENT = 'sent';
 
     /**
      * @ORM\ManyToOne(targetEntity="Chill\PersonBundle\Entity\AccompanyingPeriod")
-     *
      * @Groups({"read"})
      */
     private ?AccompanyingPeriod $accompanyingPeriod = null;
 
     /**
      * @ORM\ManyToOne(targetEntity="Chill\ActivityBundle\Entity\ActivityType")
-     *
      * @Groups({"read", "docgen:read"})
-     *
      * @SerializedName("activityType")
-     *
      * @ORM\JoinColumn(name="type_id")
      */
     private ActivityType $activityType;
 
     /**
      * @ORM\ManyToOne(targetEntity="Chill\ActivityBundle\Entity\ActivityPresence")
-     *
      * @Groups({"docgen:read"})
      */
     private ?ActivityPresence $attendee = null;
 
     /**
      * @ORM\Embedded(class="Chill\MainBundle\Entity\Embeddable\CommentEmbeddable", columnPrefix="comment_")
-     *
      * @Groups({"docgen:read"})
      */
     private CommentEmbeddable $comment;
 
     /**
      * @ORM\Column(type="datetime")
-     *
      * @Groups({"docgen:read"})
      */
-    private \DateTime $date;
+    private DateTime $date;
 
     /**
      * @ORM\ManyToMany(targetEntity="Chill\DocStoreBundle\Entity\StoredObject", cascade={"persist"})
-     *
      * @Assert\Valid(traverse=true)
-     *
-     * @var Collection<StoredObject>
      */
     private Collection $documents;
 
     /**
      * @ORM\Column(type="time", nullable=true)
      */
-    private ?\DateTime $durationTime = null;
+    private ?DateTime $durationTime = null;
 
     /**
      * @ORM\Column(type="boolean", options={"default": false})
-     *
      * @Groups({"docgen:read"})
      */
     private bool $emergency = false;
 
     /**
      * @ORM\Id
-     *
      * @ORM\Column(name="id", type="integer")
-     *
      * @ORM\GeneratedValue(strategy="AUTO")
-     *
      * @Groups({"read", "docgen:read"})
      */
     private ?int $id = null;
 
     /**
      * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\Location")
-     *
      * @groups({"read", "docgen:read"})
      */
     private ?Location $location = null;
@@ -157,12 +139,9 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
 
     /**
      * @ORM\ManyToMany(targetEntity="Chill\PersonBundle\Entity\Person")
-     *
      * @Groups({"read", "docgen:read"})
-     *
-     * @var Collection<Person>
      */
-    private Collection $persons;
+    private ?Collection $persons = null;
 
     /**
      * @ORM\Embedded(class="Chill\MainBundle\Entity\Embeddable\PrivateCommentEmbeddable", columnPrefix="privateComment_")
@@ -171,78 +150,58 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
 
     /**
      * @ORM\ManyToMany(targetEntity="Chill\ActivityBundle\Entity\ActivityReason")
-     *
      * @Groups({"docgen:read"})
-     *
-     * @var Collection<ActivityReason>
      */
     private Collection $reasons;
 
     /**
      * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\Scope")
-     *
      * @Groups({"docgen:read"})
      */
     private ?Scope $scope = null;
 
     /**
      * @ORM\Column(type="string", options={"default": ""})
-     *
      * @Groups({"docgen:read"})
      */
     private string $sentReceived = '';
 
     /**
      * @ORM\ManyToMany(targetEntity="Chill\PersonBundle\Entity\SocialWork\SocialAction")
-     *
      * @ORM\JoinTable(name="chill_activity_activity_chill_person_socialaction")
-     *
      * @Groups({"read", "docgen:read"})
-     *
-     * @var Collection<SocialAction>
      */
     private Collection $socialActions;
 
     /**
      * @ORM\ManyToMany(targetEntity="Chill\PersonBundle\Entity\SocialWork\SocialIssue")
-     *
      * @ORM\JoinTable(name="chill_activity_activity_chill_person_socialissue")
-     *
      * @Groups({"read", "docgen:read"})
-     *
-     * @var Collection<SocialIssue>
      */
     private Collection $socialIssues;
 
     /**
      * @ORM\ManyToMany(targetEntity="Chill\ThirdPartyBundle\Entity\ThirdParty")
-     *
      * @Groups({"read", "docgen:read"})
-     *
-     * @var Collection<ThirdParty>
      */
-    private Collection $thirdParties;
+    private ?Collection $thirdParties = null;
 
     /**
      * @ORM\Column(type="time", nullable=true)
      */
-    private ?\DateTime $travelTime = null;
+    private ?DateTime $travelTime = null;
 
     /**
      * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\User")
-     *
      * @Groups({"docgen:read"})
      */
     private ?User $user = null;
 
     /**
      * @ORM\ManyToMany(targetEntity="Chill\MainBundle\Entity\User")
-     *
      * @Groups({"read", "docgen:read"})
-     *
-     * @var Collection<User>
      */
-    private Collection $users;
+    private ?Collection $users = null;
 
     public function __construct()
     {
@@ -309,7 +268,7 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
             $this->socialIssues[] = $socialIssue;
         }
 
-        if (null !== $this->getAccompanyingPeriod()) {
+        if ($this->getAccompanyingPeriod() !== null) {
             $this->getAccompanyingPeriod()->addSocialIssue($socialIssue);
         }
 
@@ -375,7 +334,7 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
         return $this->comment;
     }
 
-    public function getDate(): \DateTime
+    public function getDate(): DateTime
     {
         return $this->date;
     }
@@ -397,7 +356,7 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
         return (int) round(($this->durationTime->getTimestamp() + $this->durationTime->getOffset()) / 60.0, 0);
     }
 
-    public function getDurationTime(): ?\DateTime
+    public function getDurationTime(): ?DateTime
     {
         return $this->durationTime;
     }
@@ -451,7 +410,7 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
 
             // TODO better semantic with:  return $this->persons->filter(...);
             foreach ($this->persons as $person) {
-                if (null === $this->accompanyingPeriod->getOpenParticipationContainsPerson($person)) {
+                if ($this->accompanyingPeriod->getOpenParticipationContainsPerson($person) === null) {
                     $personsNotAssociated[] = $person;
                 }
             }
@@ -510,7 +469,7 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
         return $this->thirdParties;
     }
 
-    public function getTravelTime(): ?\DateTime
+    public function getTravelTime(): ?DateTime
     {
         return $this->travelTime;
     }
@@ -621,7 +580,7 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
         return $this;
     }
 
-    public function setDate(\DateTime $date): self
+    public function setDate(DateTime $date): self
     {
         $this->date = $date;
 
@@ -635,7 +594,7 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
         return $this;
     }
 
-    public function setDurationTime(?\DateTime $durationTime): self
+    public function setDurationTime(?DateTime $durationTime): self
     {
         $this->durationTime = $durationTime;
 
@@ -705,7 +664,7 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
         return $this;
     }
 
-    public function setTravelTime(\DateTime $travelTime): self
+    public function setTravelTime(DateTime $travelTime): self
     {
         $this->travelTime = $travelTime;
 

src/Bundle/ChillActivityBundle/Entity/ActivityPresence.php

@@ -18,9 +18,7 @@ use Symfony\Component\Serializer\Annotation as Serializer;
  * Class ActivityPresence.
  *
  * @ORM\Entity
- *
  * @ORM\Table(name="activitytpresence")
- *
  * @ORM\HasLifecycleCallbacks
  */
 class ActivityPresence
@@ -32,20 +30,15 @@ class ActivityPresence
 
     /**
      * @ORM\Id
-     *
      * @ORM\Column(name="id", type="integer")
-     *
      * @ORM\GeneratedValue(strategy="AUTO")
-     *
      * @Serializer\Groups({"docgen:read"})
      */
     private ?int $id = null;
 
     /**
      * @ORM\Column(type="json")
-     *
      * @Serializer\Groups({"docgen:read"})
-     *
      * @Serializer\Context({"is-translatable": true}, groups={"docgen:read"})
      */
     private array $name = [];

src/Bundle/ChillActivityBundle/Entity/ActivityReason.php

@@ -17,38 +17,39 @@ use Doctrine\ORM\Mapping as ORM;
  * Class ActivityReason.
  *
  * @ORM\Entity
- *
  * @ORM\Table(name="activityreason")
- *
  * @ORM\HasLifecycleCallbacks
  */
 class ActivityReason
 {
     /**
+     * @var bool
      * @ORM\Column(type="boolean")
      */
-    private bool $active = true;
+    private $active = true;
 
     /**
+     * @var ActivityReasonCategory
      * @ORM\ManyToOne(
      *     targetEntity="Chill\ActivityBundle\Entity\ActivityReasonCategory",
      * inversedBy="reasons")
      */
-    private ?ActivityReasonCategory $category = null;
+    private $category;
 
     /**
+     * @var int
+     *
      * @ORM\Id
-     *
      * @ORM\Column(name="id", type="integer")
-     *
      * @ORM\GeneratedValue(strategy="AUTO")
      */
-    private ?int $id = null;
+    private $id;
 
     /**
+     * @var array
      * @ORM\Column(type="json")
      */
-    private array $name;
+    private $name;
 
     /**
      * Get active.
@@ -80,9 +81,27 @@ class ActivityReason
 
     /**
      * Get name.
+     *
+     * @param mixed|null $locale
+     *
+     * @return array | string
      */
-    public function getName(): array
+    public function getName($locale = null)
     {
+        if ($locale) {
+            if (isset($this->name[$locale])) {
+                return $this->name[$locale];
+            }
+
+            foreach ($this->name as $name) {
+                if (!empty($name)) {
+                    return $name;
+                }
+            }
+
+            return '';
+        }
+
         return $this->name;
     }
 

src/Bundle/ChillActivityBundle/Entity/ActivityReasonCategory.php

@@ -12,37 +12,34 @@ declare(strict_types=1);
 namespace Chill\ActivityBundle\Entity;
 
 use Doctrine\Common\Collections\ArrayCollection;
-use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
 
 /**
  * Class ActivityReasonCategory.
  *
  * @ORM\Entity
- *
  * @ORM\Table(name="activityreasoncategory")
- *
  * @ORM\HasLifecycleCallbacks
  */
-class ActivityReasonCategory implements \Stringable
+class ActivityReasonCategory
 {
     /**
+     * @var bool
      * @ORM\Column(type="boolean")
      */
-    private bool $active = true;
+    private $active = true;
 
     /**
+     * @var int
+     *
      * @ORM\Id
-     *
      * @ORM\Column(name="id", type="integer")
-     *
      * @ORM\GeneratedValue(strategy="AUTO")
      */
-    private ?int $id = null;
+    private $id;
 
     /**
      * @var string
-     *
      * @ORM\Column(type="json")
      */
     private $name;
@@ -50,13 +47,12 @@ class ActivityReasonCategory implements \Stringable
     /**
      * Array of ActivityReason.
      *
-     * @var Collection<ActivityReason>
-     *
+     * @var ArrayCollection
      * @ORM\OneToMany(
      *     targetEntity="Chill\ActivityBundle\Entity\ActivityReason",
      * mappedBy="category")
      */
-    private Collection $reasons;
+    private $reasons;
 
     /**
      * ActivityReasonCategory constructor.
@@ -66,9 +62,12 @@ class ActivityReasonCategory implements \Stringable
         $this->reasons = new ArrayCollection();
     }
 
-    public function __toString(): string
+    /**
+     * @return string
+     */
+    public function __toString()
     {
-        return 'ActivityReasonCategory('.$this->getName('x').')';
+        return 'ActivityReasonCategory(' . $this->getName('x') . ')';
     }
 
     /**
@@ -122,9 +121,11 @@ class ActivityReasonCategory implements \Stringable
      * as unactive, all the reason have this entity as category is also
      * set as unactive.
      *
+     * @param bool $active
+     *
      * @return ActivityReasonCategory
      */
-    public function setActive(bool $active)
+    public function setActive($active)
     {
         if ($this->active !== $active && !$active) {
             foreach ($this->reasons as $reason) {

src/Bundle/ChillActivityBundle/Entity/ActivityType.php

@@ -12,6 +12,7 @@ declare(strict_types=1);
 namespace Chill\ActivityBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
+use InvalidArgumentException;
 use Symfony\Component\Serializer\Annotation as Serializer;
 use Symfony\Component\Serializer\Annotation\Groups;
 use Symfony\Component\Validator\Constraints as Assert;
@@ -21,36 +22,31 @@ use Symfony\Component\Validator\Context\ExecutionContextInterface;
  * Class ActivityType.
  *
  * @ORM\Entity
- *
  * @ORM\Table(name="activitytype")
- *
  * @ORM\HasLifecycleCallbacks
  */
 class ActivityType
 {
-    final public const FIELD_INVISIBLE = 0;
+    public const FIELD_INVISIBLE = 0;
 
-    final public const FIELD_OPTIONAL = 1;
+    public const FIELD_OPTIONAL = 1;
 
-    final public const FIELD_REQUIRED = 2;
+    public const FIELD_REQUIRED = 2;
 
     /**
      * @deprecated not in use
-     *
      * @ORM\Column(type="string", nullable=false, options={"default": ""})
      */
     private string $accompanyingPeriodLabel = '';
 
     /**
      * @deprecated not in use
-     *
      * @ORM\Column(type="smallint", nullable=false, options={"default": 1})
      */
     private int $accompanyingPeriodVisible = self::FIELD_INVISIBLE;
 
     /**
      * @ORM\Column(type="boolean")
-     *
      * @Groups({"read"})
      */
     private bool $active = true;
@@ -122,11 +118,8 @@ class ActivityType
 
     /**
      * @ORM\Id
-     *
      * @ORM\Column(name="id", type="integer")
-     *
      * @ORM\GeneratedValue(strategy="AUTO")
-     *
      * @Groups({"docgen:read"})
      */
     private ?int $id = null;
@@ -143,9 +136,7 @@ class ActivityType
 
     /**
      * @ORM\Column(type="json")
-     *
      * @Groups({"read", "docgen:read"})
-     *
      * @Serializer\Context({"is-translatable": true}, groups={"docgen:read"})
      */
     private array $name = [];
@@ -167,7 +158,6 @@ class ActivityType
 
     /**
      * @ORM\Column(type="smallint", nullable=false, options={"default": 1})
-     *
      * @Groups({"read"})
      */
     private int $personsVisible = self::FIELD_OPTIONAL;
@@ -248,7 +238,6 @@ class ActivityType
 
     /**
      * @ORM\Column(type="smallint", nullable=false, options={"default": 1})
-     *
      * @Groups({"read"})
      */
     private int $thirdPartiesVisible = self::FIELD_INVISIBLE;
@@ -275,7 +264,6 @@ class ActivityType
 
     /**
      * @ORM\Column(type="smallint", nullable=false, options={"default": 1})
-     *
      * @Groups({"read"})
      */
     private int $usersVisible = self::FIELD_OPTIONAL;
@@ -287,8 +275,10 @@ class ActivityType
 
     /**
      * @Assert\Callback
+     *
+     * @param mixed $payload
      */
-    public function checkSocialActionsVisibility(ExecutionContextInterface $context, mixed $payload)
+    public function checkSocialActionsVisibility(ExecutionContextInterface $context, $payload)
     {
         if ($this->socialIssuesVisible !== $this->socialActionsVisible) {
             if (!(2 === $this->socialIssuesVisible && 1 === $this->socialActionsVisible)) {
@@ -384,13 +374,13 @@ class ActivityType
 
     public function getLabel(string $field): ?string
     {
-        $property = $field.'Label';
+        $property = $field . 'Label';
 
         if (!property_exists($this, $property)) {
-            throw new \InvalidArgumentException('Field "'.$field.'" not found');
+            throw new InvalidArgumentException('Field "' . $field . '" not found');
         }
 
-        /* @phpstan-ignore-next-line */
+        /** @phpstan-ignore-next-line  */
         return $this->{$property};
     }
 
@@ -543,25 +533,25 @@ class ActivityType
 
     public function isRequired(string $field): bool
     {
-        $property = $field.'Visible';
+        $property = $field . 'Visible';
 
         if (!property_exists($this, $property)) {
-            throw new \InvalidArgumentException('Field "'.$field.'" not found');
+            throw new InvalidArgumentException('Field "' . $field . '" not found');
         }
 
-        /* @phpstan-ignore-next-line */
+        /** @phpstan-ignore-next-line  */
         return self::FIELD_REQUIRED === $this->{$property};
     }
 
     public function isVisible(string $field): bool
     {
-        $property = $field.'Visible';
+        $property = $field . 'Visible';
 
         if (!property_exists($this, $property)) {
-            throw new \InvalidArgumentException('Field "'.$field.'" not found');
+            throw new InvalidArgumentException('Field "' . $field . '" not found');
         }
 
-        /* @phpstan-ignore-next-line */
+        /** @phpstan-ignore-next-line  */
         return self::FIELD_INVISIBLE !== $this->{$property};
     }
 

src/Bundle/ChillActivityBundle/Entity/ActivityTypeCategory.php

@@ -15,9 +15,7 @@ use Doctrine\ORM\Mapping as ORM;
 
 /**
  * @ORM\Entity
- *
  * @ORM\Table(name="activitytypecategory")
- *
  * @ORM\HasLifecycleCallbacks
  */
 class ActivityTypeCategory
@@ -29,9 +27,7 @@ class ActivityTypeCategory
 
     /**
      * @ORM\Id
-     *
      * @ORM\Column(name="id", type="integer")
-     *
      * @ORM\GeneratedValue(strategy="AUTO")
      */
     private ?int $id = null;

src/Bundle/ChillActivityBundle/EntityListener/ActivityEntityListener.php

@@ -15,11 +15,22 @@ use Chill\ActivityBundle\Entity\Activity;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork;
 use Chill\PersonBundle\Repository\AccompanyingPeriod\AccompanyingPeriodWorkRepository;
+use DateTimeImmutable;
 use Doctrine\ORM\EntityManagerInterface;
 
+use function in_array;
+
 class ActivityEntityListener
 {
-    public function __construct(private readonly EntityManagerInterface $em, private readonly AccompanyingPeriodWorkRepository $workRepository) {}
+    private EntityManagerInterface $em;
+
+    private AccompanyingPeriodWorkRepository $workRepository;
+
+    public function __construct(EntityManagerInterface $em, AccompanyingPeriodWorkRepository $workRepository)
+    {
+        $this->em = $em;
+        $this->workRepository = $workRepository;
+    }
 
     public function persistActionToCourse(Activity $activity)
     {
@@ -28,11 +39,11 @@ class ActivityEntityListener
 
             $accompanyingCourseWorks = $this->workRepository->findByAccompanyingPeriod($period);
             $periodActions = [];
-            $now = new \DateTimeImmutable();
+            $now = new DateTimeImmutable();
 
             foreach ($accompanyingCourseWorks as $key => $work) {
                 // take only the actions which are still opened
-                if (null === $work->getEndDate() || $work->getEndDate() > ($activity->getDate() ?? $now)) {
+                if ($work->getEndDate() === null || $work->getEndDate() > ($activity->getDate() ?? $now)) {
                     $periodActions[$key] = spl_object_hash($work->getSocialAction());
                 }
             }
@@ -41,14 +52,14 @@ class ActivityEntityListener
             $associatedThirdparties = $activity->getThirdParties();
 
             foreach ($activity->getSocialActions() as $action) {
-                if (\in_array(spl_object_hash($action), $periodActions, true)) {
+                if (in_array(spl_object_hash($action), $periodActions, true)) {
                     continue;
                 }
                 $newAction = new AccompanyingPeriodWork();
                 $newAction->setSocialAction($action);
                 $period->addWork($newAction);
 
-                $date = \DateTimeImmutable::createFromMutable($activity->getDate());
+                $date = DateTimeImmutable::createFromMutable($activity->getDate());
                 $newAction->setStartDate($date);
 
                 foreach ($associatedPersons as $person) {

src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/ByActivityNumberAggregator.php

@@ -27,7 +27,7 @@ class ByActivityNumberAggregator implements AggregatorInterface
     public function alterQuery(QueryBuilder $qb, $data): void
     {
         $qb
-            ->addSelect('(SELECT COUNT(activity.id) FROM '.Activity::class.' activity WHERE activity.accompanyingPeriod = acp) AS activity_by_number_aggregator')
+            ->addSelect('(SELECT COUNT(activity.id) FROM ' . Activity::class . ' activity WHERE activity.accompanyingPeriod = acp) AS activity_by_number_aggregator')
             ->addGroupBy('activity_by_number_aggregator');
     }
 
@@ -40,7 +40,6 @@ class ByActivityNumberAggregator implements AggregatorInterface
     {
         // No form needed
     }
-
     public function getFormDefaultData(): array
     {
         return [];

src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/ByCreatorAggregator.php

@@ -9,7 +9,7 @@ declare(strict_types=1);
  * the LICENSE file that was distributed with this source code.
  */
 
-namespace Chill\ActivityBundle\Export\Aggregator;
+namespace Chill\ActivityBundle\Export\Aggregator\ACPAggregators;
 
 use Chill\ActivityBundle\Export\Declarations;
 use Chill\MainBundle\Export\AggregatorInterface;
@@ -20,7 +20,17 @@ use Symfony\Component\Form\FormBuilderInterface;
 
 class ByCreatorAggregator implements AggregatorInterface
 {
-    public function __construct(private readonly UserRepositoryInterface $userRepository, private readonly UserRender $userRender) {}
+    private UserRender $userRender;
+
+    private UserRepositoryInterface $userRepository;
+
+    public function __construct(
+        UserRepositoryInterface $userRepository,
+        UserRender $userRender
+    ) {
+        $this->userRepository = $userRepository;
+        $this->userRender = $userRender;
+    }
 
     public function addRole(): ?string
     {
@@ -35,14 +45,13 @@ class ByCreatorAggregator implements AggregatorInterface
 
     public function applyOn(): string
     {
-        return Declarations::ACTIVITY;
+        return Declarations::ACTIVITY_ACP;
     }
 
     public function buildForm(FormBuilderInterface $builder)
     {
         // no form
     }
-
     public function getFormDefaultData(): array
     {
         return [];

src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/BySocialActionAggregator.php

@@ -17,10 +17,21 @@ use Chill\PersonBundle\Repository\SocialWork\SocialActionRepository;
 use Chill\PersonBundle\Templating\Entity\SocialActionRender;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
+use function in_array;
 
 class BySocialActionAggregator implements AggregatorInterface
 {
-    public function __construct(private readonly SocialActionRender $actionRender, private readonly SocialActionRepository $actionRepository) {}
+    private SocialActionRender $actionRender;
+
+    private SocialActionRepository $actionRepository;
+
+    public function __construct(
+        SocialActionRender $actionRender,
+        SocialActionRepository $actionRepository
+    ) {
+        $this->actionRender = $actionRender;
+        $this->actionRepository = $actionRepository;
+    }
 
     public function addRole(): ?string
     {
@@ -29,7 +40,7 @@ class BySocialActionAggregator implements AggregatorInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!\in_array('actsocialaction', $qb->getAllAliases(), true)) {
+        if (!in_array('actsocialaction', $qb->getAllAliases(), true)) {
             $qb->leftJoin('activity.socialActions', 'actsocialaction');
         }
 
@@ -46,7 +57,6 @@ class BySocialActionAggregator implements AggregatorInterface
     {
         // no form
     }
-
     public function getFormDefaultData(): array
     {
         return [];

src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/BySocialIssueAggregator.php

@@ -17,10 +17,21 @@ use Chill\PersonBundle\Repository\SocialWork\SocialIssueRepository;
 use Chill\PersonBundle\Templating\Entity\SocialIssueRender;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
+use function in_array;
 
 class BySocialIssueAggregator implements AggregatorInterface
 {
-    public function __construct(private readonly SocialIssueRepository $issueRepository, private readonly SocialIssueRender $issueRender) {}
+    private SocialIssueRender $issueRender;
+
+    private SocialIssueRepository $issueRepository;
+
+    public function __construct(
+        SocialIssueRepository $issueRepository,
+        SocialIssueRender $issueRender
+    ) {
+        $this->issueRepository = $issueRepository;
+        $this->issueRender = $issueRender;
+    }
 
     public function addRole(): ?string
     {
@@ -29,7 +40,7 @@ class BySocialIssueAggregator implements AggregatorInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!\in_array('actsocialissue', $qb->getAllAliases(), true)) {
+        if (!in_array('actsocialissue', $qb->getAllAliases(), true)) {
             $qb->leftJoin('activity.socialIssues', 'actsocialissue');
         }
 
@@ -46,7 +57,6 @@ class BySocialIssueAggregator implements AggregatorInterface
     {
         // no form
     }
-
     public function getFormDefaultData(): array
     {
         return [];

src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/ByThirdpartyAggregator.php

@@ -9,7 +9,7 @@ declare(strict_types=1);
  * the LICENSE file that was distributed with this source code.
  */
 
-namespace Chill\ActivityBundle\Export\Aggregator;
+namespace Chill\ActivityBundle\Export\Aggregator\ACPAggregators;
 
 use Chill\ActivityBundle\Export\Declarations;
 use Chill\MainBundle\Export\AggregatorInterface;
@@ -17,10 +17,21 @@ use Chill\ThirdPartyBundle\Repository\ThirdPartyRepository;
 use Chill\ThirdPartyBundle\Templating\Entity\ThirdPartyRender;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
+use function in_array;
 
 class ByThirdpartyAggregator implements AggregatorInterface
 {
-    public function __construct(private readonly ThirdPartyRepository $thirdPartyRepository, private readonly ThirdPartyRender $thirdPartyRender) {}
+    private ThirdPartyRender $thirdPartyRender;
+
+    private ThirdPartyRepository $thirdPartyRepository;
+
+    public function __construct(
+        ThirdPartyRepository $thirdPartyRepository,
+        ThirdPartyRender $thirdPartyRender
+    ) {
+        $this->thirdPartyRepository = $thirdPartyRepository;
+        $this->thirdPartyRender = $thirdPartyRender;
+    }
 
     public function addRole(): ?string
     {
@@ -29,7 +40,7 @@ class ByThirdpartyAggregator implements AggregatorInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!\in_array('acttparty', $qb->getAllAliases(), true)) {
+        if (!in_array('acttparty', $qb->getAllAliases(), true)) {
             $qb->leftJoin('activity.thirdParties', 'acttparty');
         }
 
@@ -39,14 +50,13 @@ class ByThirdpartyAggregator implements AggregatorInterface
 
     public function applyOn(): string
     {
-        return Declarations::ACTIVITY;
+        return Declarations::ACTIVITY_ACP;
     }
 
     public function buildForm(FormBuilderInterface $builder)
     {
         // no form
     }
-
     public function getFormDefaultData(): array
     {
         return [];

src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/CreatorScopeAggregator.php

@@ -9,25 +9,29 @@ declare(strict_types=1);
  * the LICENSE file that was distributed with this source code.
  */
 
-namespace Chill\ActivityBundle\Export\Aggregator;
+namespace Chill\ActivityBundle\Export\Aggregator\ACPAggregators;
 
 use Chill\ActivityBundle\Export\Declarations;
-use Chill\MainBundle\Entity\User\UserScopeHistory;
 use Chill\MainBundle\Export\AggregatorInterface;
 use Chill\MainBundle\Repository\ScopeRepository;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
-use Doctrine\ORM\Query\Expr\Join;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
+use function in_array;
 
 class CreatorScopeAggregator implements AggregatorInterface
 {
-    private const PREFIX = 'acp_agg_creator_scope';
+    private ScopeRepository $scopeRepository;
+
+    private TranslatableStringHelper $translatableStringHelper;
 
     public function __construct(
-        private readonly ScopeRepository $scopeRepository,
-        private readonly TranslatableStringHelper $translatableStringHelper
-    ) {}
+        ScopeRepository $scopeRepository,
+        TranslatableStringHelper $translatableStringHelper
+    ) {
+        $this->scopeRepository = $scopeRepository;
+        $this->translatableStringHelper = $translatableStringHelper;
+    }
 
     public function addRole(): ?string
     {
@@ -36,37 +40,23 @@ class CreatorScopeAggregator implements AggregatorInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        $p = self::PREFIX;
+        if (!in_array('actcreator', $qb->getAllAliases(), true)) {
+            $qb->leftJoin('activity.createdBy', 'actcreator');
+        }
 
-        $qb
-            ->leftJoin('activity.createdBy', "{$p}_user")
-            ->leftJoin(
-                UserScopeHistory::class,
-                "{$p}_history",
-                Join::WITH,
-                $qb->expr()->eq("{$p}_history.user", "{$p}_user")
-            )
-            // scope_at based on activity.date
-            ->andWhere(
-                $qb->expr()->andX(
-                    $qb->expr()->lte("{$p}_history.startDate", 'activity.date'),
-                    $qb->expr()->orX(
-                        $qb->expr()->isNull("{$p}_history.endDate"),
-                        $qb->expr()->gt("{$p}_history.endDate", 'activity.date')
-                    )
-                )
-            )
-            ->addSelect("IDENTITY({$p}_history.scope) AS {$p}_select")
-            ->addGroupBy("{$p}_select");
+        $qb->addSelect('IDENTITY(actcreator.mainScope) AS creatorscope_aggregator');
+        $qb->addGroupBy('creatorscope_aggregator');
     }
 
     public function applyOn(): string
     {
-        return Declarations::ACTIVITY;
+        return Declarations::ACTIVITY_ACP;
     }
 
-    public function buildForm(FormBuilderInterface $builder) {}
-
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        // no form
+    }
     public function getFormDefaultData(): array
     {
         return [];
@@ -93,11 +83,11 @@ class CreatorScopeAggregator implements AggregatorInterface
 
     public function getQueryKeys($data): array
     {
-        return [self::PREFIX.'_select'];
+        return ['creatorscope_aggregator'];
     }
 
     public function getTitle(): string
     {
-        return 'export.aggregator.activity.by_creator_scope.Group activity by creator scope';
+        return 'Group activity by creator scope';
     }
 }

src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/DateAggregator.php

@@ -9,13 +9,15 @@ declare(strict_types=1);
  * the LICENSE file that was distributed with this source code.
  */
 
-namespace Chill\ActivityBundle\Export\Aggregator;
+namespace Chill\ActivityBundle\Export\Aggregator\ACPAggregators;
 
 use Chill\ActivityBundle\Export\Declarations;
 use Chill\MainBundle\Export\AggregatorInterface;
 use Doctrine\ORM\QueryBuilder;
+use RuntimeException;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 class DateAggregator implements AggregatorInterface
 {
@@ -54,7 +56,7 @@ class DateAggregator implements AggregatorInterface
                 break; // order DESC does not works !
 
             default:
-                throw new \RuntimeException(sprintf("The frequency data '%s' is invalid.", $data['frequency']));
+                throw new RuntimeException(sprintf("The frequency data '%s' is invalid.", $data['frequency']));
         }
 
         $qb->addSelect(sprintf("TO_CHAR(activity.date, '%s') AS date_aggregator", $fmt));
@@ -64,7 +66,7 @@ class DateAggregator implements AggregatorInterface
 
     public function applyOn(): string
     {
-        return Declarations::ACTIVITY;
+        return Declarations::ACTIVITY_ACP;
     }
 
     public function buildForm(FormBuilderInterface $builder)
@@ -76,7 +78,6 @@ class DateAggregator implements AggregatorInterface
             'empty_data' => self::DEFAULT_CHOICE,
         ]);
     }
-
     public function getFormDefaultData(): array
     {
         return ['frequency' => self::DEFAULT_CHOICE];
@@ -86,16 +87,24 @@ class DateAggregator implements AggregatorInterface
     {
         return static function ($value) use ($data): string {
             if ('_header' === $value) {
-                return 'by '.$data['frequency'];
+                return 'by ' . $data['frequency'];
             }
 
             if (null === $value) {
                 return '';
             }
 
-            return match ($data['frequency']) {
-                default => $value,
-            };
+            switch ($data['frequency']) {
+                case 'month':
+                case 'week':
+                    //return $this->translator->trans('for week') .' '. $value ;
+
+                case 'year':
+                    //return $this->translator->trans('in year') .' '. $value ;
+
+                default:
+                    return $value;
+            }
         };
     }
 

src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/LocationTypeAggregator.php

@@ -9,7 +9,7 @@ declare(strict_types=1);
  * the LICENSE file that was distributed with this source code.
  */
 
-namespace Chill\ActivityBundle\Export\Aggregator;
+namespace Chill\ActivityBundle\Export\Aggregator\ACPAggregators;
 
 use Chill\ActivityBundle\Export\Declarations;
 use Chill\MainBundle\Export\AggregatorInterface;
@@ -17,10 +17,21 @@ use Chill\MainBundle\Repository\LocationTypeRepository;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
+use function in_array;
 
 class LocationTypeAggregator implements AggregatorInterface
 {
-    public function __construct(private readonly LocationTypeRepository $locationTypeRepository, private readonly TranslatableStringHelper $translatableStringHelper) {}
+    private LocationTypeRepository $locationTypeRepository;
+
+    private TranslatableStringHelper $translatableStringHelper;
+
+    public function __construct(
+        LocationTypeRepository $locationTypeRepository,
+        TranslatableStringHelper $translatableStringHelper
+    ) {
+        $this->locationTypeRepository = $locationTypeRepository;
+        $this->translatableStringHelper = $translatableStringHelper;
+    }
 
     public function addRole(): ?string
     {
@@ -29,7 +40,7 @@ class LocationTypeAggregator implements AggregatorInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!\in_array('actloc', $qb->getAllAliases(), true)) {
+        if (!in_array('actloc', $qb->getAllAliases(), true)) {
             $qb->leftJoin('activity.location', 'actloc');
         }
 
@@ -39,14 +50,13 @@ class LocationTypeAggregator implements AggregatorInterface
 
     public function applyOn(): string
     {
-        return Declarations::ACTIVITY;
+        return Declarations::ACTIVITY_ACP;
     }
 
     public function buildForm(FormBuilderInterface $builder)
     {
         // no form
     }
-
     public function getFormDefaultData(): array
     {
         return [];

src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityLocationAggregator.php

@@ -12,9 +12,14 @@ declare(strict_types=1);
 namespace Chill\ActivityBundle\Export\Aggregator;
 
 use Chill\ActivityBundle\Export\Declarations;
+use Chill\ActivityBundle\Repository\ActivityTypeRepositoryInterface;
 use Chill\MainBundle\Export\AggregatorInterface;
+use Chill\MainBundle\Repository\LocationRepository;
+use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
+use Closure;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
+use function in_array;
 
 final readonly class ActivityLocationAggregator implements AggregatorInterface
 {
@@ -27,7 +32,7 @@ final readonly class ActivityLocationAggregator implements AggregatorInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!\in_array('actloc', $qb->getAllAliases(), true)) {
+        if (!in_array('actloc', $qb->getAllAliases(), true)) {
             $qb->leftJoin('activity.location', 'actloc');
         }
         $qb->addSelect(sprintf('actloc.name AS %s', self::KEY));
@@ -43,13 +48,12 @@ final readonly class ActivityLocationAggregator implements AggregatorInterface
     {
         // no form required for this aggregator
     }
-
     public function getFormDefaultData(): array
     {
         return [];
     }
 
-    public function getLabels($key, array $values, $data): \Closure
+    public function getLabels($key, array $values, $data): Closure
     {
         return function ($value): string {
             if ('_header' === $value) {

src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityTypeAggregator.php

@@ -15,14 +15,26 @@ use Chill\ActivityBundle\Export\Declarations;
 use Chill\ActivityBundle\Repository\ActivityTypeRepositoryInterface;
 use Chill\MainBundle\Export\AggregatorInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
+use Closure;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
+use function in_array;
 
 class ActivityTypeAggregator implements AggregatorInterface
 {
-    final public const KEY = 'activity_type_aggregator';
+    public const KEY = 'activity_type_aggregator';
 
-    public function __construct(protected ActivityTypeRepositoryInterface $activityTypeRepository, protected TranslatableStringHelperInterface $translatableStringHelper) {}
+    protected ActivityTypeRepositoryInterface $activityTypeRepository;
+
+    protected TranslatableStringHelperInterface $translatableStringHelper;
+
+    public function __construct(
+        ActivityTypeRepositoryInterface $activityTypeRepository,
+        TranslatableStringHelperInterface $translatableStringHelper
+    ) {
+        $this->activityTypeRepository = $activityTypeRepository;
+        $this->translatableStringHelper = $translatableStringHelper;
+    }
 
     public function addRole(): ?string
     {
@@ -31,7 +43,7 @@ class ActivityTypeAggregator implements AggregatorInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!\in_array('acttype', $qb->getAllAliases(), true)) {
+        if (!in_array('acttype', $qb->getAllAliases(), true)) {
             $qb->leftJoin('activity.activityType', 'acttype');
         }
 
@@ -48,13 +60,12 @@ class ActivityTypeAggregator implements AggregatorInterface
     {
         // no form required for this aggregator
     }
-
     public function getFormDefaultData(): array
     {
         return [];
     }
 
-    public function getLabels($key, array $values, $data): \Closure
+    public function getLabels($key, array $values, $data): Closure
     {
         // for performance reason, we load data from db only once
         $this->activityTypeRepository->findBy(['id' => $values]);

src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityUserAggregator.php

@@ -15,14 +15,25 @@ 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;
 
 class ActivityUserAggregator implements AggregatorInterface
 {
-    final public const KEY = 'activity_user_id';
+    public const KEY = 'activity_user_id';
 
-    public function __construct(private readonly UserRepository $userRepository, private readonly UserRender $userRender) {}
+    private UserRender $userRender;
+
+    private UserRepository $userRepository;
+
+    public function __construct(
+        UserRepository $userRepository,
+        UserRender $userRender
+    ) {
+        $this->userRepository = $userRepository;
+        $this->userRender = $userRender;
+    }
 
     public function addRole(): ?string
     {
@@ -47,13 +58,12 @@ class ActivityUserAggregator implements AggregatorInterface
     {
         // nothing to add
     }
-
     public function getFormDefaultData(): array
     {
         return [];
     }
 
-    public function getLabels($key, $values, $data): \Closure
+    public function getLabels($key, $values, $data): Closure
     {
         return function ($value) {
             if ('_header' === $value) {

src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityUsersAggregator.php

@@ -17,10 +17,19 @@ use Chill\MainBundle\Repository\UserRepositoryInterface;
 use Chill\MainBundle\Templating\Entity\UserRender;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
+use function in_array;
 
 class ActivityUsersAggregator implements AggregatorInterface
 {
-    public function __construct(private readonly UserRepositoryInterface $userRepository, private readonly UserRender $userRender) {}
+    private UserRender $userRender;
+
+    private UserRepositoryInterface $userRepository;
+
+    public function __construct(UserRepositoryInterface $userRepository, UserRender $userRender)
+    {
+        $this->userRepository = $userRepository;
+        $this->userRender = $userRender;
+    }
 
     public function addRole(): ?string
     {
@@ -29,7 +38,7 @@ class ActivityUsersAggregator implements AggregatorInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!\in_array('actusers', $qb->getAllAliases(), true)) {
+        if (!in_array('actusers', $qb->getAllAliases(), true)) {
             $qb->leftJoin('activity.users', 'actusers');
         }
 
@@ -47,7 +56,6 @@ class ActivityUsersAggregator implements AggregatorInterface
     {
         // nothing to add on the form
     }
-
     public function getFormDefaultData(): array
     {
         return [];

src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityUsersJobAggregator.php

@@ -12,22 +12,23 @@ declare(strict_types=1);
 namespace Chill\ActivityBundle\Export\Aggregator;
 
 use Chill\ActivityBundle\Export\Declarations;
-use Chill\MainBundle\Entity\User\UserJobHistory;
-use Chill\MainBundle\Export\AggregatorInterface;
 use Chill\MainBundle\Repository\UserJobRepositoryInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
-use Doctrine\ORM\Query\Expr;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
+use function in_array;
 
-class ActivityUsersJobAggregator implements AggregatorInterface
+class ActivityUsersJobAggregator implements \Chill\MainBundle\Export\AggregatorInterface
 {
-    private const PREFIX = 'act_agg_user_job';
+    private TranslatableStringHelperInterface $translatableStringHelper;
 
-    public function __construct(
-        private readonly UserJobRepositoryInterface $userJobRepository,
-        private readonly TranslatableStringHelperInterface $translatableStringHelper
-    ) {}
+    private UserJobRepositoryInterface $userJobRepository;
+
+    public function __construct(UserJobRepositoryInterface $userJobRepository, TranslatableStringHelperInterface $translatableStringHelper)
+    {
+        $this->userJobRepository = $userJobRepository;
+        $this->translatableStringHelper = $translatableStringHelper;
+    }
 
     public function addRole(): ?string
     {
@@ -36,37 +37,24 @@ class ActivityUsersJobAggregator implements AggregatorInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        $p = self::PREFIX;
+        if (!in_array('actusers', $qb->getAllAliases(), true)) {
+            $qb->leftJoin('activity.users', 'actusers');
+        }
 
         $qb
-            ->leftJoin('activity.users', "{$p}_user")
-            ->leftJoin(
-                UserJobHistory::class,
-                "{$p}_history",
-                Expr\Join::WITH,
-                $qb->expr()->eq("{$p}_history.user", "{$p}_user")
-            )
-            // job_at based on activity.date
-            ->andWhere(
-                $qb->expr()->andX(
-                    $qb->expr()->lte("{$p}_history.startDate", 'activity.date'),
-                    $qb->expr()->orX(
-                        $qb->expr()->isNull("{$p}_history.endDate"),
-                        $qb->expr()->gt("{$p}_history.endDate", 'activity.date')
-                    )
-                )
-            )
-            ->addSelect("IDENTITY({$p}_history.job) AS {$p}_select")
-            ->addGroupBy("{$p}_select");
+            ->addSelect('IDENTITY(actusers.userJob) AS activity_users_job_aggregator')
+            ->addGroupBy('activity_users_job_aggregator');
     }
 
-    public function applyOn(): string
+    public function applyOn()
     {
         return Declarations::ACTIVITY;
     }
 
-    public function buildForm(FormBuilderInterface $builder) {}
-
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        // nothing to add in the form
+    }
     public function getFormDefaultData(): array
     {
         return [];
@@ -93,11 +81,11 @@ class ActivityUsersJobAggregator implements AggregatorInterface
 
     public function getQueryKeys($data): array
     {
-        return [self::PREFIX.'_select'];
+        return ['activity_users_job_aggregator'];
     }
 
-    public function getTitle(): string
+    public function getTitle()
     {
-        return 'export.aggregator.activity.by_user_job.Aggregate by users job';
+        return 'Aggregate by users job';
     }
 }

src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityUsersScopeAggregator.php

@@ -12,22 +12,23 @@ declare(strict_types=1);
 namespace Chill\ActivityBundle\Export\Aggregator;
 
 use Chill\ActivityBundle\Export\Declarations;
-use Chill\MainBundle\Entity\User\UserScopeHistory;
-use Chill\MainBundle\Export\AggregatorInterface;
 use Chill\MainBundle\Repository\ScopeRepositoryInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
-use Doctrine\ORM\Query\Expr;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
+use function in_array;
 
-class ActivityUsersScopeAggregator implements AggregatorInterface
+class ActivityUsersScopeAggregator implements \Chill\MainBundle\Export\AggregatorInterface
 {
-    private const PREFIX = 'act_agg_user_scope';
+    private ScopeRepositoryInterface $scopeRepository;
 
-    public function __construct(
-        private readonly ScopeRepositoryInterface $scopeRepository,
-        private readonly TranslatableStringHelperInterface $translatableStringHelper
-    ) {}
+    private TranslatableStringHelperInterface $translatableStringHelper;
+
+    public function __construct(ScopeRepositoryInterface $scopeRepository, TranslatableStringHelperInterface $translatableStringHelper)
+    {
+        $this->scopeRepository = $scopeRepository;
+        $this->translatableStringHelper = $translatableStringHelper;
+    }
 
     public function addRole(): ?string
     {
@@ -36,37 +37,24 @@ class ActivityUsersScopeAggregator implements AggregatorInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        $p = self::PREFIX;
+        if (!in_array('actusers', $qb->getAllAliases(), true)) {
+            $qb->leftJoin('activity.users', 'actusers');
+        }
 
         $qb
-            ->leftJoin('activity.users', "{$p}_user")
-            ->leftJoin(
-                UserScopeHistory::class,
-                "{$p}_history",
-                Expr\Join::WITH,
-                $qb->expr()->eq("{$p}_history.user", "{$p}_user")
-            )
-            // scope_at based on activity.date
-            ->andWhere(
-                $qb->expr()->andX(
-                    $qb->expr()->lte("{$p}_history.startDate", 'activity.date'),
-                    $qb->expr()->orX(
-                        $qb->expr()->isNull("{$p}_history.endDate"),
-                        $qb->expr()->gt("{$p}_history.endDate", 'activity.date')
-                    )
-                )
-            )
-            ->addSelect("IDENTITY({$p}_history.scope) AS {$p}_select")
-            ->addGroupBy("{$p}_select");
+            ->addSelect('IDENTITY(actusers.mainScope) AS activity_users_main_scope_aggregator')
+            ->addGroupBy('activity_users_main_scope_aggregator');
     }
 
-    public function applyOn(): string
+    public function applyOn()
     {
         return Declarations::ACTIVITY;
     }
 
-    public function buildForm(FormBuilderInterface $builder) {}
-
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        // nothing to add in the form
+    }
     public function getFormDefaultData(): array
     {
         return [];
@@ -93,11 +81,11 @@ class ActivityUsersScopeAggregator implements AggregatorInterface
 
     public function getQueryKeys($data): array
     {
-        return [self::PREFIX.'_select'];
+        return ['activity_users_main_scope_aggregator'];
     }
 
-    public function getTitle(): string
+    public function getTitle()
     {
-        return 'export.aggregator.activity.by_user_scope.Aggregate by users scope';
+        return 'Aggregate by users scope';
     }
 }

src/Bundle/ChillActivityBundle/Export/Aggregator/JobScopeAggregator.php

@@ -1,103 +0,0 @@
-<?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\Aggregator;
-
-use Chill\ActivityBundle\Export\Declarations;
-use Chill\MainBundle\Entity\User\UserJobHistory;
-use Chill\MainBundle\Export\AggregatorInterface;
-use Chill\MainBundle\Repository\ScopeRepository;
-use Chill\MainBundle\Templating\TranslatableStringHelper;
-use Doctrine\ORM\Query\Expr\Join;
-use Doctrine\ORM\QueryBuilder;
-use Symfony\Component\Form\FormBuilderInterface;
-
-class JobScopeAggregator implements AggregatorInterface
-{
-    private const PREFIX = 'acp_agg_creator_job';
-
-    public function __construct(
-        private readonly ScopeRepository $scopeRepository,
-        private readonly TranslatableStringHelper $translatableStringHelper
-    ) {}
-
-    public function addRole(): ?string
-    {
-        return null;
-    }
-
-    public function alterQuery(QueryBuilder $qb, $data)
-    {
-        $p = self::PREFIX;
-
-        $qb
-            ->leftJoin('activity.createdBy', "{$p}_user")
-            ->leftJoin(
-                UserJobHistory::class,
-                "{$p}_history",
-                Join::WITH,
-                $qb->expr()->eq("{$p}_history.user", "{$p}_user")
-            )
-            // job_at based on activity.date
-            ->andWhere(
-                $qb->expr()->andX(
-                    $qb->expr()->lte("{$p}_history.startDate", 'activity.date'),
-                    $qb->expr()->orX(
-                        $qb->expr()->isNull("{$p}_history.endDate"),
-                        $qb->expr()->gt("{$p}_history.endDate", 'activity.date')
-                    )
-                )
-            )
-            ->addSelect("IDENTITY({$p}_history.job) AS {$p}_select")
-            ->addGroupBy("{$p}_select");
-    }
-
-    public function applyOn(): string
-    {
-        return Declarations::ACTIVITY;
-    }
-
-    public function buildForm(FormBuilderInterface $builder) {}
-
-    public function getFormDefaultData(): array
-    {
-        return [];
-    }
-
-    public function getLabels($key, array $values, $data)
-    {
-        return function ($value): string {
-            if ('_header' === $value) {
-                return 'Scope';
-            }
-
-            if (null === $value || '' === $value) {
-                return '';
-            }
-
-            $s = $this->scopeRepository->find($value);
-
-            return $this->translatableStringHelper->localize(
-                $s->getName()
-            );
-        };
-    }
-
-    public function getQueryKeys($data): array
-    {
-        return [self::PREFIX.'_select'];
-    }
-
-    public function getTitle(): string
-    {
-        return 'export.aggregator.activity.by_creator_job.Group activity by creator job';
-    }
-}

src/Bundle/ChillActivityBundle/Export/Aggregator/PersonAggregators/ActivityReasonAggregator.php

@@ -17,15 +17,34 @@ use Chill\ActivityBundle\Repository\ActivityReasonRepository;
 use Chill\MainBundle\Export\AggregatorInterface;
 use Chill\MainBundle\Export\ExportElementValidatedInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use Doctrine\ORM\Query\Expr\Join;
 use Doctrine\ORM\QueryBuilder;
+use RuntimeException;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
 
+use function count;
+use function in_array;
+
 class ActivityReasonAggregator implements AggregatorInterface, ExportElementValidatedInterface
 {
-    public function __construct(protected ActivityReasonCategoryRepository $activityReasonCategoryRepository, protected ActivityReasonRepository $activityReasonRepository, protected TranslatableStringHelper $translatableStringHelper) {}
+    protected ActivityReasonCategoryRepository $activityReasonCategoryRepository;
+
+    protected ActivityReasonRepository $activityReasonRepository;
+
+    protected TranslatableStringHelperInterface $translatableStringHelper;
+
+    public function __construct(
+        ActivityReasonCategoryRepository $activityReasonCategoryRepository,
+        ActivityReasonRepository $activityReasonRepository,
+        TranslatableStringHelper $translatableStringHelper
+    ) {
+        $this->activityReasonCategoryRepository = $activityReasonCategoryRepository;
+        $this->activityReasonRepository = $activityReasonRepository;
+        $this->translatableStringHelper = $translatableStringHelper;
+    }
 
     public function addRole(): ?string
     {
@@ -42,20 +61,20 @@ class ActivityReasonAggregator implements AggregatorInterface, ExportElementVali
             $elem = 'actreasoncat.id';
             $alias = 'activity_categories_id';
         } else {
-            throw new \RuntimeException('The data provided are not recognized.');
+            throw new RuntimeException('The data provided are not recognized.');
         }
 
-        $qb->addSelect($elem.' as '.$alias);
+        $qb->addSelect($elem . ' as ' . $alias);
 
         // make a jointure only if needed
-        if (!\in_array('actreasons', $qb->getAllAliases(), 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 (!\in_array('actreasoncat', $qb->getAllAliases(), true)) {
+            if (!in_array('actreasoncat', $qb->getAllAliases(), true)) {
                 $qb->join('actreasons.category', 'actreasoncat');
             }
         }
@@ -63,7 +82,7 @@ class ActivityReasonAggregator implements AggregatorInterface, ExportElementVali
         // add the "group by" part
         $groupBy = $qb->getDQLPart('groupBy');
 
-        if (\count($groupBy) > 0) {
+        if (count($groupBy) > 0) {
             $qb->addGroupBy($alias);
         } else {
             $qb->groupBy($alias);
@@ -91,7 +110,6 @@ class ActivityReasonAggregator implements AggregatorInterface, ExportElementVali
             ]
         );
     }
-
     public function getFormDefaultData(): array
     {
         return [];
@@ -99,11 +117,21 @@ class ActivityReasonAggregator implements AggregatorInterface, ExportElementVali
 
     public function getLabels($key, array $values, $data)
     {
-        match ($data['level']) {
-            'reasons' => $this->activityReasonRepository->findBy(['id' => $values]),
-            'categories' => $this->activityReasonCategoryRepository->findBy(['id' => $values]),
-            default => throw new \RuntimeException(sprintf("The level data '%s' is invalid.", $data['level'])),
-        };
+        // for performance reason, we load data from db only once
+        switch ($data['level']) {
+            case 'reasons':
+                $this->activityReasonRepository->findBy(['id' => $values]);
+
+                break;
+
+            case 'categories':
+                $this->activityReasonCategoryRepository->findBy(['id' => $values]);
+
+                break;
+
+            default:
+                throw new RuntimeException(sprintf("The level data '%s' is invalid.", $data['level']));
+        }
 
         return function ($value) use ($data) {
             if ('_header' === $value) {
@@ -143,7 +171,7 @@ class ActivityReasonAggregator implements AggregatorInterface, ExportElementVali
             return ['activity_categories_id'];
         }
 
-        throw new \RuntimeException('The data provided are not recognised.');
+        throw new RuntimeException('The data provided are not recognised.');
     }
 
     public function getTitle()

src/Bundle/ChillActivityBundle/Export/Aggregator/SentReceivedAggregator.php

@@ -14,12 +14,18 @@ namespace Chill\ActivityBundle\Export\Aggregator;
 use Chill\ActivityBundle\Export\Declarations;
 use Chill\MainBundle\Export\AggregatorInterface;
 use Doctrine\ORM\QueryBuilder;
+use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
 class SentReceivedAggregator implements AggregatorInterface
 {
-    public function __construct(private readonly TranslatorInterface $translator) {}
+    private TranslatorInterface $translator;
+
+    public function __construct(TranslatorInterface $translator)
+    {
+        $this->translator = $translator;
+    }
 
     public function addRole(): ?string
     {
@@ -41,7 +47,6 @@ class SentReceivedAggregator implements AggregatorInterface
     {
         // No form needed
     }
-
     public function getFormDefaultData(): array
     {
         return [];
@@ -66,7 +71,7 @@ class SentReceivedAggregator implements AggregatorInterface
                     return $this->translator->trans('export.aggregator.activity.by_sent_received.is received');
 
                 default:
-                    throw new \LogicException(sprintf('The value %s is not valid', $value));
+                    throw new LogicException(sprintf('The value %s is not valid', $value));
             }
         };
     }

src/Bundle/ChillActivityBundle/Export/Declarations.php

@@ -16,9 +16,9 @@ namespace Chill\ActivityBundle\Export;
  */
 abstract class Declarations
 {
-    final public const ACTIVITY = 'activity';
+    public const ACTIVITY = 'activity';
 
-    final public const ACTIVITY_ACP = 'activity_linked_to_acp';
+    public const ACTIVITY_ACP = 'activity_linked_to_acp';
 
-    final public const ACTIVITY_PERSON = 'activity_linked_to_person';
+    public const ACTIVITY_PERSON = 'activity_linked_to_person';
 }

src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/AvgActivityDuration.php

@@ -14,7 +14,6 @@ namespace Chill\ActivityBundle\Export\Export\LinkedToACP;
 use Chill\ActivityBundle\Entity\Activity;
 use Chill\ActivityBundle\Export\Declarations;
 use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
-use Chill\MainBundle\Export\AccompanyingCourseExportHelper;
 use Chill\MainBundle\Export\ExportInterface;
 use Chill\MainBundle\Export\FormatterInterface;
 use Chill\MainBundle\Export\GroupedExportInterface;
@@ -24,6 +23,7 @@ use Chill\PersonBundle\Export\Declarations as PersonDeclarations;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\Query;
+use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
 
 class AvgActivityDuration implements ExportInterface, GroupedExportInterface
@@ -31,13 +31,14 @@ class AvgActivityDuration implements ExportInterface, GroupedExportInterface
     protected EntityRepository $repository;
 
     public function __construct(
-        EntityManagerInterface $em,
+        EntityManagerInterface $em
     ) {
         $this->repository = $em->getRepository(Activity::class);
     }
 
-    public function buildForm(FormBuilderInterface $builder) {}
-
+    public function buildForm(FormBuilderInterface $builder)
+    {
+    }
     public function getFormDefaultData(): array
     {
         return [];
@@ -61,7 +62,7 @@ class AvgActivityDuration implements ExportInterface, GroupedExportInterface
     public function getLabels($key, array $values, $data)
     {
         if ('export_avg_activity_duration' !== $key) {
-            throw new \LogicException("the key {$key} is not used by this export");
+            throw new LogicException("the key {$key} is not used by this export");
         }
 
         return static fn ($value) => '_header' === $value ? 'Average activities linked to an accompanying period duration' : $value;
@@ -101,16 +102,14 @@ class AvgActivityDuration implements ExportInterface, GroupedExportInterface
         $qb
             ->andWhere(
                 $qb->expr()->exists(
-                    'SELECT 1 FROM '.AccompanyingPeriodParticipation::class.' acl_count_part
-                    JOIN '.PersonCenterHistory::class.' acl_count_person_history WITH IDENTITY(acl_count_person_history.person) = IDENTITY(acl_count_part.person)
+                    'SELECT 1 FROM ' . AccompanyingPeriodParticipation::class . ' acl_count_part
+                    JOIN ' . PersonCenterHistory::class . ' acl_count_person_history WITH IDENTITY(acl_count_person_history.person) = IDENTITY(acl_count_part.person)
                     WHERE acl_count_part.accompanyingPeriod = acp.id AND acl_count_person_history.center IN (:authorized_centers)
                     '
                 )
             )
             ->setParameter('authorized_centers', $centers);
 
-        AccompanyingCourseExportHelper::addClosingMotiveExclusionClause($qb);
-
         return $qb;
     }
 

src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/AvgActivityVisitDuration.php

@@ -14,7 +14,6 @@ namespace Chill\ActivityBundle\Export\Export\LinkedToACP;
 use Chill\ActivityBundle\Entity\Activity;
 use Chill\ActivityBundle\Export\Declarations;
 use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
-use Chill\MainBundle\Export\AccompanyingCourseExportHelper;
 use Chill\MainBundle\Export\ExportInterface;
 use Chill\MainBundle\Export\FormatterInterface;
 use Chill\MainBundle\Export\GroupedExportInterface;
@@ -24,6 +23,7 @@ use Chill\PersonBundle\Export\Declarations as PersonDeclarations;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\Query;
+use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
 
 class AvgActivityVisitDuration implements ExportInterface, GroupedExportInterface
@@ -31,7 +31,7 @@ class AvgActivityVisitDuration implements ExportInterface, GroupedExportInterfac
     protected EntityRepository $repository;
 
     public function __construct(
-        EntityManagerInterface $em,
+        EntityManagerInterface $em
     ) {
         $this->repository = $em->getRepository(Activity::class);
     }
@@ -40,7 +40,6 @@ class AvgActivityVisitDuration implements ExportInterface, GroupedExportInterfac
     {
         // TODO: Implement buildForm() method.
     }
-
     public function getFormDefaultData(): array
     {
         return [];
@@ -64,7 +63,7 @@ class AvgActivityVisitDuration implements ExportInterface, GroupedExportInterfac
     public function getLabels($key, array $values, $data)
     {
         if ('export_avg_activity_visit_duration' !== $key) {
-            throw new \LogicException("the key {$key} is not used by this export");
+            throw new LogicException("the key {$key} is not used by this export");
         }
 
         return static fn ($value) => '_header' === $value ? 'Average activities linked to an accompanying period visit duration' : $value;
@@ -104,16 +103,14 @@ class AvgActivityVisitDuration implements ExportInterface, GroupedExportInterfac
         $qb
             ->andWhere(
                 $qb->expr()->exists(
-                    'SELECT 1 FROM '.AccompanyingPeriodParticipation::class.' acl_count_part
-                    JOIN '.PersonCenterHistory::class.' acl_count_person_history WITH IDENTITY(acl_count_person_history.person) = IDENTITY(acl_count_part.person)
+                    'SELECT 1 FROM ' . AccompanyingPeriodParticipation::class . ' acl_count_part
+                    JOIN ' . PersonCenterHistory::class . ' acl_count_person_history WITH IDENTITY(acl_count_person_history.person) = IDENTITY(acl_count_part.person)
                     WHERE acl_count_part.accompanyingPeriod = acp.id AND acl_count_person_history.center IN (:authorized_centers)
                     '
                 )
             )
             ->setParameter('authorized_centers', $centers);
 
-        AccompanyingCourseExportHelper::addClosingMotiveExclusionClause($qb);
-
         return $qb;
     }
 

src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/CountActivity.php

@@ -14,7 +14,6 @@ namespace Chill\ActivityBundle\Export\Export\LinkedToACP;
 use Chill\ActivityBundle\Entity\Activity;
 use Chill\ActivityBundle\Export\Declarations;
 use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
-use Chill\MainBundle\Export\AccompanyingCourseExportHelper;
 use Chill\MainBundle\Export\ExportInterface;
 use Chill\MainBundle\Export\FormatterInterface;
 use Chill\MainBundle\Export\GroupedExportInterface;
@@ -24,6 +23,7 @@ use Chill\PersonBundle\Export\Declarations as PersonDeclarations;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\Query;
+use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
 
 class CountActivity implements ExportInterface, GroupedExportInterface
@@ -31,13 +31,14 @@ class CountActivity implements ExportInterface, GroupedExportInterface
     protected EntityRepository $repository;
 
     public function __construct(
-        EntityManagerInterface $em,
+        EntityManagerInterface $em
     ) {
         $this->repository = $em->getRepository(Activity::class);
     }
 
-    public function buildForm(FormBuilderInterface $builder) {}
-
+    public function buildForm(FormBuilderInterface $builder)
+    {
+    }
     public function getFormDefaultData(): array
     {
         return [];
@@ -61,7 +62,7 @@ class CountActivity implements ExportInterface, GroupedExportInterface
     public function getLabels($key, array $values, $data)
     {
         if ('export_count_activity' !== $key) {
-            throw new \LogicException("the key {$key} is not used by this export");
+            throw new LogicException("the key {$key} is not used by this export");
         }
 
         return static fn ($value) => '_header' === $value ? 'Number of activities linked to an accompanying period' : $value;
@@ -98,16 +99,14 @@ class CountActivity implements ExportInterface, GroupedExportInterface
         $qb
             ->andWhere(
                 $qb->expr()->exists(
-                    'SELECT 1 FROM '.AccompanyingPeriodParticipation::class.' acl_count_part
-                    JOIN '.PersonCenterHistory::class.' acl_count_person_history WITH IDENTITY(acl_count_person_history.person) = IDENTITY(acl_count_part.person)
+                    'SELECT 1 FROM ' . AccompanyingPeriodParticipation::class . ' acl_count_part
+                    JOIN ' . PersonCenterHistory::class . ' acl_count_person_history WITH IDENTITY(acl_count_person_history.person) = IDENTITY(acl_count_part.person)
                     WHERE acl_count_part.accompanyingPeriod = acp.id AND acl_count_person_history.center IN (:authorized_centers)
                     '
                 )
             )
             ->setParameter('authorized_centers', $centers);
 
-        AccompanyingCourseExportHelper::addClosingMotiveExclusionClause($qb);
-
         $qb->select('COUNT(DISTINCT activity.id) as export_count_activity');
 
         return $qb;

src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/ListActivity.php

@@ -12,11 +12,9 @@ declare(strict_types=1);
 namespace Chill\ActivityBundle\Export\Export\LinkedToACP;
 
 use Chill\ActivityBundle\Entity\Activity;
-use Chill\ActivityBundle\Export\Declarations;
 use Chill\ActivityBundle\Export\Export\ListActivityHelper;
 use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
 use Chill\MainBundle\Entity\Scope;
-use Chill\MainBundle\Export\AccompanyingCourseExportHelper;
 use Chill\MainBundle\Export\GroupedExportInterface;
 use Chill\MainBundle\Export\Helper\TranslatableStringExportLabelHelper;
 use Chill\MainBundle\Export\ListInterface;
@@ -26,13 +24,26 @@ use Symfony\Component\Form\FormBuilderInterface;
 
 class ListActivity implements ListInterface, GroupedExportInterface
 {
-    public function __construct(private readonly ListActivityHelper $helper, private readonly EntityManagerInterface $entityManager, private readonly TranslatableStringExportLabelHelper $translatableStringExportLabelHelper) {}
+    private EntityManagerInterface $entityManager;
+
+    private ListActivityHelper $helper;
+
+    private TranslatableStringExportLabelHelper $translatableStringExportLabelHelper;
+
+    public function __construct(
+        ListActivityHelper $helper,
+        EntityManagerInterface $entityManager,
+        TranslatableStringExportLabelHelper $translatableStringExportLabelHelper
+    ) {
+        $this->helper = $helper;
+        $this->entityManager = $entityManager;
+        $this->translatableStringExportLabelHelper = $translatableStringExportLabelHelper;
+    }
 
     public function buildForm(FormBuilderInterface $builder)
     {
         $this->helper->buildForm($builder);
     }
-
     public function getFormDefaultData(): array
     {
         return [];
@@ -45,7 +56,7 @@ class ListActivity implements ListInterface, GroupedExportInterface
 
     public function getDescription()
     {
-        return ListActivityHelper::MSG_KEY.'List activities linked to an accompanying course';
+        return ListActivityHelper::MSG_KEY . 'List activities linked to an accompanying course';
     }
 
     public function getGroup(): string
@@ -55,17 +66,22 @@ class ListActivity implements ListInterface, GroupedExportInterface
 
     public function getLabels($key, array $values, $data)
     {
-        return match ($key) {
-            'acpId' => static function ($value) {
-                if ('_header' === $value) {
-                    return ListActivityHelper::MSG_KEY.'accompanying course id';
-                }
+        switch ($key) {
+            case 'acpId':
+                return static function ($value) {
+                    if ('_header' === $value) {
+                        return ListActivityHelper::MSG_KEY . 'accompanying course id';
+                    }
 
-                return $value ?? '';
-            },
-            'scopesNames' => $this->translatableStringExportLabelHelper->getLabelMulti($key, $values, ListActivityHelper::MSG_KEY.'course circles'),
-            default => $this->helper->getLabels($key, $values, $data),
-        };
+                    return $value ?? '';
+                };
+
+            case 'scopesNames':
+                return $this->translatableStringExportLabelHelper->getLabelMulti($key, $values, ListActivityHelper::MSG_KEY . 'course circles');
+
+            default:
+                return $this->helper->getLabels($key, $values, $data);
+        }
     }
 
     public function getQueryKeys($data)
@@ -87,7 +103,7 @@ class ListActivity implements ListInterface, GroupedExportInterface
 
     public function getTitle()
     {
-        return ListActivityHelper::MSG_KEY.'List activity linked to a course';
+        return ListActivityHelper::MSG_KEY . 'List activity linked to a course';
     }
 
     public function getType()
@@ -111,7 +127,7 @@ class ListActivity implements ListInterface, GroupedExportInterface
             ->andWhere(
                 $qb->expr()->exists(
                     'SELECT 1
-                    FROM '.PersonCenterHistory::class.' acl_count_person_history
+                    FROM ' . PersonCenterHistory::class . ' acl_count_person_history
                     WHERE acl_count_person_history.person = person
                     AND acl_count_person_history.center IN (:authorized_centers)
                     '
@@ -128,11 +144,9 @@ class ListActivity implements ListInterface, GroupedExportInterface
         // add select for this step
         $qb
             ->addSelect('acp.id AS acpId')
-            ->addSelect('(SELECT AGGREGATE(acpScope.name) FROM '.Scope::class.' acpScope WHERE acpScope MEMBER OF acp.scopes) AS scopesNames')
+            ->addSelect('(SELECT AGGREGATE(acpScope.name) FROM ' . Scope::class . ' acpScope WHERE acpScope MEMBER OF acp.scopes) AS scopesNames')
             ->addGroupBy('scopesNames');
 
-        AccompanyingCourseExportHelper::addClosingMotiveExclusionClause($qb);
-
         return $qb;
     }
 
@@ -146,7 +160,6 @@ class ListActivity implements ListInterface, GroupedExportInterface
         return array_merge(
             $this->helper->supportsModifiers(),
             [
-                Declarations::ACTIVITY,
                 \Chill\PersonBundle\Export\Declarations::ACP_TYPE,
             ]
         );

src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/SumActivityDuration.php

@@ -14,7 +14,6 @@ namespace Chill\ActivityBundle\Export\Export\LinkedToACP;
 use Chill\ActivityBundle\Entity\Activity;
 use Chill\ActivityBundle\Export\Declarations;
 use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
-use Chill\MainBundle\Export\AccompanyingCourseExportHelper;
 use Chill\MainBundle\Export\ExportInterface;
 use Chill\MainBundle\Export\FormatterInterface;
 use Chill\MainBundle\Export\GroupedExportInterface;
@@ -24,6 +23,7 @@ use Chill\PersonBundle\Export\Declarations as PersonDeclarations;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\Query;
+use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
 
 class SumActivityDuration implements ExportInterface, GroupedExportInterface
@@ -31,7 +31,7 @@ class SumActivityDuration implements ExportInterface, GroupedExportInterface
     protected EntityRepository $repository;
 
     public function __construct(
-        EntityManagerInterface $em,
+        EntityManagerInterface $em
     ) {
         $this->repository = $em->getRepository(Activity::class);
     }
@@ -40,7 +40,6 @@ class SumActivityDuration implements ExportInterface, GroupedExportInterface
     {
         // TODO: Implement buildForm() method.
     }
-
     public function getFormDefaultData(): array
     {
         return [];
@@ -64,7 +63,7 @@ class SumActivityDuration implements ExportInterface, GroupedExportInterface
     public function getLabels($key, array $values, $data)
     {
         if ('export_sum_activity_duration' !== $key) {
-            throw new \LogicException("the key {$key} is not used by this export");
+            throw new LogicException("the key {$key} is not used by this export");
         }
 
         return static fn ($value) => '_header' === $value ? 'Sum activities linked to an accompanying period duration' : $value;
@@ -104,16 +103,14 @@ class SumActivityDuration implements ExportInterface, GroupedExportInterface
         $qb
             ->andWhere(
                 $qb->expr()->exists(
-                    'SELECT 1 FROM '.AccompanyingPeriodParticipation::class.' acl_count_part
-                    JOIN '.PersonCenterHistory::class.' acl_count_person_history WITH IDENTITY(acl_count_person_history.person) = IDENTITY(acl_count_part.person)
+                    'SELECT 1 FROM ' . AccompanyingPeriodParticipation::class . ' acl_count_part
+                    JOIN ' . PersonCenterHistory::class . ' acl_count_person_history WITH IDENTITY(acl_count_person_history.person) = IDENTITY(acl_count_part.person)
                     WHERE acl_count_part.accompanyingPeriod = acp.id AND acl_count_person_history.center IN (:authorized_centers)
                     '
                 )
             )
             ->setParameter('authorized_centers', $centers);
 
-        AccompanyingCourseExportHelper::addClosingMotiveExclusionClause($qb);
-
         return $qb;
     }
 

src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/SumActivityVisitDuration.php

@@ -14,7 +14,6 @@ namespace Chill\ActivityBundle\Export\Export\LinkedToACP;
 use Chill\ActivityBundle\Entity\Activity;
 use Chill\ActivityBundle\Export\Declarations;
 use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
-use Chill\MainBundle\Export\AccompanyingCourseExportHelper;
 use Chill\MainBundle\Export\ExportInterface;
 use Chill\MainBundle\Export\FormatterInterface;
 use Chill\MainBundle\Export\GroupedExportInterface;
@@ -24,6 +23,7 @@ use Chill\PersonBundle\Export\Declarations as PersonDeclarations;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\Query;
+use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
 
 class SumActivityVisitDuration implements ExportInterface, GroupedExportInterface
@@ -31,7 +31,7 @@ class SumActivityVisitDuration implements ExportInterface, GroupedExportInterfac
     protected EntityRepository $repository;
 
     public function __construct(
-        EntityManagerInterface $em,
+        EntityManagerInterface $em
     ) {
         $this->repository = $em->getRepository(Activity::class);
     }
@@ -40,7 +40,6 @@ class SumActivityVisitDuration implements ExportInterface, GroupedExportInterfac
     {
         // TODO: Implement buildForm() method.
     }
-
     public function getFormDefaultData(): array
     {
         return [];
@@ -64,7 +63,7 @@ class SumActivityVisitDuration implements ExportInterface, GroupedExportInterfac
     public function getLabels($key, array $values, $data)
     {
         if ('export_sum_activity_visit_duration' !== $key) {
-            throw new \LogicException("the key {$key} is not used by this export");
+            throw new LogicException("the key {$key} is not used by this export");
         }
 
         return static fn ($value) => '_header' === $value ? 'Sum activities linked to an accompanying period visit duration' : $value;
@@ -104,16 +103,14 @@ class SumActivityVisitDuration implements ExportInterface, GroupedExportInterfac
         $qb
             ->andWhere(
                 $qb->expr()->exists(
-                    'SELECT 1 FROM '.AccompanyingPeriodParticipation::class.' acl_count_part
-                    JOIN '.PersonCenterHistory::class.' acl_count_person_history WITH IDENTITY(acl_count_person_history.person) = IDENTITY(acl_count_part.person)
+                    'SELECT 1 FROM ' . AccompanyingPeriodParticipation::class . ' acl_count_part
+                    JOIN ' . PersonCenterHistory::class . ' acl_count_person_history WITH IDENTITY(acl_count_person_history.person) = IDENTITY(acl_count_part.person)
                     WHERE acl_count_part.accompanyingPeriod = acp.id AND acl_count_person_history.center IN (:authorized_centers)
                     '
                 )
             )
             ->setParameter('authorized_centers', $centers);
 
-        AccompanyingCourseExportHelper::addClosingMotiveExclusionClause($qb);
-
         return $qb;
     }
 

src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/CountActivity.php

@@ -19,14 +19,22 @@ use Chill\MainBundle\Export\FormatterInterface;
 use Chill\MainBundle\Export\GroupedExportInterface;
 use Chill\PersonBundle\Export\Declarations as PersonDeclarations;
 use Doctrine\ORM\Query;
+use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
 
 class CountActivity implements ExportInterface, GroupedExportInterface
 {
-    public function __construct(protected ActivityRepository $activityRepository) {}
+    protected ActivityRepository $activityRepository;
 
-    public function buildForm(FormBuilderInterface $builder) {}
+    public function __construct(
+        ActivityRepository $activityRepository
+    ) {
+        $this->activityRepository = $activityRepository;
+    }
 
+    public function buildForm(FormBuilderInterface $builder)
+    {
+    }
     public function getFormDefaultData(): array
     {
         return [];
@@ -50,7 +58,7 @@ class CountActivity implements ExportInterface, GroupedExportInterface
     public function getLabels($key, array $values, $data)
     {
         if ('export_count_activity' !== $key) {
-            throw new \LogicException("the key {$key} is not used by this export");
+            throw new LogicException("the key {$key} is not used by this export");
         }
 
         return static fn ($value) => '_header' === $value ? 'Number of activities linked to a person' : $value;

src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/ListActivity.php

@@ -20,6 +20,7 @@ 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;
@@ -29,8 +30,14 @@ use Symfony\Component\Validator\Constraints\Callback;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
+use function array_key_exists;
+use function count;
+use function in_array;
+
 class ListActivity implements ListInterface, GroupedExportInterface
 {
+    protected EntityManagerInterface $entityManager;
+
     protected array $fields = [
         'id',
         'date',
@@ -45,7 +52,23 @@ class ListActivity implements ListInterface, GroupedExportInterface
         'person_id',
     ];
 
-    public function __construct(protected EntityManagerInterface $entityManager, protected TranslatorInterface $translator, protected TranslatableStringHelperInterface $translatableStringHelper, private readonly ActivityRepository $activityRepository) {}
+    protected TranslatableStringHelperInterface $translatableStringHelper;
+
+    protected TranslatorInterface $translator;
+
+    private ActivityRepository $activityRepository;
+
+    public function __construct(
+        EntityManagerInterface $em,
+        TranslatorInterface $translator,
+        TranslatableStringHelperInterface $translatableStringHelper,
+        ActivityRepository $activityRepository
+    ) {
+        $this->entityManager = $em;
+        $this->translator = $translator;
+        $this->translatableStringHelper = $translatableStringHelper;
+        $this->activityRepository = $activityRepository;
+    }
 
     public function buildForm(FormBuilderInterface $builder)
     {
@@ -56,7 +79,7 @@ class ListActivity implements ListInterface, GroupedExportInterface
             'label' => 'Fields to include in export',
             'constraints' => [new Callback([
                 'callback' => static function ($selected, ExecutionContextInterface $context) {
-                    if (0 === \count($selected)) {
+                    if (count($selected) === 0) {
                         $context->buildViolation('You must select at least one element')
                             ->atPath('fields')
                             ->addViolation();
@@ -65,7 +88,6 @@ class ListActivity implements ListInterface, GroupedExportInterface
             ])],
         ]);
     }
-
     public function getFormDefaultData(): array
     {
         return [];
@@ -95,7 +117,7 @@ class ListActivity implements ListInterface, GroupedExportInterface
                         return 'date';
                     }
 
-                    $date = \DateTime::createFromFormat('Y-m-d H:i:s', $value);
+                    $date = DateTime::createFromFormat('Y-m-d H:i:s', $value);
 
                     return $date->format('d-m-Y');
                 };
@@ -119,11 +141,11 @@ class ListActivity implements ListInterface, GroupedExportInterface
 
                     $activity = $activityRepository->find($value);
 
-                    return implode(', ', array_map(fn (ActivityReason $r) => '"'.
+                    return implode(', ', array_map(fn (ActivityReason $r) => '"' .
                             $this->translatableStringHelper->localize($r->getCategory()->getName())
-                            .' > '.
+                            . ' > ' .
                             $this->translatableStringHelper->localize($r->getName())
-                            .'"', $activity->getReasons()->toArray()));
+                            . '"', $activity->getReasons()->toArray()));
                 };
 
             case 'circle_name':
@@ -132,7 +154,7 @@ class ListActivity implements ListInterface, GroupedExportInterface
                         return 'circle';
                     }
 
-                    return $this->translatableStringHelper->localize(json_decode((string) $value, true, 512, JSON_THROW_ON_ERROR));
+                    return $this->translatableStringHelper->localize(json_decode($value, true, 512, JSON_THROW_ON_ERROR));
                 };
 
             case 'type_name':
@@ -141,7 +163,7 @@ class ListActivity implements ListInterface, GroupedExportInterface
                         return 'activity type';
                     }
 
-                    return $this->translatableStringHelper->localize(json_decode((string) $value, true, 512, JSON_THROW_ON_ERROR));
+                    return $this->translatableStringHelper->localize(json_decode($value, true, 512, JSON_THROW_ON_ERROR));
                 };
 
             default:
@@ -180,7 +202,7 @@ class ListActivity implements ListInterface, GroupedExportInterface
         $centers = array_map(static fn ($el) => $el['center'], $acl);
 
         // throw an error if any fields are present
-        if (!\array_key_exists('fields', $data)) {
+        if (!array_key_exists('fields', $data)) {
             throw new InvalidArgumentException('Any fields have been checked.');
         }
 
@@ -204,7 +226,7 @@ class ListActivity implements ListInterface, GroupedExportInterface
             ->setParameter('centers', $centers);
 
         foreach ($this->fields as $f) {
-            if (\in_array($f, $data['fields'], true)) {
+            if (in_array($f, $data['fields'], true)) {
                 switch ($f) {
                     case 'id':
                         $qb->addSelect('activity.id AS id');
@@ -277,7 +299,7 @@ class ListActivity implements ListInterface, GroupedExportInterface
         return [
             Declarations::ACTIVITY,
             Declarations::ACTIVITY_PERSON,
-            PersonDeclarations::PERSON_TYPE,
+            //PersonDeclarations::PERSON_TYPE,
         ];
     }
 }

src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/StatActivityDuration.php

@@ -20,6 +20,7 @@ use Chill\MainBundle\Export\FormatterInterface;
 use Chill\MainBundle\Export\GroupedExportInterface;
 use Chill\PersonBundle\Export\Declarations as PersonDeclarations;
 use Doctrine\ORM\Query;
+use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
 
 /**
@@ -29,21 +30,29 @@ use Symfony\Component\Form\FormBuilderInterface;
  */
 class StatActivityDuration implements ExportInterface, GroupedExportInterface
 {
-    final public const SUM = 'sum';
+    public const SUM = 'sum';
+
+    /**
+     * The action for this report.
+     */
+    protected string $action;
+
+    private ActivityRepository $activityRepository;
 
     /**
      * @param string $action the stat to perform
      */
     public function __construct(
-        private readonly ActivityRepository $activityRepository,
-        /**
-         * The action for this report.
-         */
-        protected string $action = 'sum'
-    ) {}
-
-    public function buildForm(FormBuilderInterface $builder) {}
+        ActivityRepository $activityRepository,
+        string $action = 'sum'
+    ) {
+        $this->action = $action;
+        $this->activityRepository = $activityRepository;
+    }
 
+    public function buildForm(FormBuilderInterface $builder)
+    {
+    }
     public function getFormDefaultData(): array
     {
         return [];
@@ -60,7 +69,7 @@ class StatActivityDuration implements ExportInterface, GroupedExportInterface
             return 'Sum activities linked to a person duration by various parameters.';
         }
 
-        throw new \LogicException('this action is not supported: '.$this->action);
+        throw new LogicException('this action is not supported: ' . $this->action);
     }
 
     public function getGroup(): string
@@ -71,7 +80,7 @@ class StatActivityDuration implements ExportInterface, GroupedExportInterface
     public function getLabels($key, array $values, $data)
     {
         if ('export_stat_activity' !== $key) {
-            throw new \LogicException(sprintf('The key %s is not used by this export', $key));
+            throw new LogicException(sprintf('The key %s is not used by this export', $key));
         }
 
         $header = self::SUM === $this->action ? 'Sum activities linked to a person duration' : false;
@@ -95,7 +104,7 @@ class StatActivityDuration implements ExportInterface, GroupedExportInterface
             return 'Sum activity linked to a person duration';
         }
 
-        throw new \LogicException('This action is not supported: '.$this->action);
+        throw new LogicException('This action is not supported: ' . $this->action);
     }
 
     public function getType(): string
@@ -148,7 +157,7 @@ class StatActivityDuration implements ExportInterface, GroupedExportInterface
         return [
             Declarations::ACTIVITY,
             Declarations::ACTIVITY_PERSON,
-            PersonDeclarations::PERSON_TYPE,
+            //PersonDeclarations::PERSON_TYPE,
         ];
     }
 }

src/Bundle/ChillActivityBundle/Export/Export/ListActivityHelper.php

@@ -23,24 +23,54 @@ use Chill\PersonBundle\Export\Helper\LabelPersonHelper;
 use Chill\ThirdPartyBundle\Export\Helper\LabelThirdPartyHelper;
 use Doctrine\ORM\AbstractQuery;
 use Doctrine\ORM\QueryBuilder;
+use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
+use const SORT_NUMERIC;
 
 class ListActivityHelper
 {
-    final public const MSG_KEY = 'export.list.activity.';
+    public const MSG_KEY = 'export.list.activity.';
+
+    private ActivityPresenceRepositoryInterface $activityPresenceRepository;
+
+    private ActivityTypeRepositoryInterface $activityTypeRepository;
+
+    private DateTimeHelper $dateTimeHelper;
+
+    private LabelPersonHelper $labelPersonHelper;
+
+    private LabelThirdPartyHelper $labelThirdPartyHelper;
+
+    private TranslatableStringHelperInterface $translatableStringHelper;
+
+    private TranslatableStringExportLabelHelper $translatableStringLabelHelper;
+
+    private TranslatorInterface $translator;
+
+    private UserHelper $userHelper;
 
     public function __construct(
-        private readonly ActivityPresenceRepositoryInterface $activityPresenceRepository,
-        private readonly ActivityTypeRepositoryInterface $activityTypeRepository,
-        private readonly DateTimeHelper $dateTimeHelper,
-        private readonly LabelPersonHelper $labelPersonHelper,
-        private readonly LabelThirdPartyHelper $labelThirdPartyHelper,
-        private readonly TranslatorInterface $translator,
-        private readonly TranslatableStringHelperInterface $translatableStringHelper,
-        private readonly TranslatableStringExportLabelHelper $translatableStringLabelHelper,
-        private readonly UserHelper $userHelper
-    ) {}
+        ActivityPresenceRepositoryInterface $activityPresenceRepository,
+        ActivityTypeRepositoryInterface $activityTypeRepository,
+        DateTimeHelper $dateTimeHelper,
+        LabelPersonHelper $labelPersonHelper,
+        LabelThirdPartyHelper $labelThirdPartyHelper,
+        TranslatorInterface $translator,
+        TranslatableStringHelperInterface $translatableStringHelper,
+        TranslatableStringExportLabelHelper $translatableStringLabelHelper,
+        UserHelper $userHelper
+    ) {
+        $this->activityPresenceRepository = $activityPresenceRepository;
+        $this->activityTypeRepository = $activityTypeRepository;
+        $this->dateTimeHelper = $dateTimeHelper;
+        $this->labelPersonHelper = $labelPersonHelper;
+        $this->labelThirdPartyHelper = $labelThirdPartyHelper;
+        $this->translator = $translator;
+        $this->translatableStringHelper = $translatableStringHelper;
+        $this->translatableStringLabelHelper = $translatableStringLabelHelper;
+        $this->userHelper = $userHelper;
+    }
 
     public function addSelect(QueryBuilder $qb): void
     {
@@ -55,7 +85,7 @@ class ListActivityHelper
             ->addSelect('AGGREGATE(actPerson.id) AS personsNames')
             ->leftJoin('activity.users', 'users_u')
             ->addSelect('AGGREGATE(users_u.id) AS usersIds')
-            ->addSelect('AGGREGATE(JSON_BUILD_OBJECT(\'uid\', users_u.id, \'d\', activity.date)) AS usersNames')
+            ->addSelect('AGGREGATE(users_u.id) AS usersNames')
             ->leftJoin('activity.thirdParties', 'thirdparty')
             ->addSelect('AGGREGATE(thirdparty.id) AS thirdPartiesIds')
             ->addSelect('AGGREGATE(thirdparty.id) AS thirdPartiesNames')
@@ -66,15 +96,17 @@ class ListActivityHelper
             ->leftJoin('activity.location', 'location')
             ->addSelect('location.name AS locationName')
             ->addSelect('activity.sentReceived')
-            ->addSelect('JSON_BUILD_OBJECT(\'uid\', IDENTITY(activity.createdBy), \'d\', activity.createdAt) AS createdBy')
+            ->addSelect('IDENTITY(activity.createdBy) AS createdBy')
             ->addSelect('activity.createdAt')
-            ->addSelect('JSON_BUILD_OBJECT(\'uid\', IDENTITY(activity.updatedBy), \'d\', activity.updatedAt) AS updatedBy')
+            ->addSelect('IDENTITY(activity.updatedBy) AS updatedBy')
             ->addSelect('activity.updatedAt')
             ->addGroupBy('activity.id')
             ->addGroupBy('location.id');
     }
 
-    public function buildForm(FormBuilderInterface $builder) {}
+    public function buildForm(FormBuilderInterface $builder)
+    {
+    }
 
     public function getAllowedFormattersTypes()
     {
@@ -83,78 +115,113 @@ class ListActivityHelper
 
     public function getLabels($key, array $values, $data)
     {
-        return match ($key) {
-            'createdAt', 'updatedAt' => $this->dateTimeHelper->getLabel($key),
-            'createdBy', 'updatedBy' => $this->userHelper->getLabel($key, $values, $key),
-            'date' => $this->dateTimeHelper->getLabel(self::MSG_KEY.$key),
-            'attendeeName' => function ($value) {
-                if ('_header' === $value) {
-                    return 'Attendee';
-                }
+        switch ($key) {
+            case 'createdAt':
+            case 'updatedAt':
+                return $this->dateTimeHelper->getLabel($key);
 
-                if (null === $value || null === $presence = $this->activityPresenceRepository->find($value)) {
-                    return '';
-                }
+            case 'createdBy':
+            case 'updatedBy':
+                return $this->userHelper->getLabel($key, $values, $key);
 
-                return $this->translatableStringHelper->localize($presence->getName());
-            },
-            'listReasons' => $this->translatableStringLabelHelper->getLabelMulti($key, $values, 'Activity Reasons'),
-            'typeName' => function ($value) {
-                if ('_header' === $value) {
-                    return 'Activity type';
-                }
+            case 'date':
+                return $this->dateTimeHelper->getLabel(self::MSG_KEY . $key);
 
-                if (null === $value || null === $type = $this->activityTypeRepository->find($value)) {
-                    return '';
-                }
+            case 'attendeeName':
+                return function ($value) {
+                    if ('_header' === $value) {
+                        return 'Attendee';
+                    }
 
-                return $this->translatableStringHelper->localize($type->getName());
-            },
-            'usersNames' => $this->userHelper->getLabelMulti($key, $values, self::MSG_KEY.'users name'),
-            'usersIds', 'thirdPartiesIds', 'personsIds' => static function ($value) use ($key) {
-                if ('_header' === $value) {
-                    return match ($key) {
-                        'usersIds' => self::MSG_KEY.'users ids',
-                        'thirdPartiesIds' => self::MSG_KEY.'third parties ids',
-                        'personsIds' => self::MSG_KEY.'persons ids',
-                    };
-                }
+                    if (null === $value || null === $presence = $this->activityPresenceRepository->find($value)) {
+                        return '';
+                    }
 
-                $decoded = json_decode((string) $value, null, 512, JSON_THROW_ON_ERROR);
+                    return $this->translatableStringHelper->localize($presence->getName());
+                };
 
-                return implode(
-                    '|',
-                    array_unique(
-                        array_filter($decoded, static fn (?int $id) => null !== $id),
-                        \SORT_NUMERIC
-                    )
-                );
-            },
-            'personsNames' => $this->labelPersonHelper->getLabelMulti($key, $values, self::MSG_KEY.'persons name'),
-            'thirdPartiesNames' => $this->labelThirdPartyHelper->getLabelMulti($key, $values, self::MSG_KEY.'thirds parties'),
-            'sentReceived' => function ($value) {
-                if ('_header' === $value) {
-                    return self::MSG_KEY.'sent received';
-                }
+            case 'listReasons':
+                return $this->translatableStringLabelHelper->getLabelMulti($key, $values, 'Activity Reasons');
 
-                if (null === $value) {
-                    return '';
-                }
+            case 'typeName':
+                return function ($value) {
+                    if ('_header' === $value) {
+                        return 'Activity type';
+                    }
 
-                return $this->translator->trans($value);
-            },
-            default => function ($value) use ($key) {
-                if ('_header' === $value) {
-                    return self::MSG_KEY.$key;
-                }
+                    if (null === $value || null === $type = $this->activityTypeRepository->find($value)) {
+                        return '';
+                    }
 
-                if (null === $value) {
-                    return '';
-                }
+                    return $this->translatableStringHelper->localize($type->getName());
+                };
 
-                return $this->translator->trans($value);
-            },
-        };
+            case 'usersNames':
+                return $this->userHelper->getLabelMulti($key, $values, self::MSG_KEY . 'users name');
+
+            case 'usersIds':
+            case 'thirdPartiesIds':
+            case 'personsIds':
+                return static function ($value) use ($key) {
+                    if ('_header' === $value) {
+                        switch ($key) {
+                            case 'usersIds':
+                                return self::MSG_KEY . 'users ids';
+
+                            case 'thirdPartiesIds':
+                                return self::MSG_KEY . 'third parties ids';
+
+                            case 'personsIds':
+                                return self::MSG_KEY . 'persons ids';
+
+                            default:
+                                throw new LogicException('key not supported');
+                        }
+                    }
+
+                    $decoded = json_decode($value, null, 512, JSON_THROW_ON_ERROR);
+
+                    return implode(
+                        '|',
+                        array_unique(
+                            array_filter($decoded, static fn (?int $id) => null !== $id),
+                            SORT_NUMERIC
+                        )
+                    );
+                };
+
+            case 'personsNames':
+                return $this->labelPersonHelper->getLabelMulti($key, $values, self::MSG_KEY . 'persons name');
+
+            case 'thirdPartiesNames':
+                return $this->labelThirdPartyHelper->getLabelMulti($key, $values, self::MSG_KEY . 'thirds parties');
+
+            case 'sentReceived':
+                return function ($value) {
+                    if ('_header' === $value) {
+                        return self::MSG_KEY . 'sent received';
+                    }
+
+                    if (null === $value) {
+                        return '';
+                    }
+
+                    return $this->translator->trans($value);
+                };
+
+            default:
+                return function ($value) use ($key) {
+                    if ('_header' === $value) {
+                        return self::MSG_KEY . $key;
+                    }
+
+                    if (null === $value) {
+                        return '';
+                    }
+
+                    return $this->translator->trans($value);
+                };
+        }
     }
 
     public function getQueryKeys($data)

src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/ActivityTypeFilter.php

@@ -23,10 +23,17 @@ use Symfony\Component\Form\FormBuilderInterface;
 
 class ActivityTypeFilter implements FilterInterface
 {
+    private ActivityTypeRepositoryInterface $activityTypeRepository;
+
+    private TranslatableStringHelperInterface $translatableStringHelper;
+
     public function __construct(
-        private readonly ActivityTypeRepositoryInterface $activityTypeRepository,
-        private readonly TranslatableStringHelperInterface $translatableStringHelper
-    ) {}
+        ActivityTypeRepositoryInterface $activityTypeRepository,
+        TranslatableStringHelperInterface $translatableStringHelper
+    ) {
+        $this->activityTypeRepository = $activityTypeRepository;
+        $this->translatableStringHelper = $translatableStringHelper;
+    }
 
     public function addRole(): ?string
     {
@@ -35,13 +42,14 @@ class ActivityTypeFilter implements FilterInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        $qb->andWhere(
-            $qb->expr()->exists(
-                'SELECT 1 FROM '.Activity::class.' act_type_filter_activity
-                WHERE act_type_filter_activity.activityType IN (:act_type_filter_activity_types) AND act_type_filter_activity.accompanyingPeriod = acp'
-            )
-        );
-        $qb->setParameter('act_type_filter_activity_types', $data['accepted_activitytypes']);
+        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['accepted_activitytypes']);
     }
 
     public function applyOn()
@@ -54,14 +62,13 @@ class ActivityTypeFilter implements FilterInterface
         $builder->add('accepted_activitytypes', EntityType::class, [
             'class' => ActivityType::class,
             'choices' => $this->activityTypeRepository->findAllActive(),
-            'choice_label' => fn (ActivityType $aty) => ($aty->hasCategory() ? $this->translatableStringHelper->localize($aty->getCategory()->getName()).' > ' : '')
+            'choice_label' => fn (ActivityType $aty) => ($aty->hasCategory() ? $this->translatableStringHelper->localize($aty->getCategory()->getName()) . ' > ' : '')
             .
             $this->translatableStringHelper->localize($aty->getName()),
             'multiple' => true,
             'expanded' => true,
         ]);
     }
-
     public function getFormDefaultData(): array
     {
         return [];
@@ -75,7 +82,7 @@ class ActivityTypeFilter implements FilterInterface
             $types[] = $this->translatableStringHelper->localize($aty->getName());
         }
 
-        return ['export.filter.activity.acp_by_activity_type.acp_containing_at_least_one_%activitytypes%', [
+        return ['Filtered by activity types: only %activitytypes%', [
             '%activitytypes%' => implode(', ', $types),
         ]];
     }

src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/ByCreatorFilter.php

@@ -9,7 +9,7 @@ declare(strict_types=1);
  * the LICENSE file that was distributed with this source code.
  */
 
-namespace Chill\ActivityBundle\Export\Filter;
+namespace Chill\ActivityBundle\Export\Filter\ACPFilters;
 
 use Chill\ActivityBundle\Export\Declarations;
 use Chill\MainBundle\Export\FilterInterface;
@@ -20,7 +20,12 @@ use Symfony\Component\Form\FormBuilderInterface;
 
 class ByCreatorFilter implements FilterInterface
 {
-    public function __construct(private readonly UserRender $userRender) {}
+    private UserRender $userRender;
+
+    public function __construct(UserRender $userRender)
+    {
+        $this->userRender = $userRender;
+    }
 
     public function addRole(): ?string
     {
@@ -38,7 +43,7 @@ class ByCreatorFilter implements FilterInterface
 
     public function applyOn(): string
     {
-        return Declarations::ACTIVITY;
+        return Declarations::ACTIVITY_ACP;
     }
 
     public function buildForm(FormBuilderInterface $builder)
@@ -47,7 +52,6 @@ class ByCreatorFilter implements FilterInterface
             'multiple' => true,
         ]);
     }
-
     public function getFormDefaultData(): array
     {
         return [];

src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/BySocialActionFilter.php

@@ -18,10 +18,16 @@ use Chill\PersonBundle\Form\Type\PickSocialActionType;
 use Chill\PersonBundle\Templating\Entity\SocialActionRender;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
+use function in_array;
 
 class BySocialActionFilter implements FilterInterface
 {
-    public function __construct(private readonly SocialActionRender $actionRender) {}
+    private SocialActionRender $actionRender;
+
+    public function __construct(SocialActionRender $actionRender)
+    {
+        $this->actionRender = $actionRender;
+    }
 
     public function addRole(): ?string
     {
@@ -30,7 +36,7 @@ class BySocialActionFilter implements FilterInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!\in_array('actsocialaction', $qb->getAllAliases(), true)) {
+        if (!in_array('actsocialaction', $qb->getAllAliases(), true)) {
             $qb->join('activity.socialActions', 'actsocialaction');
         }
 
@@ -54,7 +60,6 @@ class BySocialActionFilter implements FilterInterface
             'multiple' => true,
         ]);
     }
-
     public function getFormDefaultData(): array
     {
         return [];

src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/BySocialIssueFilter.php

@@ -18,10 +18,16 @@ use Chill\PersonBundle\Form\Type\PickSocialIssueType;
 use Chill\PersonBundle\Templating\Entity\SocialIssueRender;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
+use function in_array;
 
 class BySocialIssueFilter implements FilterInterface
 {
-    public function __construct(private readonly SocialIssueRender $issueRender) {}
+    private SocialIssueRender $issueRender;
+
+    public function __construct(SocialIssueRender $issueRender)
+    {
+        $this->issueRender = $issueRender;
+    }
 
     public function addRole(): ?string
     {
@@ -30,7 +36,7 @@ class BySocialIssueFilter implements FilterInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!\in_array('actsocialissue', $qb->getAllAliases(), true)) {
+        if (!in_array('actsocialissue', $qb->getAllAliases(), true)) {
             $qb->join('activity.socialIssues', 'actsocialissue');
         }
 
@@ -54,7 +60,6 @@ class BySocialIssueFilter implements FilterInterface
             'multiple' => true,
         ]);
     }
-
     public function getFormDefaultData(): array
     {
         return [];

src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/EmergencyFilter.php

@@ -9,7 +9,7 @@ declare(strict_types=1);
  * the LICENSE file that was distributed with this source code.
  */
 
-namespace Chill\ActivityBundle\Export\Filter;
+namespace Chill\ActivityBundle\Export\Filter\ACPFilters;
 
 use Chill\ActivityBundle\Export\Declarations;
 use Chill\MainBundle\Export\FilterInterface;
@@ -22,13 +22,18 @@ use Symfony\Contracts\Translation\TranslatorInterface;
 class EmergencyFilter implements FilterInterface
 {
     private const CHOICES = [
-        'activity is emergency' => 'true',
-        'activity is not emergency' => 'false',
+        'activity is emergency' => true,
+        'activity is not emergency' => false,
     ];
 
-    private const DEFAULT_CHOICE = 'false';
+    private const DEFAULT_CHOICE = false;
 
-    public function __construct(private readonly TranslatorInterface $translator) {}
+    private TranslatorInterface $translator;
+
+    public function __construct(TranslatorInterface $translator)
+    {
+        $this->translator = $translator;
+    }
 
     public function addRole(): ?string
     {
@@ -53,7 +58,7 @@ class EmergencyFilter implements FilterInterface
 
     public function applyOn(): string
     {
-        return Declarations::ACTIVITY;
+        return Declarations::ACTIVITY_ACP;
     }
 
     public function buildForm(FormBuilderInterface $builder)
@@ -65,7 +70,6 @@ class EmergencyFilter implements FilterInterface
             'empty_data' => self::DEFAULT_CHOICE,
         ]);
     }
-
     public function getFormDefaultData(): array
     {
         return ['accepted_emergency' => self::DEFAULT_CHOICE];

src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/HasNoActivityFilter.php

@@ -17,9 +17,6 @@ use Chill\PersonBundle\Export\Declarations;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
 
-/**
- * Filter accompanying periods to keep only the one without any activity.
- */
 class HasNoActivityFilter implements FilterInterface
 {
     public function addRole(): ?string
@@ -32,7 +29,7 @@ class HasNoActivityFilter implements FilterInterface
         $qb
             ->andWhere('
                 NOT EXISTS (
-                    SELECT 1 FROM '.Activity::class.' activity
+                    SELECT 1 FROM ' . Activity::class . ' activity
                     WHERE activity.accompanyingPeriod = acp
                 )
             ');
@@ -45,9 +42,8 @@ class HasNoActivityFilter implements FilterInterface
 
     public function buildForm(FormBuilderInterface $builder)
     {
-        // no form needed
+        //no form needed
     }
-
     public function getFormDefaultData(): array
     {
         return [];

src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/LocationFilter.php

@@ -9,11 +9,12 @@ declare(strict_types=1);
  * the LICENSE file that was distributed with this source code.
  */
 
-namespace Chill\ActivityBundle\Export\Filter;
+namespace Chill\ActivityBundle\Export\Filter\ACPFilters;
 
 use Chill\ActivityBundle\Export\Declarations;
 use Chill\MainBundle\Export\FilterInterface;
 use Chill\MainBundle\Form\Type\PickUserLocationType;
+use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
 
@@ -35,7 +36,7 @@ class LocationFilter implements FilterInterface
 
     public function applyOn(): string
     {
-        return Declarations::ACTIVITY;
+        return Declarations::ACTIVITY_ACP;
     }
 
     public function buildForm(FormBuilderInterface $builder)
@@ -45,7 +46,6 @@ class LocationFilter implements FilterInterface
             'label' => 'pick location',
         ]);
     }
-
     public function getFormDefaultData(): array
     {
         return [];

src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/LocationTypeFilter.php

@@ -9,7 +9,7 @@ declare(strict_types=1);
  * the LICENSE file that was distributed with this source code.
  */
 
-namespace Chill\ActivityBundle\Export\Filter;
+namespace Chill\ActivityBundle\Export\Filter\ACPFilters;
 
 use Chill\ActivityBundle\Export\Declarations;
 use Chill\MainBundle\Export\FilterInterface;
@@ -18,10 +18,16 @@ use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Doctrine\ORM\Query\Expr\Andx;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
+use function in_array;
 
 class LocationTypeFilter implements FilterInterface
 {
-    public function __construct(private readonly TranslatableStringHelper $translatableStringHelper) {}
+    private TranslatableStringHelper $translatableStringHelper;
+
+    public function __construct(TranslatableStringHelper $translatableStringHelper)
+    {
+        $this->translatableStringHelper = $translatableStringHelper;
+    }
 
     public function addRole(): ?string
     {
@@ -30,7 +36,7 @@ class LocationTypeFilter implements FilterInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!\in_array('actloc', $qb->getAllAliases(), true)) {
+        if (!in_array('actloc', $qb->getAllAliases(), true)) {
             $qb->join('activity.location', 'actloc');
         }
 
@@ -49,17 +55,16 @@ class LocationTypeFilter implements FilterInterface
 
     public function applyOn(): string
     {
-        return Declarations::ACTIVITY;
+        return Declarations::ACTIVITY_ACP;
     }
 
     public function buildForm(FormBuilderInterface $builder)
     {
         $builder->add('accepted_locationtype', PickLocationTypeType::class, [
             'multiple' => true,
-            // 'label' => false,
+            //'label' => false,
         ]);
     }
-
     public function getFormDefaultData(): array
     {
         return [];

src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/PeriodHavingActivityBetweenDatesFilter.php

@@ -23,7 +23,8 @@ final readonly class PeriodHavingActivityBetweenDatesFilter implements FilterInt
 {
     public function __construct(
         private RollingDateConverterInterface $rollingDateConverter,
-    ) {}
+    ) {
+    }
 
     public function getTitle()
     {
@@ -34,10 +35,10 @@ final readonly class PeriodHavingActivityBetweenDatesFilter implements FilterInt
     {
         $builder
             ->add('start_date', PickRollingDateType::class, [
-                'label' => 'export.filter.activity.course_having_activity_between_date.Receiving an activity after',
+                'label' => 'export.filter.activity.course_having_activity_between_date.Receiving an activity after'
             ])
             ->add('end_date', PickRollingDateType::class, [
-                'label' => 'export.filter.activity.course_having_activity_between_date.Receiving an activity before',
+                'label' => 'export.filter.activity.course_having_activity_between_date.Receiving an activity before'
             ]);
     }
 
@@ -45,7 +46,7 @@ final readonly class PeriodHavingActivityBetweenDatesFilter implements FilterInt
     {
         return [
             'start_date' => new RollingDate(RollingDate::T_YEAR_CURRENT_START),
-            'end_date' => new RollingDate(RollingDate::T_TODAY),
+            'end_date' => new RollingDate(RollingDate::T_TODAY)
         ];
     }
 
@@ -56,7 +57,7 @@ final readonly class PeriodHavingActivityBetweenDatesFilter implements FilterInt
             [
                 'from' => $this->rollingDateConverter->convert($data['start_date']),
                 'to' => $this->rollingDateConverter->convert($data['end_date']),
-            ],
+            ]
         ];
     }
 
@@ -73,7 +74,7 @@ final readonly class PeriodHavingActivityBetweenDatesFilter implements FilterInt
 
         $qb->andWhere(
             $qb->expr()->exists(
-                'SELECT 1 FROM '.Activity::class." {$alias} WHERE {$alias}.date >= :{$from} AND {$alias}.date < :{$to} AND {$alias}.accompanyingPeriod = acp"
+                'SELECT 1 FROM ' . Activity::class . " {$alias} WHERE {$alias}.date >= :{$from} AND {$alias}.date < :{$to} AND {$alias}.accompanyingPeriod = acp"
             )
         );
 

src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/SentReceivedFilter.php

@@ -9,7 +9,7 @@ declare(strict_types=1);
  * the LICENSE file that was distributed with this source code.
  */
 
-namespace Chill\ActivityBundle\Export\Filter;
+namespace Chill\ActivityBundle\Export\Filter\ACPFilters;
 
 use Chill\ActivityBundle\Entity\Activity;
 use Chill\ActivityBundle\Export\Declarations;
@@ -29,7 +29,12 @@ class SentReceivedFilter implements FilterInterface
 
     private const DEFAULT_CHOICE = Activity::SENTRECEIVED_SENT;
 
-    public function __construct(private readonly TranslatorInterface $translator) {}
+    private TranslatorInterface $translator;
+
+    public function __construct(TranslatorInterface $translator)
+    {
+        $this->translator = $translator;
+    }
 
     public function addRole(): ?string
     {
@@ -54,7 +59,7 @@ class SentReceivedFilter implements FilterInterface
 
     public function applyOn(): string
     {
-        return Declarations::ACTIVITY;
+        return Declarations::ACTIVITY_ACP;
     }
 
     public function buildForm(FormBuilderInterface $builder)
@@ -66,7 +71,6 @@ class SentReceivedFilter implements FilterInterface
             'empty_data' => self::DEFAULT_CHOICE,
         ]);
     }
-
     public function getFormDefaultData(): array
     {
         return ['accepted_sentreceived' => self::DEFAULT_CHOICE];

src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/UserFilter.php

@@ -9,7 +9,7 @@ declare(strict_types=1);
  * the LICENSE file that was distributed with this source code.
  */
 
-namespace Chill\ActivityBundle\Export\Filter;
+namespace Chill\ActivityBundle\Export\Filter\ACPFilters;
 
 use Chill\ActivityBundle\Export\Declarations;
 use Chill\MainBundle\Export\FilterInterface;
@@ -21,7 +21,12 @@ use Symfony\Component\Form\FormBuilderInterface;
 
 class UserFilter implements FilterInterface
 {
-    public function __construct(private readonly UserRender $userRender) {}
+    private UserRender $userRender;
+
+    public function __construct(UserRender $userRender)
+    {
+        $this->userRender = $userRender;
+    }
 
     public function addRole(): ?string
     {
@@ -46,7 +51,7 @@ class UserFilter implements FilterInterface
 
     public function applyOn(): string
     {
-        return Declarations::ACTIVITY;
+        return Declarations::ACTIVITY_ACP;
     }
 
     public function buildForm(FormBuilderInterface $builder)
@@ -56,7 +61,6 @@ class UserFilter implements FilterInterface
             'label' => 'Creators',
         ]);
     }
-
     public function getFormDefaultData(): array
     {
         return [];

src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/UserScopeFilter.php

@@ -0,0 +1,98 @@
+<?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\Filter\ACPFilters;
+
+use Chill\ActivityBundle\Export\Declarations;
+use Chill\MainBundle\Entity\Scope;
+use Chill\MainBundle\Export\FilterInterface;
+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
+{
+    private TranslatableStringHelper $translatableStringHelper;
+
+    public function __construct(TranslatableStringHelper $translatableStringHelper)
+    {
+        $this->translatableStringHelper = $translatableStringHelper;
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        if (!in_array('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, [
+            'class' => Scope::class,
+            'choice_label' => fn (Scope $s) => $this->translatableStringHelper->localize(
+                $s->getName()
+            ),
+            'multiple' => true,
+            'expanded' => true,
+        ]);
+    }
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
+
+    public function describeAction($data, $format = 'string'): array
+    {
+        $scopes = [];
+
+        foreach ($data['accepted_userscope'] as $s) {
+            $scopes[] = $this->translatableStringHelper->localize(
+                $s->getName()
+            );
+        }
+
+        return ['Filtered activity by userscope: only %scopes%', [
+            '%scopes%' => implode(', ', $scopes),
+        ]];
+    }
+
+    public function getTitle(): string
+    {
+        return 'Filter activity by userscope';
+    }
+}

src/Bundle/ChillActivityBundle/Export/Filter/ActivityDateFilter.php

@@ -27,7 +27,17 @@ use Symfony\Contracts\Translation\TranslatorInterface;
 
 class ActivityDateFilter implements FilterInterface
 {
-    public function __construct(protected TranslatorInterface $translator, private readonly RollingDateConverterInterface $rollingDateConverter) {}
+    protected TranslatorInterface $translator;
+
+    private RollingDateConverterInterface $rollingDateConverter;
+
+    public function __construct(
+        TranslatorInterface $translator,
+        RollingDateConverterInterface $rollingDateConverter
+    ) {
+        $this->translator = $translator;
+        $this->rollingDateConverter = $rollingDateConverter;
+    }
 
     public function addRole(): ?string
     {
@@ -90,14 +100,14 @@ class ActivityDateFilter implements FilterInterface
                 if (null === $date_from) {
                     $form->get('date_from')->addError(new FormError(
                         $this->translator->trans('This field '
-                        .'should not be empty')
+                        . 'should not be empty')
                     ));
                 }
 
                 if (null === $date_to) {
                     $form->get('date_to')->addError(new FormError(
                         $this->translator->trans('This field '
-                        .'should not be empty')
+                        . 'should not be empty')
                     ));
                 }
 
@@ -108,14 +118,13 @@ class ActivityDateFilter implements FilterInterface
                 ) {
                     $form->get('date_to')->addError(new FormError(
                         $this->translator->trans('This date should be after '
-                            .'the date given in "Implied in an activity after '
-                            .'this date" field')
+                            . 'the date given in "Implied in an activity after '
+                            . 'this date" field')
                     ));
                 }
             }
         });
     }
-
     public function getFormDefaultData(): array
     {
         return ['date_from' => new RollingDate(RollingDate::T_YEAR_PREVIOUS_START), 'date_to' => new RollingDate(RollingDate::T_TODAY)];

src/Bundle/ChillActivityBundle/Export/Filter/ActivityTypeFilter.php

@@ -22,12 +22,21 @@ use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
 
+use function count;
+
 class ActivityTypeFilter implements ExportElementValidatedInterface, FilterInterface
 {
+    protected ActivityTypeRepositoryInterface $activityTypeRepository;
+
+    protected TranslatableStringHelperInterface $translatableStringHelper;
+
     public function __construct(
-        protected TranslatableStringHelperInterface $translatableStringHelper,
-        protected ActivityTypeRepositoryInterface $activityTypeRepository
-    ) {}
+        TranslatableStringHelperInterface $translatableStringHelper,
+        ActivityTypeRepositoryInterface $activityTypeRepository
+    ) {
+        $this->translatableStringHelper = $translatableStringHelper;
+        $this->activityTypeRepository = $activityTypeRepository;
+    }
 
     public function addRole(): ?string
     {
@@ -52,7 +61,7 @@ class ActivityTypeFilter implements ExportElementValidatedInterface, FilterInter
         $builder->add('types', EntityType::class, [
             'choices' => $this->activityTypeRepository->findAllActive(),
             'class' => ActivityType::class,
-            'choice_label' => fn (ActivityType $aty) => ($aty->hasCategory() ? $this->translatableStringHelper->localize($aty->getCategory()->getName()).' > ' : '')
+            'choice_label' => fn (ActivityType $aty) => ($aty->hasCategory() ? $this->translatableStringHelper->localize($aty->getCategory()->getName()) . ' > ' : '')
             .
             $this->translatableStringHelper->localize($aty->getName()),
             'group_by' => function (ActivityType $type) {
@@ -69,7 +78,6 @@ class ActivityTypeFilter implements ExportElementValidatedInterface, FilterInter
             ],
         ]);
     }
-
     public function getFormDefaultData(): array
     {
         return [];
@@ -95,7 +103,7 @@ class ActivityTypeFilter implements ExportElementValidatedInterface, FilterInter
 
     public function validateForm($data, ExecutionContextInterface $context)
     {
-        if (null === $data['types'] || 0 === \count($data['types'])) {
+        if (null === $data['types'] || count($data['types']) === 0) {
             $context
                 ->buildViolation('At least one type must be chosen')
                 ->addViolation();

src/Bundle/ChillActivityBundle/Export/Filter/ActivityUsersFilter.php

@@ -20,7 +20,12 @@ use Symfony\Component\Form\FormBuilderInterface;
 
 class ActivityUsersFilter implements FilterInterface
 {
-    public function __construct(private readonly UserRender $userRender) {}
+    private UserRender $userRender;
+
+    public function __construct(UserRender $userRender)
+    {
+        $this->userRender = $userRender;
+    }
 
     public function addRole(): ?string
     {
@@ -32,8 +37,8 @@ class ActivityUsersFilter implements FilterInterface
         $orX = $qb->expr()->orX();
 
         foreach ($data['accepted_users'] as $key => $user) {
-            $orX->add($qb->expr()->isMemberOf(':activity_users_filter_u'.$key, 'activity.users'));
-            $qb->setParameter('activity_users_filter_u'.$key, $user);
+            $orX->add($qb->expr()->isMemberOf(':activity_users_filter_u' . $key, 'activity.users'));
+            $qb->setParameter('activity_users_filter_u' . $key, $user);
         }
 
         $qb->andWhere($orX);
@@ -51,7 +56,6 @@ class ActivityUsersFilter implements FilterInterface
             'label' => 'Users',
         ]);
     }
-
     public function getFormDefaultData(): array
     {
         return [];

src/Bundle/ChillActivityBundle/Export/Filter/PersonFilters/ActivityReasonFilter.php

@@ -17,15 +17,29 @@ use Chill\ActivityBundle\Repository\ActivityReasonRepository;
 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\QueryBuilder;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
 
+use function count;
+use function in_array;
+
 class ActivityReasonFilter implements ExportElementValidatedInterface, FilterInterface
 {
-    public function __construct(protected TranslatableStringHelper $translatableStringHelper, protected ActivityReasonRepository $activityReasonRepository) {}
+    protected ActivityReasonRepository $activityReasonRepository;
+
+    protected TranslatableStringHelperInterface $translatableStringHelper;
+
+    public function __construct(
+        TranslatableStringHelper $helper,
+        ActivityReasonRepository $activityReasonRepository
+    ) {
+        $this->translatableStringHelper = $helper;
+        $this->activityReasonRepository = $activityReasonRepository;
+    }
 
     public function addRole(): ?string
     {
@@ -38,7 +52,7 @@ class ActivityReasonFilter implements ExportElementValidatedInterface, FilterInt
         $join = $qb->getDQLPart('join');
         $clause = $qb->expr()->in('actreasons', ':selected_activity_reasons');
 
-        if (!\in_array('actreasons', $qb->getAllAliases(), true)) {
+        if (!in_array('actreasons', $qb->getAllAliases(), true)) {
             $qb->join('activity.reasons', 'actreasons');
         }
 
@@ -68,7 +82,6 @@ class ActivityReasonFilter implements ExportElementValidatedInterface, FilterInt
             'expanded' => false,
         ]);
     }
-
     public function getFormDefaultData(): array
     {
         return [];
@@ -78,7 +91,7 @@ class ActivityReasonFilter implements ExportElementValidatedInterface, FilterInt
     {
         // collect all the reasons'name used in this filter in one array
         $reasonsNames = array_map(
-            fn (ActivityReason $r): string => '"'.$this->translatableStringHelper->localize($r->getName()).'"',
+            fn (ActivityReason $r): string => '"' . $this->translatableStringHelper->localize($r->getName()) . '"',
             $this->activityReasonRepository->findBy(['id' => $data['reasons']->toArray()])
         );
 
@@ -97,7 +110,7 @@ class ActivityReasonFilter implements ExportElementValidatedInterface, FilterInt
 
     public function validateForm($data, ExecutionContextInterface $context)
     {
-        if (null === $data['reasons'] || 0 === \count($data['reasons'])) {
+        if (null === $data['reasons'] || count($data['reasons']) === 0) {
             $context
                 ->buildViolation('At least one reason must be chosen')
                 ->addViolation();

src/Bundle/ChillActivityBundle/Export/Filter/PersonFilters/PersonHavingActivityBetweenDateFilter.php

@@ -16,23 +16,42 @@ use Chill\ActivityBundle\Entity\ActivityReason;
 use Chill\ActivityBundle\Repository\ActivityReasonRepository;
 use Chill\MainBundle\Export\ExportElementValidatedInterface;
 use Chill\MainBundle\Export\FilterInterface;
-use Chill\MainBundle\Form\Type\PickRollingDateType;
-use Chill\MainBundle\Service\RollingDate\RollingDate;
-use Chill\MainBundle\Service\RollingDate\RollingDateConverterInterface;
+use Chill\MainBundle\Form\Type\Export\FilterType;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use Chill\PersonBundle\Export\Declarations;
+use DateTime;
+use Doctrine\ORM\Query\Expr;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
+use Symfony\Component\Form\Extension\Core\Type\DateType;
 use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\Form\FormError;
+use Symfony\Component\Form\FormEvent;
+use Symfony\Component\Form\FormEvents;
+use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
-final readonly class PersonHavingActivityBetweenDateFilter implements ExportElementValidatedInterface, FilterInterface
+use function count;
+
+class PersonHavingActivityBetweenDateFilter implements ExportElementValidatedInterface, FilterInterface
 {
+    protected ActivityReasonRepository $activityReasonRepository;
+
+    protected TranslatableStringHelperInterface $translatableStringHelper;
+
+    protected TranslatorInterface $translator;
+
     public function __construct(
-        private TranslatableStringHelper $translatableStringHelper,
-        private ActivityReasonRepository $activityReasonRepository,
-        private RollingDateConverterInterface $rollingDateConverter,
-    ) {}
+        TranslatableStringHelper $translatableStringHelper,
+        ActivityReasonRepository $activityReasonRepository,
+        TranslatorInterface $translator
+    ) {
+        $this->translatableStringHelper = $translatableStringHelper;
+        $this->activityReasonRepository = $activityReasonRepository;
+        $this->translator = $translator;
+    }
 
     public function addRole(): ?string
     {
@@ -43,97 +62,134 @@ final readonly class PersonHavingActivityBetweenDateFilter implements ExportElem
     {
         // create a subquery for activity
         $sqb = $qb->getEntityManager()->createQueryBuilder();
-        $sqb->select('1')
+        $sqb->select('person_person_having_activity.id')
             ->from(Activity::class, 'activity_person_having_activity')
-            ->leftJoin('activity_person_having_activity.person', 'person_person_having_activity');
+            ->join('activity_person_having_activity.person', 'person_person_having_activity');
 
         // add clause between date
         $sqb->where('activity_person_having_activity.date BETWEEN '
-            .':person_having_activity_between_date_from'
-            .' AND '
-            .':person_having_activity_between_date_to'
-            .' AND '
-            .'(person_person_having_activity.id = person.id OR person MEMBER OF activity_person_having_activity.persons)');
+            . ':person_having_activity_between_date_from'
+            . ' AND '
+            . ':person_having_activity_between_date_to');
 
-        if (isset($data['reasons']) && [] !== $data['reasons']) {
-            // add clause activity reason
-            $sqb->join('activity_person_having_activity.reasons', 'reasons_person_having_activity');
+        // add clause activity reason
+        $sqb->join('activity_person_having_activity.reasons', 'reasons_person_having_activity');
 
-            $sqb->andWhere(
-                $sqb->expr()->in(
-                    'reasons_person_having_activity',
-                    ':person_having_activity_reasons'
-                )
-            );
-
-            $qb->setParameter('person_having_activity_reasons', $data['reasons']);
-        }
-
-        $qb->andWhere(
-            $qb->expr()->exists($sqb->getDQL())
+        $sqb->andWhere(
+            $sqb->expr()->in(
+                'reasons_person_having_activity',
+                ':person_having_activity_reasons'
+            )
         );
 
+        $where = $qb->getDQLPart('where');
+        $clause = $qb->expr()->in('person.id', $sqb->getDQL());
+
+        if ($where instanceof Expr\Andx) {
+            $where->add($clause);
+        } else {
+            $where = $qb->expr()->andX($clause);
+        }
+
+        $qb->add('where', $where);
         $qb->setParameter(
             'person_having_activity_between_date_from',
-            $this->rollingDateConverter->convert($data['date_from_rolling'])
+            $data['date_from']
         );
         $qb->setParameter(
             'person_having_activity_between_date_to',
-            $this->rollingDateConverter->convert($data['date_to_rolling'])
+            $data['date_to']
         );
+        $qb->setParameter('person_having_activity_reasons', $data['reasons']);
     }
 
     public function applyOn(): string
     {
-        return Declarations::PERSON_TYPE;
+        return Declarations::PERSON_IMPLIED_IN;
     }
 
     public function buildForm(FormBuilderInterface $builder)
     {
-        $builder->add('date_from_rolling', PickRollingDateType::class, [
-            'label' => 'export.filter.activity.person_between_dates.Implied in an activity after this date',
+        $builder->add('date_from', DateType::class, [
+            'label' => 'Implied in an activity after this date',
+            'attr' => ['class' => 'datepicker'],
+            'widget' => 'single_text',
+            'format' => 'dd-MM-yyyy',
         ]);
 
-        $builder->add('date_to_rolling', PickRollingDateType::class, [
-            'label' => 'export.filter.activity.person_between_dates.Implied in an activity before this date',
+        $builder->add('date_to', DateType::class, [
+            'label' => 'Implied in an activity before this date',
+            'attr' => ['class' => 'datepicker'],
+            'widget' => 'single_text',
+            'format' => 'dd-MM-yyyy',
         ]);
 
-        if ([] !== $reasons = $this->activityReasonRepository->findAll()) {
-            $builder->add('reasons', EntityType::class, [
-                'class' => ActivityReason::class,
-                'choices' => $reasons,
-                'choice_label' => fn (ActivityReason $reason): ?string => $this->translatableStringHelper->localize($reason->getName()),
-                'group_by' => fn (ActivityReason $reason): ?string => $this->translatableStringHelper->localize($reason->getCategory()->getName()),
-                'multiple' => true,
-                'expanded' => false,
-                'label' => 'export.filter.activity.person_between_dates.Activity reasons for those activities',
-                'help' => 'export.filter.activity.person_between_dates.if no reasons',
-            ]);
-        }
+        $builder->add('reasons', EntityType::class, [
+            'class' => ActivityReason::class,
+            'choice_label' => fn (ActivityReason $reason): ?string => $this->translatableStringHelper->localize($reason->getName()),
+            'group_by' => fn (ActivityReason $reason): ?string => $this->translatableStringHelper->localize($reason->getCategory()->getName()),
+            'multiple' => true,
+            'expanded' => false,
+            'label' => 'Activity reasons for those activities',
+        ]);
+
+        $builder->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) {
+            /** @var FormInterface $filterForm */
+            $filterForm = $event->getForm()->getParent();
+            $enabled = $filterForm->get(FilterType::ENABLED_FIELD)->getData();
+
+            if (true === $enabled) {
+                // if the filter is enabled, add some validation
+                $form = $event->getForm();
+                $date_from = $form->get('date_from')->getData();
+                $date_to = $form->get('date_to')->getData();
+
+                // check that fields are not empty
+                if (null === $date_from) {
+                    $form->get('date_from')->addError(new FormError(
+                        $this->translator->trans('This field '
+                        . 'should not be empty')
+                    ));
+                }
+
+                if (null === $date_to) {
+                    $form->get('date_to')->addError(new FormError(
+                        $this->translator->trans('This field '
+                        . 'should not be empty')
+                    ));
+                }
+
+                // check that date_from is before date_to
+                if (
+                    (null !== $date_from && null !== $date_to)
+                    && $date_from >= $date_to
+                ) {
+                    $form->get('date_to')->addError(new FormError(
+                        $this->translator->trans('This date '
+                        . 'should be after the date given in "Implied in an '
+                        . 'activity after this date" field')
+                    ));
+                }
+            }
+        });
     }
-
     public function getFormDefaultData(): array
     {
-        return [
-            'date_from_rolling' => new RollingDate(RollingDate::T_YEAR_PREVIOUS_START),
-            'date_to_rolling' => new RollingDate(RollingDate::T_TODAY),
-            'reasons' => [],
-        ];
+        return ['date_from' => new DateTime(), 'date_to' => new DateTime(), 'reasons' => $this->activityReasonRepository->findAll()];
     }
 
     public function describeAction($data, $format = 'string')
     {
         return [
-            [] === $data['reasons'] ?
-                'export.filter.person_between_dates.describe_action_with_no_subject'
-                : 'export.filter.person_between_dates.describe_action_with_subject',
+            'Filtered by person having an activity between %date_from% and '
+            . '%date_to% with reasons %reasons_name%',
             [
-                'date_from' => $this->rollingDateConverter->convert($data['date_from_rolling']),
-                'date_to' => $this->rollingDateConverter->convert($data['date_to_rolling']),
-                'reasons' => implode(
+                '%date_from%' => $data['date_from']->format('d-m-Y'),
+                '%date_to%' => $data['date_to']->format('d-m-Y'),
+                '%reasons_name%' => implode(
                     ', ',
                     array_map(
-                        fn (ActivityReason $r): string => '"'.$this->translatableStringHelper->localize($r->getName()).'"',
+                        fn (ActivityReason $r): string => '"' . $this->translatableStringHelper->localize($r->getName()) . '"',
                         $data['reasons']
                     )
                 ),
@@ -143,15 +199,13 @@ final readonly class PersonHavingActivityBetweenDateFilter implements ExportElem
 
     public function getTitle()
     {
-        return 'export.filter.activity.person_between_dates.title';
+        return 'Filter by person having an activity in a period';
     }
 
     public function validateForm($data, ExecutionContextInterface $context)
     {
-        if ($this->rollingDateConverter->convert($data['date_from_rolling'])
-            >= $this->rollingDateConverter->convert($data['date_to_rolling'])) {
-            $context->buildViolation('export.filter.activity.person_between_dates.date mismatch')
-                ->setTranslationDomain('messages')
+        if (null === $data['reasons'] || count($data['reasons']) === 0) {
+            $context->buildViolation('At least one reason must be chosen')
                 ->addViolation();
         }
     }

src/Bundle/ChillActivityBundle/Export/Filter/UserScopeFilter.php

@@ -1,112 +0,0 @@
-<?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\Filter;
-
-use Chill\ActivityBundle\Export\Declarations;
-use Chill\MainBundle\Entity\Scope;
-use Chill\MainBundle\Entity\User\UserScopeHistory;
-use Chill\MainBundle\Export\FilterInterface;
-use Chill\MainBundle\Templating\TranslatableStringHelper;
-use Doctrine\ORM\Query\Expr\Join;
-use Doctrine\ORM\QueryBuilder;
-use Symfony\Bridge\Doctrine\Form\Type\EntityType;
-use Symfony\Component\Form\FormBuilderInterface;
-
-class UserScopeFilter implements FilterInterface
-{
-    private const PREFIX = 'acp_act_filter_user_scope';  // creator ? cfr translation
-
-    public function __construct(
-        private readonly TranslatableStringHelper $translatableStringHelper
-    ) {}
-
-    public function addRole(): ?string
-    {
-        return null;
-    }
-
-    public function alterQuery(QueryBuilder $qb, $data)
-    {
-        $p = self::PREFIX;
-
-        $qb
-            ->leftJoin('activity.user', "{$p}_user")  // createdBy ? cfr translation
-            ->leftJoin(
-                UserScopeHistory::class,
-                "{$p}_history",
-                Join::WITH,
-                $qb->expr()->eq("{$p}_history.user", "{$p}_user")
-            )
-            // scope_at based on activity.date
-            ->andWhere(
-                $qb->expr()->andX(
-                    $qb->expr()->lte("{$p}_history.startDate", 'activity.date'),
-                    $qb->expr()->orX(
-                        $qb->expr()->isNull("{$p}_history.endDate"),
-                        $qb->expr()->gt("{$p}_history.endDate", 'activity.date')
-                    )
-                )
-            )
-            ->andWhere(
-                $qb->expr()->in("{$p}_history.scope", ":{$p}_scopes")
-            )
-            ->setParameter(
-                "{$p}_scopes",
-                $data['scopes'],
-            );
-    }
-
-    public function applyOn(): string
-    {
-        return Declarations::ACTIVITY;
-    }
-
-    public function buildForm(FormBuilderInterface $builder)
-    {
-        $builder
-            ->add('scopes', EntityType::class, [
-                'class' => Scope::class,
-                'choice_label' => fn (Scope $s) => $this->translatableStringHelper->localize(
-                    $s->getName()
-                ),
-                'multiple' => true,
-                'expanded' => true,
-            ]);
-    }
-
-    public function describeAction($data, $format = 'string'): array
-    {
-        $scopes = [];
-
-        foreach ($data['scopes'] as $s) {
-            $scopes[] = $this->translatableStringHelper->localize(
-                $s->getName()
-            );
-        }
-
-        return ['export.filter.activity.by_creator_scope.Filtered activity by user scope: only %scopes%', [
-            '%scopes%' => implode(', ', $scopes),
-        ]];
-    }
-
-    public function getFormDefaultData(): array
-    {
-        return [
-            'scopes' => [],
-        ];
-    }
-
-    public function getTitle(): string
-    {
-        return 'export.filter.activity.by_creator_scope.Filter activity by user scope';
-    }
-}

src/Bundle/ChillActivityBundle/Export/Filter/UsersJobFilter.php

@@ -13,7 +13,6 @@ namespace Chill\ActivityBundle\Export\Filter;
 
 use Chill\ActivityBundle\Entity\Activity;
 use Chill\ActivityBundle\Export\Declarations;
-use Chill\MainBundle\Entity\User\UserJobHistory;
 use Chill\MainBundle\Entity\UserJob;
 use Chill\MainBundle\Export\FilterInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
@@ -23,11 +22,12 @@ use Symfony\Component\Form\FormBuilderInterface;
 
 class UsersJobFilter implements FilterInterface
 {
-    private const PREFIX = 'act_filter_user_job';
+    private TranslatableStringHelperInterface $translatableStringHelper;
 
-    public function __construct(
-        private readonly TranslatableStringHelperInterface $translatableStringHelper
-    ) {}
+    public function __construct(TranslatableStringHelperInterface $translatableStringHelper)
+    {
+        $this->translatableStringHelper = $translatableStringHelper;
+    }
 
     public function addRole(): ?string
     {
@@ -36,25 +36,14 @@ class UsersJobFilter implements FilterInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        $p = self::PREFIX;
-
         $qb
             ->andWhere(
                 $qb->expr()->exists(
-                    'SELECT 1 FROM '.Activity::class." {$p}_act "
-                    ."JOIN {$p}_act.users {$p}_user "
-                    .'JOIN '.UserJobHistory::class." {$p}_history WITH {$p}_history.user = {$p}_user "
-                    ."WHERE {$p}_act = activity "
-                    // job_at based on activity.date
-                    ."AND {$p}_history.startDate <= activity.date "
-                    ."AND ({$p}_history.endDate IS NULL OR {$p}_history.endDate > activity.date) "
-                    ."AND {$p}_history.job IN ( :{$p}_jobs )"
+                    'SELECT 1 FROM ' . Activity::class . ' activity_users_job_filter_act
+                JOIN activity_users_job_filter_act.users users WHERE users.userJob IN (:activity_users_job_filter_jobs) AND  activity_users_job_filter_act = activity '
                 )
             )
-            ->setParameter(
-                "{$p}_jobs",
-                $data['jobs']
-            );
+            ->setParameter('activity_users_job_filter_jobs', $data['jobs']);
     }
 
     public function applyOn()
@@ -64,18 +53,21 @@ class UsersJobFilter implements FilterInterface
 
     public function buildForm(FormBuilderInterface $builder)
     {
-        $builder
-            ->add('jobs', EntityType::class, [
-                'class' => UserJob::class,
-                'choice_label' => fn (UserJob $j) => $this->translatableStringHelper->localize($j->getLabel()),
-                'multiple' => true,
-                'expanded' => true,
-            ]);
+        $builder->add('jobs', EntityType::class, [
+            'class' => UserJob::class,
+            'choice_label' => fn (UserJob $j) => $this->translatableStringHelper->localize($j->getLabel()),
+            'multiple' => true,
+            'expanded' => true,
+        ]);
+    }
+    public function getFormDefaultData(): array
+    {
+        return [];
     }
 
     public function describeAction($data, $format = 'string')
     {
-        return ['export.filter.activity.by_users_job.Filtered activity by users job: only %jobs%', [
+        return ['export.filter.activity.by_usersjob.Filtered activity by users job: only %jobs%', [
             '%jobs%' => implode(
                 ', ',
                 array_map(
@@ -86,15 +78,8 @@ class UsersJobFilter implements FilterInterface
         ]];
     }
 
-    public function getFormDefaultData(): array
-    {
-        return [
-            'jobs' => [],
-        ];
-    }
-
     public function getTitle()
     {
-        return 'export.filter.activity.by_users_job.Filter by users job';
+        return 'export.filter.activity.by_usersjob.Filter by users job';
     }
 }

src/Bundle/ChillActivityBundle/Export/Filter/UsersScopeFilter.php

@@ -14,7 +14,6 @@ namespace Chill\ActivityBundle\Export\Filter;
 use Chill\ActivityBundle\Entity\Activity;
 use Chill\ActivityBundle\Export\Declarations;
 use Chill\MainBundle\Entity\Scope;
-use Chill\MainBundle\Entity\User\UserScopeHistory;
 use Chill\MainBundle\Export\FilterInterface;
 use Chill\MainBundle\Repository\ScopeRepositoryInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
@@ -24,12 +23,17 @@ use Symfony\Component\Form\FormBuilderInterface;
 
 class UsersScopeFilter implements FilterInterface
 {
-    private const PREFIX = 'act_filter_user_scope';
+    private ScopeRepositoryInterface $scopeRepository;
+
+    private TranslatableStringHelperInterface $translatableStringHelper;
 
     public function __construct(
-        private readonly ScopeRepositoryInterface $scopeRepository,
-        private readonly TranslatableStringHelperInterface $translatableStringHelper
-    ) {}
+        ScopeRepositoryInterface $scopeRepository,
+        TranslatableStringHelperInterface $translatableStringHelper
+    ) {
+        $this->scopeRepository = $scopeRepository;
+        $this->translatableStringHelper = $translatableStringHelper;
+    }
 
     public function addRole(): ?string
     {
@@ -38,47 +42,39 @@ class UsersScopeFilter implements FilterInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        $p = self::PREFIX;
-
         $qb
             ->andWhere(
                 $qb->expr()->exists(
-                    'SELECT 1 FROM '.Activity::class." {$p}_act "
-                    ."JOIN {$p}_act.users {$p}_user "
-                    .'JOIN '.UserScopeHistory::class." {$p}_history WITH {$p}_history.user = {$p}_user "
-                    ."WHERE {$p}_act = activity "
-                    // scope_at based on activity.date
-                    ."AND {$p}_history.startDate <= activity.date "
-                    ."AND ({$p}_history.endDate IS NULL OR {$p}_history.endDate > activity.date) "
-                    ."AND {$p}_history.scope IN ( :{$p}_scopes )"
+                    'SELECT 1 FROM ' . Activity::class . ' activity_users_scope_filter_act
+                JOIN activity_users_scope_filter_act.users users WHERE users.mainScope IN (:activity_users_scope_filter_scopes) AND  activity_users_scope_filter_act = activity '
                 )
             )
-            ->setParameter(
-                "{$p}_scopes",
-                $data['scopes']
-            );
+            ->setParameter('activity_users_scope_filter_scopes', $data['scopes']);
     }
 
-    public function applyOn(): string
+    public function applyOn()
     {
         return Declarations::ACTIVITY;
     }
 
     public function buildForm(FormBuilderInterface $builder)
     {
-        $builder
-            ->add('scopes', EntityType::class, [
-                'class' => Scope::class,
-                'choices' => $this->scopeRepository->findAllActive(),
-                'choice_label' => fn (Scope $s) => $this->translatableStringHelper->localize($s->getName()),
-                'multiple' => true,
-                'expanded' => true,
-            ]);
+        $builder->add('scopes', EntityType::class, [
+            'class' => Scope::class,
+            'choices' => $this->scopeRepository->findAllActive(),
+            'choice_label' => fn (Scope $s) => $this->translatableStringHelper->localize($s->getName()),
+            'multiple' => true,
+            'expanded' => true,
+        ]);
+    }
+    public function getFormDefaultData(): array
+    {
+        return [];
     }
 
-    public function describeAction($data, $format = 'string'): array
+    public function describeAction($data, $format = 'string')
     {
-        return ['export.filter.activity.by_users_scope.Filtered activity by users scope: only %scopes%', [
+        return ['export.filter.activity.by_usersscope.Filtered activity by users scope: only %scopes%', [
             '%scopes%' => implode(
                 ', ',
                 array_map(
@@ -89,15 +85,8 @@ class UsersScopeFilter implements FilterInterface
         ]];
     }
 
-    public function getFormDefaultData(): array
+    public function getTitle()
     {
-        return [
-            'scopes' => [],
-        ];
-    }
-
-    public function getTitle(): string
-    {
-        return 'export.filter.activity.by_users_scope.Filter by users scope';
+        return 'export.filter.activity.by_usersscope.Filter by users scope';
     }
 }

src/Bundle/ChillActivityBundle/Form/ActivityType.php

@@ -34,8 +34,12 @@ use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
 use Chill\PersonBundle\Templating\Entity\SocialActionRender;
 use Chill\PersonBundle\Templating\Entity\SocialIssueRender;
 use Chill\ThirdPartyBundle\Entity\ThirdParty;
+use DateInterval;
+use DateTime;
+use DateTimeZone;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\Persistence\ObjectManager;
+use RuntimeException;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\CallbackTransformer;
@@ -49,24 +53,45 @@ use Symfony\Component\Form\FormEvents;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 
+use Symfony\Component\Security\Core\Role\Role;
+use function in_array;
+
 class ActivityType extends AbstractType
 {
+    protected AuthorizationHelper $authorizationHelper;
+
+    protected ObjectManager $om;
+
+    protected SocialActionRender $socialActionRender;
+
+    protected SocialIssueRender $socialIssueRender;
+
+    protected array $timeChoices;
+
+    protected TranslatableStringHelper $translatableStringHelper;
+
     protected User $user;
 
     public function __construct(
         TokenStorageInterface $tokenStorage,
-        protected AuthorizationHelper $authorizationHelper,
-        protected ObjectManager $om,
-        protected TranslatableStringHelper $translatableStringHelper,
-        protected array $timeChoices,
-        protected SocialIssueRender $socialIssueRender,
-        protected SocialActionRender $socialActionRender
+        AuthorizationHelper $authorizationHelper,
+        ObjectManager $om,
+        TranslatableStringHelper $translatableStringHelper,
+        array $timeChoices,
+        SocialIssueRender $socialIssueRender,
+        SocialActionRender $socialActionRender
     ) {
         if (!$tokenStorage->getToken()->getUser() instanceof User) {
-            throw new \RuntimeException('you should have a valid user');
+            throw new RuntimeException('you should have a valid user');
         }
 
         $this->user = $tokenStorage->getToken()->getUser();
+        $this->authorizationHelper = $authorizationHelper;
+        $this->om = $om;
+        $this->translatableStringHelper = $translatableStringHelper;
+        $this->timeChoices = $timeChoices;
+        $this->socialIssueRender = $socialIssueRender;
+        $this->socialActionRender = $socialActionRender;
     }
 
     public function buildForm(FormBuilderInterface $builder, array $options): void
@@ -87,7 +112,8 @@ class ActivityType extends AbstractType
         /** @var \Chill\ActivityBundle\Entity\ActivityType $activityType */
         $activityType = $options['activityType'];
 
-        if (null !== $options['data']->getPerson()) {
+        // TODO revoir la gestion des center au niveau du form des activité.
+        if ($options['center'] instanceof Center && null !== $options['data']->getPerson()) {
             $builder->add('scope', ScopePickerType::class, [
                 'center' => $options['center'],
                 'role' => ActivityVoter::CREATE === (string) $options['role'] ? ActivityVoter::CREATE_PERSON : (string) $options['role'],
@@ -95,16 +121,16 @@ class ActivityType extends AbstractType
             ]);
         }
 
-        /** @var \Chill\PersonBundle\Entity\AccompanyingPeriod|null $accompanyingPeriod */
+        /** @var ? \Chill\PersonBundle\Entity\AccompanyingPeriod  $accompanyingPeriod */
         $accompanyingPeriod = null;
 
         if ($options['accompanyingPeriod'] instanceof AccompanyingPeriod) {
             $accompanyingPeriod = $options['accompanyingPeriod'];
         }
 
-        if ($activityType->isVisible('socialIssues') && null !== $accompanyingPeriod) {
+        if ($activityType->isVisible('socialIssues') && $accompanyingPeriod) {
             $builder->add('socialIssues', HiddenType::class, [
-                'required' => 2 === $activityType->getSocialIssuesVisible(),
+                'required' => $activityType->getSocialIssuesVisible() === 2,
             ]);
             $builder->get('socialIssues')
                 ->addModelTransformer(new CallbackTransformer(
@@ -130,9 +156,9 @@ class ActivityType extends AbstractType
                 ));
         }
 
-        if ($activityType->isVisible('socialActions') && null !== $accompanyingPeriod) {
+        if ($activityType->isVisible('socialActions') && $accompanyingPeriod) {
             $builder->add('socialActions', HiddenType::class, [
-                'required' => 2 === $activityType->getSocialActionsVisible(),
+                'required' => $activityType->getSocialActionsVisible() === 2,
             ]);
             $builder->get('socialActions')
                 ->addModelTransformer(new CallbackTransformer(
@@ -191,7 +217,7 @@ class ActivityType extends AbstractType
             ]);
         }
 
-        if ($activityType->isVisible('user')) {
+        if ($activityType->isVisible('user') && $options['center'] instanceof Center) {
             $builder->add('user', PickUserDynamicType::class, [
                 'label' => $activityType->getLabel('user'),
                 'required' => $activityType->isRequired('user'),
@@ -316,7 +342,7 @@ class ActivityType extends AbstractType
 
         if ($activityType->isVisible('location')) {
             $builder->add('location', HiddenType::class, [
-                'required' => 2 === $activityType->getLocationVisible(),
+                'required' => $activityType->getLocationVisible() === 2,
             ])
                 ->get('location')
                 ->addModelTransformer(new CallbackTransformer(
@@ -367,16 +393,16 @@ class ActivityType extends AbstractType
                 ) {
                     // set the timezone to GMT, and fix the difference between current and GMT
                     // the datetimetransformer will then handle timezone as GMT
-                    $timezoneUTC = new \DateTimeZone('GMT');
-                    /** @var \DateTime $data */
-                    $data = $formEvent->getData() ?? \DateTime::createFromFormat('U', '300');
+                    $timezoneUTC = new DateTimeZone('GMT');
+                    /** @var DateTime $data */
+                    $data = $formEvent->getData() ?? DateTime::createFromFormat('U', '300');
                     $seconds = $data->getTimezone()->getOffset($data);
                     $data->setTimeZone($timezoneUTC);
-                    $data->add(new \DateInterval('PT'.$seconds.'S'));
+                    $data->add(new DateInterval('PT' . $seconds . 'S'));
 
                     // test if the timestamp is in the choices.
                     // If not, recreate the field with the new timestamp
-                    if (!\in_array($data->getTimestamp(), $timeChoices, true)) {
+                    if (!in_array($data->getTimestamp(), $timeChoices, true)) {
                         // the data are not in the possible values. add them
                         $timeChoices[$data->format('H:i')] = $data->getTimestamp();
                         $form = $builder->create($fieldName, ChoiceType::class, array_merge(
@@ -401,8 +427,8 @@ class ActivityType extends AbstractType
 
         $resolver
             ->setRequired(['center', 'role', 'activityType', 'accompanyingPeriod'])
-            ->setAllowedTypes('center', ['null', Center::class, 'array'])
-            ->setAllowedTypes('role', ['string'])
+            ->setAllowedTypes('center', ['null', Center::class])
+            ->setAllowedTypes('role', [Role::class, 'string'])
             ->setAllowedTypes('activityType', \Chill\ActivityBundle\Entity\ActivityType::class)
             ->setAllowedTypes('accompanyingPeriod', [\Chill\PersonBundle\Entity\AccompanyingPeriod::class, 'null']);
     }