Change syntax of check on null for closing motive

upgrade to 2.16.2
Add check on null value in template for closing motive
2025-09-10 00:34:58 +00:00 · 2024-02-21 20:14:18 +01:00 · 2024-02-21 19:49:43 +01:00 · 2024-02-20 10:10:44 +01:00 · 2024-02-09 00:11:11 +01:00 · 2024-02-09 00:10:26 +01:00
1102 changed files with 14923 additions and 3278 deletions
--- a/.changes/v2.10.0.md
+++ b/.changes/v2.10.0.md
@@ -0,0 +1,20 @@
+## v2.10.0 - 2023-10-24
+### Feature
+* ([#172](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/172)) [export] Add a filter "grouping accompanying period by opening date" and "grouping accompanying period by closing date"
+* ([#172](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/172)) [export] add a filter and aggregator on accompanying period work: group/filter by handling third party
+* ([#172](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/172)) [export] add a filter and aggregator on activites: group/filter activities by people participating to the activities
+* ([#172](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/172)) [export] add a grouping on accompanying period export: group by activity type associated to at least one activity within the accompanying period
+* [export] sort filters and aggregators by title
+* ([#179](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/179)) [export] create a parameter that will force to skip the filtering by center (ACL) when generating an export
+### Fixed
+* ([#177](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/177)) [export] fix date range selection on filter and grouping "by status of the course at date", on accompanying periods
+
+### Résumé francophone des changements
+
+- Ajout d'un regroupement sur les parcours: par date de cloture et d'ouverture;
+- Ajouter d'un filtre et regroupement par tiers traitant sur les actions d'accompagnement;
+- ajout d'un filtre et regroupement par usager participant sur les échanges
+- ajout d'un regroupement: par type d'activité associé au parcours;
+- trie les filtre et regroupements par ordre alphabétique dans els exports
+- ajout d'un paramètre qui permet de désactiver le filtre par centre dans les exports
+- correction de l'interface de date dans les filtres et regroupements "par statut du parcours à la date"
--- a/.changes/v2.10.1.md
+++ b/.changes/v2.10.1.md
@@ -0,0 +1,3 @@
+## v2.10.1 - 2023-10-24
+### Fixed
+* Fix export controller when generating an export without any data in session 
--- a/.changes/v2.10.2.md
+++ b/.changes/v2.10.2.md
@@ -0,0 +1,3 @@
+## v2.10.2 - 2023-10-26
+### Fixed
+* ([#175](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/175)) Use injection of translator instead of ->get(). 
--- a/.changes/v2.10.3.md
+++ b/.changes/v2.10.3.md
@@ -0,0 +1,3 @@
+## v2.10.3 - 2023-10-26
+### Fixed
+* ([#175](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/175)) Replace old method of getting translator with injection of translatorInterface 
--- a/.changes/v2.10.4.md
+++ b/.changes/v2.10.4.md
@@ -0,0 +1,3 @@
+## v2.10.4 - 2023-10-26
+### Fixed
+* Fix null value constraint errors when merging relationships in doubles 
--- a/.changes/v2.10.5.md
+++ b/.changes/v2.10.5.md
@@ -0,0 +1,4 @@
+## v2.10.5 - 2023-11-05
+### Fixed
+* ([#183](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/183)) Fix "problem during download" on some filters, which used a wrong data type 
+* ([#184](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/184)) Fix filter "activity by date" 
--- a/.changes/v2.10.6.md
+++ b/.changes/v2.10.6.md
@@ -0,0 +1,4 @@
+## v2.10.6 - 2023-11-07
+### Fixed
+* ([#182](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/182)) Fix merging of double person files. Adjustement relationship sql statement 
+* ([#185](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/185)) Export: fix aggregator by geographical unit on person: avoid inconsistencies 
--- a/.changes/v2.11.0.md
+++ b/.changes/v2.11.0.md
@@ -0,0 +1,6 @@
+## v2.11.0 - 2023-11-07
+### Feature
+* ([#194](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/194)) Export: add a filter "filter activity by creator job" 
+### Fixed
+* ([#185](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/185)) Export: fix "group accompanying period by geographical unit": take into account the accompanying periods when the period is not located within an unit 
+* Fix "group activity by creator job" aggregator 
--- a/.changes/v2.12.0.md
+++ b/.changes/v2.12.0.md
@@ -0,0 +1,26 @@
+## v2.12.0 - 2023-11-15
+### Feature
+* ([#199](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/199)) Export: add an aggregator "group activities by presence"
+* ([#199](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/199)) Export: add a filter "filter activity by activity presence"
+* ([#199](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/199)) Export: add an aggregator "group activities by person" (only for the activities saved in a person context)
+* ([#199](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/199)) Export: add a new aggregator "group peoples by postal code"
+* ([#200](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/200)) Export: split export about person on accompanying period work: one with the people associated with the work, another one with the people associated with the accompanying period
+* ([#204](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/204)) Add 3 new filters and 3 new aggregators for work action creator (with jobs and scopes)
+
+* ([#202](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/202)) Create export for the average duration of social work actions
+* ([#206](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/206)) Export: add a export which count persons on accompanying period work
+* ([#206](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/206)) Export: add an export which count persons on activity
+* ([#203](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/203)) Export: add clauses on the social work start date and end date within the filter "Filter accompanying period by accompanying period work"
+### Fixed
+* Export: fix typo in filter "filter accompanying period work on end date"
+* ([#189](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/189)) Export: Fix failure in export linked to household
+* ([#205](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/205)) Fix loading of accompanying period work referrers
+### Traduction francophone des principaux changements
+* export: ajout d'un regroupement "grouper les échanges par présence de l'usager";
+* export: ajout d'un filtre "filtre les échanges par présence de l'usager";
+* export: ajout d'un regroupement "regrouper les échanges par personne" (seulement pour les échanges enregistrés dans le contexte de l'usager);
+* export: ajout d'un regroupement "grouper les usagers par codes postaux"
+* export: séparation des exports sur les actions: dans l'un, les filtres des usagers portent sur les usagers concernés par l'action, dans l'autre, les filtres portent sur les usagers concernés par le parcours de l'action;
+* export: ajout de 3 nouveaux filtres et regroupements sur le créateur de l'action, son métier et son service;
+* export: correction de l'export sur les ménages liés aux parcours;
+* correction du chargement des actions d'accompagnement
--- a/.changes/v2.12.1.md
+++ b/.changes/v2.12.1.md
@@ -0,0 +1,3 @@
+## v2.12.1 - 2023-11-16
+### Fixed
+* ([#208](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/208)) Export: fix loading of form for "filter action by type, goal and result" 
--- a/.changes/v2.13.0.md
+++ b/.changes/v2.13.0.md
@@ -0,0 +1,9 @@
+## v2.13.0 - 2023-11-21
+### Feature
+* ([#173](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/173)) Allow user to add a phonenumber to their profile which will be included in automatically generated documents
+### Fixed
+* ([#211](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/211)) Export: fix loading of "Group activity by type"
+* ([#190](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/190)) Export: fix loading of "group activity by reasons"
+* ([#213](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/213)) Export: fix usage of some Collection returned instead of array in export filters
+* ([#215](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/215)) Use only the string 'both' for gender (with a database migration)
+* ([#212](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/212)) Clean the database to make working the "Group people by gender" aggregator
--- a/.changes/v2.14.0.md
+++ b/.changes/v2.14.0.md
@@ -0,0 +1,8 @@
+## v2.14.0 - 2023-11-24
+### Feature
+* ([#161](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/161)) Export: in filter "Filter accompanying period work (social action) by type, goal and result", order the items alphabetically or with the defined order 
+### Fixed
+* ([#141](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/141)) Export: on filter "action by type goals, and results", restore the fields when editing a saved export 
+* ([#219](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/219)) Export: fix the list of accompanying period work, when the "calc date" is null 
+* ([#222](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/222)) Fix rendering of custom fields 
+* Fix various errors in custom fields administration 
--- a/.changes/v2.14.1.md
+++ b/.changes/v2.14.1.md
@@ -0,0 +1,5 @@
+## v2.14.1 - 2023-11-29
+### Fixed
+* Export: fix list person with custom fields 
+* ([#100](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/100)) Add a paginator to budget elements (resource and charge types) in the admin 
+* Fix error in ListEvaluation when "handling agents" are alone 
--- a/.changes/v2.15.0.md
+++ b/.changes/v2.15.0.md
@@ -0,0 +1,11 @@
+## v2.15.0 - 2023-12-11
+### Feature
+* ([#191](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/191)) Add export "number of household associate with an exchange" 
+* ([#235](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/235)) Export: add dates on the filter "filter course by activity type" 
+### Fixed
+* ([#214](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/214)) Fix error when posting an empty comment on an accompanying period. 
+* ([#233](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/233)) Fix "filter evaluation by evaluation type" (and add select2 to the list of evaluation types to pick) 
+* ([#234](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/234)) Fix "filter aside activity by date"
+ 
+* ([#228](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/228)) Fix export of activity for people created before the introduction of the createdAt column on person (during v1) 
+* ([#246](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/246)) Do not show activities, evaluations and social work when associated to a confidential accompanying period, except for the users which are allowed to see them 
--- a/.changes/v2.15.1.md
+++ b/.changes/v2.15.1.md
@@ -0,0 +1,5 @@
+## v2.15.1 - 2023-12-20
+### Fixed
+* Fix the household export query to exclude accompanying periods that are in draft state. 
+### DX
+* ([#167](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/167)) Fixed readthedocs compilation by updating readthedocs config file and requirements for Sphinx 
--- a/.changes/v2.15.2.md
+++ b/.changes/v2.15.2.md
@@ -0,0 +1,5 @@
+## v2.15.2 - 2024-01-11
+### Fixed
+* Fix the id_seq used when creating a new accompanying period participation during fusion of two person files 
+### DX
+* Set placeholder to False for expanded EntityType form fields where required is set to False. 
--- a/.changes/v2.16.0.md
+++ b/.changes/v2.16.0.md
@@ -0,0 +1,15 @@
+## v2.16.0 - 2024-02-08
+### Feature
+* ([#231](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/231)) Create new filter for persons having a participation in an accompanying period during a certain time span 
+* ([#241](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/241)) [Export][List of accompanyign period] Add two columns: the list of persons participating to the period, and their ids 
+* ([#244](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/244)) Add capability to generate export about change of steps of accompanying period, and generate exports for this 
+* ([#253](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/253)) Export: group accompanying period by person participating 
+* ([#243](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/243)) Export: add filter for courses not linked to a reference address 
+* ([#229](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/229)) Allow to group activities linked with accompanying period by reason 
+* ([#115](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/115)) Prevent social work to be saved when another user edited conccurently the social work 
+* Modernize the event bundle, with some new fields and multiple improvements 
+### Fixed
+* ([#220](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/220)) Fix error in logs about wrong typing of eventArgs in onEditNotificationComment method 
+* ([#256](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/256)) Fix the conditions upon which social actions should be optional or required in relation to social issues within the activity creation form 
+### UX
+* ([#260](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/260)) Order list of centers alphabetically in dropdown 'user' section admin. 
--- a/.changes/v2.16.1.md
+++ b/.changes/v2.16.1.md
@@ -0,0 +1,3 @@
+## v2.16.1 - 2024-02-09
+### Fixed
+* Force bootstrap version to avoid error in builds with newer version 
--- a/.changes/v2.16.2.md
+++ b/.changes/v2.16.2.md
@@ -0,0 +1,3 @@
+## v2.16.2 - 2024-02-21
+### Fixed
+* Check for null values in closing motive of parcours d'accompagnement for correct rendering of template 
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,6 +11,10 @@ cache:
 services:
    - name: postgis/postgis:14-3.3-alpine
      alias: db
+      command:
+          - postgres
+          - "-c"
+          - max_connections=1000
    - name: redis
      alias: redis

@@ -28,6 +32,10 @@ variables:
    REDIS_PORT: 6379
    REDIS_URL: redis://redis:6379
    DEFAULT_CARRIER_CODE: BE
+    # force a timezone
+    TZ: Europe/Brussels
+    # avoid direct deprecations (using symfony phpunit bridge: https://symfony.com/doc/4.x/components/phpunit_bridge.html#internal-deprecations
+    SYMFONY_DEPRECATIONS_HELPER: max[total]=99999999&max[self]=0&max[direct]=0&verbose=0

 stages:
    - Composer install
@@ -45,7 +53,7 @@ build:
        paths:
            - .cache/
    artifacts:
-        expire_in: 30 min
+        expire_in: 1 day
        paths:
            - bin
            - vendor/
@@ -59,7 +67,7 @@ code_style:
        paths:
            - .cache/
    artifacts:
-        expire_in: 30 min
+        expire_in: 1 day
        paths:
            - bin
            - vendor/
@@ -73,7 +81,7 @@ phpstan_tests:
        paths:
            - .cache/
    artifacts:
-        expire_in: 30 min
+        expire_in: 1 day
        paths:
            - bin
            - vendor/
@@ -88,7 +96,7 @@ rector_tests:
        paths:
            - .cache/
    artifacts:
-        expire_in: 30 min
+        expire_in: 1 day
        paths:
            - bin
            - vendor/
@@ -115,7 +123,7 @@ unit_tests:
        - php -d memory_limit=3G tests/console doctrine:fixtures:load -n
        - php -d memory_limit=4G bin/phpunit --colors=never --exclude-group dbIntensive
    artifacts:
-        expire_in: 30 min
+        expire_in: 1 day
        paths:
            - bin
            - vendor/
--- a/.readthedocs.yml
+++ b/.readthedocs.yml
@@ -1,10 +1,14 @@
 ---
 version: 2

+build:
+  os: ubuntu-22.04
+  tools:
+    python: "3.7"
+
 sphinx:
  configuration: docs/source/conf.py

 python:
-  version: 3.7
  install:
-    - requirements: docs/requirements.txt
+    - requirements: docs/requirements.txt
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,164 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html),
 and is generated by [Changie](https://github.com/miniscruff/changie).


+## v2.16.2 - 2024-02-21
+### Fixed
+* Check for null values in closing motive of parcours d'accompagnement for correct rendering of template 
+
+## v2.16.1 - 2024-02-09
+### Fixed
+* Force bootstrap version to avoid error in builds with newer version 
+
+## v2.16.0 - 2024-02-08
+### Feature
+* ([#231](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/231)) Create new filter for persons having a participation in an accompanying period during a certain time span 
+* ([#241](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/241)) [Export][List of accompanyign period] Add two columns: the list of persons participating to the period, and their ids 
+* ([#244](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/244)) Add capability to generate export about change of steps of accompanying period, and generate exports for this 
+* ([#253](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/253)) Export: group accompanying period by person participating 
+* ([#243](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/243)) Export: add filter for courses not linked to a reference address 
+* ([#229](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/229)) Allow to group activities linked with accompanying period by reason 
+* ([#115](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/115)) Prevent social work to be saved when another user edited conccurently the social work 
+* Modernize the event bundle, with some new fields and multiple improvements 
+### Fixed
+* ([#220](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/220)) Fix error in logs about wrong typing of eventArgs in onEditNotificationComment method 
+* ([#256](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/256)) Fix the conditions upon which social actions should be optional or required in relation to social issues within the activity creation form 
+### UX
+* ([#260](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/260)) Order list of centers alphabetically in dropdown 'user' section admin. 
+
+## v2.15.2 - 2024-01-11
+### Fixed
+* Fix the id_seq used when creating a new accompanying period participation during fusion of two person files 
+### DX
+* Set placeholder to False for expanded EntityType form fields where required is set to False. 
+
+## v2.15.1 - 2023-12-20
+### Fixed
+* Fix the household export query to exclude accompanying periods that are in draft state. 
+### DX
+* ([#167](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/167)) Fixed readthedocs compilation by updating readthedocs config file and requirements for Sphinx 
+
+## v2.15.0 - 2023-12-11
+### Feature
+* ([#191](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/191)) Add export "number of household associate with an exchange" 
+* ([#235](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/235)) Export: add dates on the filter "filter course by activity type" 
+### Fixed
+* ([#214](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/214)) Fix error when posting an empty comment on an accompanying period. 
+* ([#233](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/233)) Fix "filter evaluation by evaluation type" (and add select2 to the list of evaluation types to pick) 
+* ([#234](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/234)) Fix "filter aside activity by date"
+ 
+* ([#228](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/228)) Fix export of activity for people created before the introduction of the createdAt column on person (during v1) 
+* ([#246](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/246)) Do not show activities, evaluations and social work when associated to a confidential accompanying period, except for the users which are allowed to see them 
+
+## v2.14.1 - 2023-11-29
+### Fixed
+* Export: fix list person with custom fields 
+* ([#100](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/100)) Add a paginator to budget elements (resource and charge types) in the admin 
+* Fix error in ListEvaluation when "handling agents" are alone 
+
+## v2.14.0 - 2023-11-24
+### Feature
+* ([#161](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/161)) Export: in filter "Filter accompanying period work (social action) by type, goal and result", order the items alphabetically or with the defined order 
+### Fixed
+* ([#141](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/141)) Export: on filter "action by type goals, and results", restore the fields when editing a saved export 
+* ([#219](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/219)) Export: fix the list of accompanying period work, when the "calc date" is null 
+* ([#222](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/222)) Fix rendering of custom fields 
+* Fix various errors in custom fields administration 
+
+## v2.13.0 - 2023-11-21
+### Feature
+* ([#173](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/173)) Allow user to add a phonenumber to their profile which will be included in automatically generated documents
+### Fixed
+* ([#211](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/211)) Export: fix loading of "Group activity by type"
+* ([#190](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/190)) Export: fix loading of "group activity by reasons"
+* ([#213](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/213)) Export: fix usage of some Collection returned instead of array in export filters
+* ([#215](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/215)) Use only the string 'both' for gender (with a database migration)
+* ([#212](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/212)) Clean the database to make working the "Group people by gender" aggregator
+
+## v2.12.1 - 2023-11-16
+### Fixed
+* ([#208](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/208)) Export: fix loading of form for "filter action by type, goal and result" 
+
+## v2.12.0 - 2023-11-15
+### Feature
+* ([#199](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/199)) Export: add an aggregator "group activities by presence"
+* ([#199](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/199)) Export: add a filter "filter activity by activity presence"
+* ([#199](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/199)) Export: add an aggregator "group activities by person" (only for the activities saved in a person context)
+* ([#199](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/199)) Export: add a new aggregator "group peoples by postal code"
+* ([#200](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/200)) Export: split export about person on accompanying period work: one with the people associated with the work, another one with the people associated with the accompanying period
+* ([#204](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/204)) Add 3 new filters and 3 new aggregators for work action creator (with jobs and scopes)
+
+* ([#202](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/202)) Create export for the average duration of social work actions
+* ([#206](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/206)) Export: add a export which count persons on accompanying period work
+* ([#206](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/206)) Export: add an export which count persons on activity
+* ([#203](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/203)) Export: add clauses on the social work start date and end date within the filter "Filter accompanying period by accompanying period work"
+### Fixed
+* Export: fix typo in filter "filter accompanying period work on end date"
+* ([#189](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/189)) Export: Fix failure in export linked to household
+* ([#205](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/205)) Fix loading of accompanying period work referrers
+### Traduction francophone des principaux changements
+* export: ajout d'un regroupement "grouper les échanges par présence de l'usager";
+* export: ajout d'un filtre "filtre les échanges par présence de l'usager";
+* export: ajout d'un regroupement "regrouper les échanges par personne" (seulement pour les échanges enregistrés dans le contexte de l'usager);
+* export: ajout d'un regroupement "grouper les usagers par codes postaux"
+* export: séparation des exports sur les actions: dans l'un, les filtres des usagers portent sur les usagers concernés par l'action, dans l'autre, les filtres portent sur les usagers concernés par le parcours de l'action;
+* export: ajout de 3 nouveaux filtres et regroupements sur le créateur de l'action, son métier et son service;
+* export: correction de l'export sur les ménages liés aux parcours;
+* correction du chargement des actions d'accompagnement
+
+## v2.11.0 - 2023-11-07
+### Feature
+* ([#194](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/194)) Export: add a filter "filter activity by creator job" 
+### Fixed
+* ([#185](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/185)) Export: fix "group accompanying period by geographical unit": take into account the accompanying periods when the period is not located within an unit 
+* Fix "group activity by creator job" aggregator 
+
+## v2.10.6 - 2023-11-07
+### Fixed
+* ([#182](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/182)) Fix merging of double person files. Adjustement relationship sql statement 
+* ([#185](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/185)) Export: fix aggregator by geographical unit on person: avoid inconsistencies 
+
+## v2.10.5 - 2023-11-05
+### Fixed
+* ([#183](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/183)) Fix "problem during download" on some filters, which used a wrong data type 
+* ([#184](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/184)) Fix filter "activity by date" 
+
+## v2.10.4 - 2023-10-26
+### Fixed
+* Fix null value constraint errors when merging relationships in doubles 
+
+## v2.10.3 - 2023-10-26
+### Fixed
+* ([#175](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/175)) Replace old method of getting translator with injection of translatorInterface 
+
+## v2.10.2 - 2023-10-26
+### Fixed
+* ([#175](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/175)) Use injection of translator instead of ->get(). 
+
+## v2.10.1 - 2023-10-24
+### Fixed
+* Fix export controller when generating an export without any data in session 
+
+## v2.10.0 - 2023-10-24
+### Feature
+* ([#172](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/172)) [export] Add a filter "grouping accompanying period by opening date" and "grouping accompanying period by closing date"
+* ([#172](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/172)) [export] add a filter and aggregator on accompanying period work: group/filter by handling third party
+* ([#172](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/172)) [export] add a filter and aggregator on activites: group/filter activities by people participating to the activities
+* ([#172](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/172)) [export] add a grouping on accompanying period export: group by activity type associated to at least one activity within the accompanying period
+* [export] sort filters and aggregators by title
+* ([#179](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/179)) [export] create a parameter that will force to skip the filtering by center (ACL) when generating an export
+### Fixed
+* ([#177](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/177)) [export] fix date range selection on filter and grouping "by status of the course at date", on accompanying periods
+
+### Résumé francophone des changements
+
+- Ajout d'un regroupement sur les parcours: par date de cloture et d'ouverture;
+- Ajouter d'un filtre et regroupement par tiers traitant sur les actions d'accompagnement;
+- ajout d'un filtre et regroupement par usager participant sur les échanges
+- ajout d'un regroupement: par type d'activité associé au parcours;
+- trie les filtre et regroupements par ordre alphabétique dans els exports
+- ajout d'un paramètre qui permet de désactiver le filtre par centre dans les exports
+- correction de l'interface de date dans les filtres et regroupements "par statut du parcours à la date"
+
 ## v2.9.2 - 2023-10-17
 ### Fixed
 * Fix possible null values in string's entities 
--- a/docs/README.md
+++ b/docs/README.md
@@ -27,7 +27,7 @@ To compile this documentation :
 Contribute
 ===========

-Issue tracker : https://git.framasoft.org/groups/Chill-project/issues
+Issue tracker : https://gitlab.com/Chill-Projet/chill-bundles/-/issues

 Licence
 =======
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -1,6 +1,7 @@
 docutils==0.13.1
 Pygments==2.2.0
 sphinx==1.8.5
+Jinja2<3.1
 git+https://github.com/fabpot/sphinx-php.git@v2.0.2#egg_name=sphinx-php
 jsx-lexer===0.0.8
 sphinx_rtd_theme==0.5.0
--- a/docs/source/installation/index.rst
+++ b/docs/source/installation/index.rst
@@ -48,8 +48,8 @@ Clone or download the chill-skeleton project and `cd` into the main directory.

 .. code-block:: bash

-   git clone https://gitlab.com/Chill-Projet/chill-skeleton-basic.git
-   cd chill-app
+   git clone https://gitea.champs-libres.be/Chill-project/chill-skeleton-basic.git
+   cd chill-skeleton-basic


 As a developer, the code will stay on your computer and will be executed in docker container. To avoid permission problem, the code should be run with the same uid/gid from your current user. This is why we get your current user id with the command ``id -u`` in each following scripts.
--- a/docs/source/installation/msgraph-configure.rst
+++ b/docs/source/installation/msgraph-configure.rst
@@ -1,13 +1,15 @@

-Configure Chill for calendar sync and SSO with Microsoft Graph (Outlook)
-========================================================================
+Configure Chill for calendar and absence synchronisation and SSO with Microsoft Graph (Outlook)
+===============================================================================================

 Chill offers the possibility to:

 * authenticate users using Microsoft Graph, with relatively small adaptations;
 * synchronize calendar in both ways (`see the user manual for a large description of the feature <https://gitea.champs-libres.be/Chill-project/manuals>`_).

-Both can be configured separately (synchronising calendars without SSO, or SSO without calendar). When calendar sync is configured without SSL, the user's email address is the key to associate Chill's users with Microsoft's ones.
+Both can be configured separately (synchronising calendars without SSO, or SSO without calendar).
+
+Please note that the user's email address is the key to associate Chill's users with Microsoft's ones.

 Configure SSO
 -------------
@@ -46,7 +48,7 @@ Do not forget to provider user's accesses to your app, using the "Utilisateurs e

 You must know have gathered all the required variables for SSO:

-.. code-block:: 
+.. code-block::

   SAML_BASE_URL=https://test.chill.be # must be
   SAML_ENTITY_ID=https://test.chill.be # must match the one entered
@@ -186,20 +188,27 @@ Configure chill app



-Configure sync
--------------
+Configure sync and calendar access
+----------------------------------

-The sync processe might be configured in the same app, or into a different app.
+The purpose of this configuration is the following:

-The synchronization processes use Oauth2.0 for authentication and authorization.
+- let user read their calendar and shared calendar within Chill (with the same permissions as the one configured in Outlook / Azure);
+- allow chill instance to write appointment ("Rendez-vous") into their calendar, and invite other users to their appointment;
+- allow chill instance to be notified if an appoint is added or removed by the user within another interface than Chill: if the appointment match another one created in the Chill interface, the date and time are updated in Chill;
+- allow chill instance to read the absence of the user and, if set, mark the user as absent in Chill;
+
+The sync processe might be configured in the same app, or into a different app on the Azure side.
+
+The synchronization processes use Oauth 2.0 / OpenID Connect for authentication and authorization.

 .. note::

   Two flows are in use:

-   * we authenticate "on behalf of a user", to allow users to see their own calendar or other user's calendar into the web interface. 
+   * we authenticate "on behalf of a user", to allow users to see their own calendar or other user's calendar into the web interface.

-     Typically, when the page is loaded, Chill first check that an authorization token exists. If not, the user is redirected to Microsoft Azure for authentification and a new token is grabbed (most of the times, this is transparent for users). 
+     Typically, when the page is loaded, Chill first check that an authorization token exists. If not, the user is redirected to Microsoft Azure for authentification and a new token is grabbed (most of the times, this is transparent for users).

   * Chill also acts "as a machine", to synchronize calendars with a daemon background.

@@ -229,8 +238,9 @@ Some explanation:
 The sync daemon must have write access:

 * the daemon must be allowed to read all users and their profile, to establish a link between them and the Chill's users: (:code:`Users.Read.All`);
-* it must also be allowed to read and write into the calendars (:code:`Calendars.ReadWrite.All`)
-* for sending invitation to other users, the permission (:code:`Mail.Send`) must be granted.
+* it must also be allowed to read and write into the calendars (:code:`Calendars.ReadWrite.All`);
+* for sending invitation to other users, the permission (:code:`Mail.Send`) must be granted;
+* and, for reading the absence status of the user and sync it with chill, it must be able to read the mailboxSettings (:code:`MailboxSettings.Read`).

 At this step, you might choose to accept those permissions for all users, or let them do it by yourself.

@@ -301,7 +311,7 @@ The calendar synchronization is processed using symfony messenger. It seems to b

 The association between chill's users and Microsoft's users is done by this cli command:

-.. code-block:: 
+.. code-block::

   bin/console chill:calendar:msgraph-user-map-subscribe

--- a/docs/source/installation/oauth_api_autorisees.png
+++ b/docs/source/installation/oauth_api_autorisees.png
--- a/exports_alias_conventions.md
+++ b/exports_alias_conventions.md
@@ -5,72 +5,74 @@ Add condition with distinct alias on each export join clauses (Indicators + Filt

 These are alias conventions :

-| Entity                                  | Join                                    | Attribute                                  | Alias                                  |
-|:----------------------------------------|:----------------------------------------|:-------------------------------------------|:---------------------------------------|
-| AccompanyingPeriod::class               |                                         |                                            | acp                                    |
-|                                         | AccompanyingPeriodWork::class           | acp.works                                  | acpw                                   |
-|                                         | AccompanyingPeriodParticipation::class  | acp.participations                         | acppart                                |
-|                                         | Location::class                         | acp.administrativeLocation                 | acploc                                 |
-|                                         | ClosingMotive::class                    | acp.closingMotive                          | acpmotive                              |
-|                                         | UserJob::class                          | acp.job                                    | acpjob                                 |
-|                                         | Origin::class                           | acp.origin                                 | acporigin                              |
-|                                         | Scope::class                            | acp.scopes                                 | acpscope                               |
-|                                         | SocialIssue::class                      | acp.socialIssues                           | acpsocialissue                         |
-|                                         | User::class                             | acp.user                                   | acpuser                                |
-|                                         | AccompanyingPeriopStepHistory::class    | acp.stepHistories                          | acpstephistories                       |
-|                                         | AccompanyingPeriodInfo::class           | not existing (using custom WITH clause)    | acpinfo                                |
-| AccompanyingPeriodWork::class           |                                         |                                            | acpw                                   |
-|                                         | AccompanyingPeriodWorkEvaluation::class | acpw.accompanyingPeriodWorkEvaluations     | workeval                               |
-|                                         | 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                                   |
-| AccompanyingPeriodInfo::class           |                                         |                                            | acpinfo                                |
-|                                         | User::class                             | acpinfo.user                               | acpinfo_user                           |
-| 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                                    |
-|                                         | CurrentPersonAddress::class             | person.currentPersonAddress                | currentPersonAddress (on a given date) |
-| 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                              |
-|                                         | Person::class                           | activity.createdBy                         | actcreator                             |
-| 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                                   |
+| Entity                                  | Join                                    | Attribute                                  | Alias                                      |
+|:----------------------------------------|:----------------------------------------|:-------------------------------------------|:-------------------------------------------|
+| AccompanyingPeriodStepHistory::class    |                                         |                                            | acpstephistory (contexte ACP_STEP_HISTORY) |
+|                                         | AccompanyingPeriod::class               | acpstephistory.period                      | acp                                        |
+| 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                                    |
+|                                         | AccompanyingPeriopStepHistory::class    | acp.stepHistories                          | acpstephistories                           |
+|                                         | AccompanyingPeriodInfo::class           | not existing (using custom WITH clause)    | acpinfo                                    |
+| AccompanyingPeriodWork::class           |                                         |                                            | acpw                                       |
+|                                         | AccompanyingPeriodWorkEvaluation::class | acpw.accompanyingPeriodWorkEvaluations     | workeval                                   |
+|                                         | 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                                       |
+| AccompanyingPeriodInfo::class           |                                         |                                            | acpinfo                                    |
+|                                         | User::class                             | acpinfo.user                               | acpinfo_user                               |
+| 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                                        |
+|                                         | CurrentPersonAddress::class             | person.currentPersonAddress                | currentPersonAddress (on a given date)     |
+| 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                                  |
+|                                         | Person::class                           | activity.createdBy                         | actcreator                                 |
+| ActivityReason::class                   |                                         |                                            | actreasons                                 |
+|                                         | ActivityReasonCategory::class           | actreason.category                         | actreasoncat                               |
+| Calendar::class                         |                                         |                                            | cal                                        |
+|                                         | CancelReason::class                     | cal.cancelReason                           | calcancel                                  |
+|                                         | Location::class                         | cal.location                               | calloc                                     |
+|                                         | User::class                             | cal.user                                   | caluser                                    |
+| VendeePerson::class                     |                                         |                                            | vp                                         |
+|                                         | SituationProfessionelle::class          | vp.situationProfessionelle                 | vpprof                                     |
+|                                         | StatutLogement::class                   | vp.statutLogement                          | vplog                                      |
+|                                         | TempsDeTravail::class                   | vp.tempsDeTravail                          | vptt                                       |
--- a/package.json
+++ b/package.json
@@ -15,7 +15,7 @@
    "@symfony/webpack-encore": "^4.1.0",
    "@tsconfig/node14": "^1.0.1",
    "bindings": "^1.5.0",
-    "bootstrap": "^5.0.1",
+    "bootstrap": "5.2.3",
    "chokidar": "^3.5.1",
    "fork-awesome": "^1.1.7",
    "jquery": "^3.6.0",
--- a/src/Bundle/ChillActivityBundle/CHANGELOG.md
+++ b/src/Bundle/ChillActivityBundle/CHANGELOG.md
@@ -28,3 +28,4 @@ Version 1.5.5

 - [activity] replace dropdown for selecting reasons and use chillEntity for reason rendering
 - fix bug: error when trying to edit activity of which the type has been deactivated
+
--- a/src/Bundle/ChillActivityBundle/ChillActivityBundle.php
+++ b/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
+{
+}
--- a/src/Bundle/ChillActivityBundle/Controller/ActivityController.php
+++ b/src/Bundle/ChillActivityBundle/Controller/ActivityController.php
@@ -67,7 +67,8 @@ final class ActivityController extends AbstractController
        private readonly FilterOrderHelperFactoryInterface $filterOrderHelperFactory,
        private readonly TranslatableStringHelperInterface $translatableStringHelper,
        private readonly PaginatorFactory $paginatorFactory,
-    ) {}
+    ) {
+    }

    /**
     * Deletes a Activity entity.
--- a/src/Bundle/ChillActivityBundle/Controller/ActivityReasonCategoryController.php
+++ b/src/Bundle/ChillActivityBundle/Controller/ActivityReasonCategoryController.php
@@ -56,7 +56,7 @@ class ActivityReasonCategoryController extends AbstractController
    {
        $em = $this->getDoctrine()->getManager();

-        $entity = $em->getRepository(\Chill\ActivityBundle\Entity\ActivityReasonCategory::class)->find($id);
+        $entity = $em->getRepository(ActivityReasonCategory::class)->find($id);

        if (!$entity) {
            throw $this->createNotFoundException('Unable to find ActivityReasonCategory entity.');
@@ -79,7 +79,7 @@ class ActivityReasonCategoryController extends AbstractController
    {
        $em = $this->getDoctrine()->getManager();

-        $entities = $em->getRepository(\Chill\ActivityBundle\Entity\ActivityReasonCategory::class)->findAll();
+        $entities = $em->getRepository(ActivityReasonCategory::class)->findAll();

        return $this->render('@ChillActivity/ActivityReasonCategory/index.html.twig', [
            'entities' => $entities,
@@ -111,7 +111,7 @@ class ActivityReasonCategoryController extends AbstractController
    {
        $em = $this->getDoctrine()->getManager();

-        $entity = $em->getRepository(\Chill\ActivityBundle\Entity\ActivityReasonCategory::class)->find($id);
+        $entity = $em->getRepository(ActivityReasonCategory::class)->find($id);

        if (!$entity) {
            throw $this->createNotFoundException('Unable to find ActivityReasonCategory entity.');
@@ -131,7 +131,7 @@ class ActivityReasonCategoryController extends AbstractController
    {
        $em = $this->getDoctrine()->getManager();

-        $entity = $em->getRepository(\Chill\ActivityBundle\Entity\ActivityReasonCategory::class)->find($id);
+        $entity = $em->getRepository(ActivityReasonCategory::class)->find($id);

        if (!$entity) {
            throw $this->createNotFoundException('Unable to find ActivityReasonCategory entity.');
--- a/src/Bundle/ChillActivityBundle/Controller/ActivityReasonController.php
+++ b/src/Bundle/ChillActivityBundle/Controller/ActivityReasonController.php
@@ -24,7 +24,9 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 */
 class ActivityReasonController extends AbstractController
 {
-    public function __construct(private readonly ActivityReasonRepository $activityReasonRepository) {}
+    public function __construct(private readonly ActivityReasonRepository $activityReasonRepository)
+    {
+    }

    /**
     * Creates a new ActivityReason entity.
@@ -60,7 +62,7 @@ class ActivityReasonController extends AbstractController
    {
        $em = $this->getDoctrine()->getManager();

-        $entity = $em->getRepository(\Chill\ActivityBundle\Entity\ActivityReason::class)->find($id);
+        $entity = $em->getRepository(ActivityReason::class)->find($id);

        if (null === $entity) {
            throw new NotFoundHttpException('Unable to find ActivityReason entity.');
@@ -115,7 +117,7 @@ class ActivityReasonController extends AbstractController
    {
        $em = $this->getDoctrine()->getManager();

-        $entity = $em->getRepository(\Chill\ActivityBundle\Entity\ActivityReason::class)->find($id);
+        $entity = $em->getRepository(ActivityReason::class)->find($id);

        if (!$entity) {
            throw $this->createNotFoundException('Unable to find ActivityReason entity.');
@@ -135,7 +137,7 @@ class ActivityReasonController extends AbstractController
    {
        $em = $this->getDoctrine()->getManager();

-        $entity = $em->getRepository(\Chill\ActivityBundle\Entity\ActivityReason::class)->find($id);
+        $entity = $em->getRepository(ActivityReason::class)->find($id);

        if (!$entity) {
            throw $this->createNotFoundException('Unable to find ActivityReason entity.');
--- a/src/Bundle/ChillActivityBundle/Entity/ActivityType.php
+++ b/src/Bundle/ChillActivityBundle/Entity/ActivityType.php
@@ -291,7 +291,11 @@ class ActivityType
    public function checkSocialActionsVisibility(ExecutionContextInterface $context, mixed $payload)
    {
        if ($this->socialIssuesVisible !== $this->socialActionsVisible) {
-            if (!(2 === $this->socialIssuesVisible && 1 === $this->socialActionsVisible)) {
+            // if social issues are invisible then social actions cannot be optional or required + if social issues are optional then social actions shouldn't be required
+            if (
+                (0 === $this->socialIssuesVisible && (1 === $this->socialActionsVisible || 2 === $this->socialActionsVisible))
+                || (1 === $this->socialIssuesVisible && 2 === $this->socialActionsVisible)
+            ) {
                $context
                    ->buildViolation('The socialActionsVisible value is not compatible with the socialIssuesVisible value')
                    ->atPath('socialActionsVisible')
--- a/src/Bundle/ChillActivityBundle/EntityListener/ActivityEntityListener.php
+++ b/src/Bundle/ChillActivityBundle/EntityListener/ActivityEntityListener.php
@@ -19,7 +19,9 @@ use Doctrine\ORM\EntityManagerInterface;

 class ActivityEntityListener
 {
-    public function __construct(private readonly EntityManagerInterface $em, private readonly AccompanyingPeriodWorkRepository $workRepository) {}
+    public function __construct(private readonly EntityManagerInterface $em, private readonly AccompanyingPeriodWorkRepository $workRepository)
+    {
+    }

    public function persistActionToCourse(Activity $activity)
    {
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/ByActivityTypeAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/ByActivityTypeAggregator.php
@@ -0,0 +1,123 @@
+<?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\ACPAggregators;
+
+use Chill\ActivityBundle\Entity\Activity;
+use Chill\ActivityBundle\Entity\ActivityType;
+use Chill\ActivityBundle\Repository\ActivityTypeRepositoryInterface;
+use Chill\MainBundle\Export\AggregatorInterface;
+use Chill\MainBundle\Form\Type\PickRollingDateType;
+use Chill\MainBundle\Service\RollingDate\RollingDateConverterInterface;
+use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
+use Chill\PersonBundle\Export\Declarations;
+use Doctrine\ORM\Query\Expr\Join;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\FormBuilderInterface;
+
+final readonly class ByActivityTypeAggregator implements AggregatorInterface
+{
+    private const PREFIX = 'acp_by_activity_type_agg';
+
+    public function __construct(
+        private RollingDateConverterInterface $rollingDateConverter,
+        private ActivityTypeRepositoryInterface $activityTypeRepository,
+        private TranslatableStringHelperInterface $translatableStringHelper,
+    ) {
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        $builder
+            ->add('after_date', PickRollingDateType::class, [
+                'required' => false,
+                'label' => 'export.aggregator.acp.by_activity_type.after_date',
+            ])
+            ->add('before_date', PickRollingDateType::class, [
+                'required' => false,
+                'label' => 'export.aggregator.acp.by_activity_type.before_date',
+            ]);
+    }
+
+    public function getFormDefaultData(): array
+    {
+        return [
+            'before_date' => null,
+            'after_date' => null,
+        ];
+    }
+
+    public function getLabels($key, array $values, mixed $data)
+    {
+        return function (int|string|null $value): string {
+            if ('_header' === $value) {
+                return 'export.aggregator.acp.by_activity_type.activity_type';
+            }
+
+            if ('' === $value || null === $value || null === $activityType = $this->activityTypeRepository->find($value)) {
+                return '';
+            }
+
+            return $this->translatableStringHelper->localize($activityType->getName());
+        };
+    }
+
+    public function getQueryKeys($data)
+    {
+        return [self::PREFIX.'_actype_id'];
+    }
+
+    public function getTitle()
+    {
+        return 'export.aggregator.acp.by_activity_type.title';
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        $p = self::PREFIX;
+
+        // we make a left join, with acp having at least one activity of the given type
+        $exists = 'EXISTS (SELECT 1 FROM '.Activity::class." {$p}_activity WHERE {$p}_activity.accompanyingPeriod = acp AND {$p}_activity.activityType = {$p}_activity_type";
+
+        if (null !== $data['after_date']) {
+            $exists .= " AND {$p}_activity.date > :{$p}_after_date";
+            $qb->setParameter("{$p}_after_date", $this->rollingDateConverter->convert($data['after_date']));
+        }
+
+        if (null !== $data['before_date']) {
+            $exists .= " AND {$p}_activity.date < :{$p}_before_date";
+            $qb->setParameter("{$p}_before_date", $this->rollingDateConverter->convert($data['before_date']));
+        }
+
+        $exists .= ')';
+
+        $qb->leftJoin(
+            ActivityType::class,
+            "{$p}_activity_type",
+            Join::WITH,
+            $exists
+        );
+
+        $qb
+            ->addSelect("{$p}_activity_type.id AS {$p}_actype_id")
+            ->addGroupBy("{$p}_actype_id");
+    }
+
+    public function applyOn()
+    {
+        return Declarations::ACP_TYPE;
+    }
+}
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/BySocialActionAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/BySocialActionAggregator.php
@@ -20,7 +20,9 @@ use Symfony\Component\Form\FormBuilderInterface;

 class BySocialActionAggregator implements AggregatorInterface
 {
-    public function __construct(private readonly SocialActionRender $actionRender, private readonly SocialActionRepository $actionRepository) {}
+    public function __construct(private readonly SocialActionRender $actionRender, private readonly SocialActionRepository $actionRepository)
+    {
+    }

    public function addRole(): ?string
    {
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/BySocialIssueAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/BySocialIssueAggregator.php
@@ -20,7 +20,9 @@ use Symfony\Component\Form\FormBuilderInterface;

 class BySocialIssueAggregator implements AggregatorInterface
 {
-    public function __construct(private readonly SocialIssueRepository $issueRepository, private readonly SocialIssueRender $issueRender) {}
+    public function __construct(private readonly SocialIssueRepository $issueRepository, private readonly SocialIssueRender $issueRender)
+    {
+    }

    public function addRole(): ?string
    {
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityPresenceAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityPresenceAggregator.php
@@ -0,0 +1,76 @@
+<?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\ActivityBundle\Repository\ActivityPresenceRepositoryInterface;
+use Chill\MainBundle\Export\AggregatorInterface;
+use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\FormBuilderInterface;
+
+final readonly class ActivityPresenceAggregator implements AggregatorInterface
+{
+    public function __construct(private ActivityPresenceRepositoryInterface $activityPresenceRepository, private TranslatableStringHelperInterface $translatableStringHelper)
+    {
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+    }
+
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
+
+    public function getLabels($key, array $values, mixed $data)
+    {
+        return function (int|string|null $value): string {
+            if ('_header' === $value) {
+                return 'export.aggregator.activity.by_activity_presence.header';
+            }
+
+            if (null === $value || '' === $value || null === $presence = $this->activityPresenceRepository->find($value)) {
+                return '';
+            }
+
+            return $this->translatableStringHelper->localize($presence->getName());
+        };
+    }
+
+    public function getQueryKeys($data)
+    {
+        return ['activity_presence_aggregator_attendee'];
+    }
+
+    public function getTitle(): string
+    {
+        return 'export.aggregator.activity.by_activity_presence.Group activity by presence';
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data): void
+    {
+        $qb->addSelect('IDENTITY(activity.attendee) AS activity_presence_aggregator_attendee');
+        $qb->addGroupBy('activity_presence_aggregator_attendee');
+    }
+
+    public function applyOn()
+    {
+        return Declarations::ACTIVITY;
+    }
+}
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/PersonAggregators/ActivityReasonAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/PersonAggregators/ActivityReasonAggregator.php
@@ -9,7 +9,7 @@ declare(strict_types=1);
 * the LICENSE file that was distributed with this source code.
 */

-namespace Chill\ActivityBundle\Export\Aggregator\PersonAggregators;
+namespace Chill\ActivityBundle\Export\Aggregator;

 use Chill\ActivityBundle\Export\Declarations;
 use Chill\ActivityBundle\Repository\ActivityReasonCategoryRepository;
@@ -25,7 +25,12 @@ use Symfony\Component\Validator\Context\ExecutionContextInterface;

 class ActivityReasonAggregator implements AggregatorInterface, ExportElementValidatedInterface
 {
-    public function __construct(protected ActivityReasonCategoryRepository $activityReasonCategoryRepository, protected ActivityReasonRepository $activityReasonRepository, protected TranslatableStringHelper $translatableStringHelper) {}
+    public function __construct(
+        protected ActivityReasonCategoryRepository $activityReasonCategoryRepository,
+        protected ActivityReasonRepository $activityReasonRepository,
+        protected TranslatableStringHelper $translatableStringHelper
+    ) {
+    }

    public function addRole(): ?string
    {
@@ -49,7 +54,7 @@ class ActivityReasonAggregator implements AggregatorInterface, ExportElementVali

        // make a jointure only if needed
        if (!\in_array('actreasons', $qb->getAllAliases(), true)) {
-            $qb->innerJoin('activity.reasons', 'actreasons');
+            $qb->leftJoin('activity.reasons', 'actreasons');
        }

        // join category if necessary
@@ -60,19 +65,12 @@ class ActivityReasonAggregator implements AggregatorInterface, ExportElementVali
            }
        }

-        // add the "group by" part
-        $groupBy = $qb->getDQLPart('groupBy');
-
-        if (\count($groupBy) > 0) {
-            $qb->addGroupBy($alias);
-        } else {
-            $qb->groupBy($alias);
-        }
+        $qb->addGroupBy($alias);
    }

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

    public function buildForm(FormBuilderInterface $builder)
@@ -94,17 +92,13 @@ class ActivityReasonAggregator implements AggregatorInterface, ExportElementVali

    public function getFormDefaultData(): array
    {
-        return [];
+        return [
+            'level' => 'reasons',
+        ];
    }

    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'])),
-        };
-
        return function ($value) use ($data) {
            if ('_header' === $value) {
                return 'reasons' === $data['level'] ? 'Group by reasons' : 'Group by categories of reason';
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityTypeAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityTypeAggregator.php
@@ -22,7 +22,9 @@ class ActivityTypeAggregator implements AggregatorInterface
 {
    final public const KEY = 'activity_type_aggregator';

-    public function __construct(protected ActivityTypeRepositoryInterface $activityTypeRepository, protected TranslatableStringHelperInterface $translatableStringHelper) {}
+    public function __construct(protected ActivityTypeRepositoryInterface $activityTypeRepository, protected TranslatableStringHelperInterface $translatableStringHelper)
+    {
+    }

    public function addRole(): ?string
    {
@@ -56,20 +58,15 @@ class ActivityTypeAggregator implements AggregatorInterface

    public function getLabels($key, array $values, $data): \Closure
    {
-        // for performance reason, we load data from db only once
-        $this->activityTypeRepository->findBy(['id' => $values]);
-
-        return function ($value): string {
+        return function (int|string|null $value): string {
            if ('_header' === $value) {
                return 'Activity type';
            }

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

-            $t = $this->activityTypeRepository->find($value);
-
            return $this->translatableStringHelper->localize($t->getName());
        };
    }
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityUserAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityUserAggregator.php
@@ -22,7 +22,9 @@ class ActivityUserAggregator implements AggregatorInterface
 {
    final public const KEY = 'activity_user_id';

-    public function __construct(private readonly UserRepository $userRepository, private readonly UserRender $userRender) {}
+    public function __construct(private readonly UserRepository $userRepository, private readonly UserRender $userRender)
+    {
+    }

    public function addRole(): ?string
    {
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityUsersAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityUsersAggregator.php
@@ -20,7 +20,9 @@ use Symfony\Component\Form\FormBuilderInterface;

 class ActivityUsersAggregator implements AggregatorInterface
 {
-    public function __construct(private readonly UserRepositoryInterface $userRepository, private readonly UserRender $userRender) {}
+    public function __construct(private readonly UserRepositoryInterface $userRepository, private readonly UserRender $userRender)
+    {
+    }

    public function addRole(): ?string
    {
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityUsersJobAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityUsersJobAggregator.php
@@ -27,7 +27,8 @@ class ActivityUsersJobAggregator implements AggregatorInterface
    public function __construct(
        private readonly UserJobRepositoryInterface $userJobRepository,
        private readonly TranslatableStringHelperInterface $translatableStringHelper
-    ) {}
+    ) {
+    }

    public function addRole(): ?string
    {
@@ -65,7 +66,9 @@ class ActivityUsersJobAggregator implements AggregatorInterface
        return Declarations::ACTIVITY;
    }

-    public function buildForm(FormBuilderInterface $builder) {}
+    public function buildForm(FormBuilderInterface $builder)
+    {
+    }

    public function getFormDefaultData(): array
    {
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityUsersScopeAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityUsersScopeAggregator.php
@@ -27,7 +27,8 @@ class ActivityUsersScopeAggregator implements AggregatorInterface
    public function __construct(
        private readonly ScopeRepositoryInterface $scopeRepository,
        private readonly TranslatableStringHelperInterface $translatableStringHelper
-    ) {}
+    ) {
+    }

    public function addRole(): ?string
    {
@@ -65,7 +66,9 @@ class ActivityUsersScopeAggregator implements AggregatorInterface
        return Declarations::ACTIVITY;
    }

-    public function buildForm(FormBuilderInterface $builder) {}
+    public function buildForm(FormBuilderInterface $builder)
+    {
+    }

    public function getFormDefaultData(): array
    {
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/ByCreatorAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/ByCreatorAggregator.php
@@ -20,7 +20,9 @@ use Symfony\Component\Form\FormBuilderInterface;

 class ByCreatorAggregator implements AggregatorInterface
 {
-    public function __construct(private readonly UserRepositoryInterface $userRepository, private readonly UserRender $userRender) {}
+    public function __construct(private readonly UserRepositoryInterface $userRepository, private readonly UserRender $userRender)
+    {
+    }

    public function addRole(): ?string
    {
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/ByThirdpartyAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/ByThirdpartyAggregator.php
@@ -20,7 +20,9 @@ use Symfony\Component\Form\FormBuilderInterface;

 class ByThirdpartyAggregator implements AggregatorInterface
 {
-    public function __construct(private readonly ThirdPartyRepository $thirdPartyRepository, private readonly ThirdPartyRender $thirdPartyRender) {}
+    public function __construct(private readonly ThirdPartyRepository $thirdPartyRepository, private readonly ThirdPartyRender $thirdPartyRender)
+    {
+    }

    public function addRole(): ?string
    {
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/CreatorJobAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/CreatorJobAggregator.php
@@ -14,20 +14,21 @@ 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\Repository\UserJobRepositoryInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Doctrine\ORM\Query\Expr\Join;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;

-class JobScopeAggregator implements AggregatorInterface
+class CreatorJobAggregator implements AggregatorInterface
 {
    private const PREFIX = 'acp_agg_creator_job';

    public function __construct(
-        private readonly ScopeRepository $scopeRepository,
+        private readonly UserJobRepositoryInterface $userJobRepository,
        private readonly TranslatableStringHelper $translatableStringHelper
-    ) {}
+    ) {
+    }

    public function addRole(): ?string
    {
@@ -65,7 +66,9 @@ class JobScopeAggregator implements AggregatorInterface
        return Declarations::ACTIVITY;
    }

-    public function buildForm(FormBuilderInterface $builder) {}
+    public function buildForm(FormBuilderInterface $builder)
+    {
+    }

    public function getFormDefaultData(): array
    {
@@ -76,17 +79,15 @@ class JobScopeAggregator implements AggregatorInterface
    {
        return function ($value): string {
            if ('_header' === $value) {
-                return 'Scope';
+                return 'Job';
            }

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

-            $s = $this->scopeRepository->find($value);
-
            return $this->translatableStringHelper->localize(
-                $s->getName()
+                $s->getLabel()
            );
        };
    }
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/CreatorScopeAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/CreatorScopeAggregator.php
@@ -27,7 +27,8 @@ class CreatorScopeAggregator implements AggregatorInterface
    public function __construct(
        private readonly ScopeRepository $scopeRepository,
        private readonly TranslatableStringHelper $translatableStringHelper
-    ) {}
+    ) {
+    }

    public function addRole(): ?string
    {
@@ -65,7 +66,9 @@ class CreatorScopeAggregator implements AggregatorInterface
        return Declarations::ACTIVITY;
    }

-    public function buildForm(FormBuilderInterface $builder) {}
+    public function buildForm(FormBuilderInterface $builder)
+    {
+    }

    public function getFormDefaultData(): array
    {
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/DateAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/DateAggregator.php
@@ -73,7 +73,6 @@ class DateAggregator implements AggregatorInterface
            'choices' => self::CHOICES,
            'multiple' => false,
            'expanded' => true,
-            'empty_data' => self::DEFAULT_CHOICE,
        ]);
    }

--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/LocationTypeAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/LocationTypeAggregator.php
@@ -20,7 +20,9 @@ use Symfony\Component\Form\FormBuilderInterface;

 class LocationTypeAggregator implements AggregatorInterface
 {
-    public function __construct(private readonly LocationTypeRepository $locationTypeRepository, private readonly TranslatableStringHelper $translatableStringHelper) {}
+    public function __construct(private readonly LocationTypeRepository $locationTypeRepository, private readonly TranslatableStringHelper $translatableStringHelper)
+    {
+    }

    public function addRole(): ?string
    {
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/PersonAggregators/PersonAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/PersonAggregators/PersonAggregator.php
@@ -0,0 +1,67 @@
+<?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\PersonAggregators;
+
+use Chill\ActivityBundle\Export\Declarations;
+use Chill\MainBundle\Export\AggregatorInterface;
+use Chill\PersonBundle\Export\Helper\LabelPersonHelper;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\FormBuilderInterface;
+
+final readonly class PersonAggregator implements AggregatorInterface
+{
+    public function __construct(private LabelPersonHelper $labelPersonHelper)
+    {
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        // nothing to add here
+    }
+
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
+
+    public function getLabels($key, array $values, mixed $data)
+    {
+        return $this->labelPersonHelper->getLabel($key, $values, 'export.aggregator.person.by_person.person');
+    }
+
+    public function getQueryKeys($data)
+    {
+        return ['activity_by_person_agg'];
+    }
+
+    public function getTitle()
+    {
+        return 'export.aggregator.person.by_person.title';
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        $qb
+            ->addSelect('IDENTITY(activity.person) AS activity_by_person_agg')
+            ->addGroupBy('activity_by_person_agg');
+    }
+
+    public function applyOn()
+    {
+        return Declarations::ACTIVITY_PERSON;
+    }
+}
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/PersonsAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/PersonsAggregator.php
@@ -0,0 +1,80 @@
+<?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\ActivityBundle\Tests\Export\Aggregator\PersonsAggregatorTest;
+use Chill\MainBundle\Export\AggregatorInterface;
+use Chill\PersonBundle\Export\Helper\LabelPersonHelper;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\FormBuilderInterface;
+
+/**
+ * @see PersonsAggregatorTest
+ */
+final readonly class PersonsAggregator implements AggregatorInterface
+{
+    private const PREFIX = 'act_persons_agg';
+
+    public function __construct(private LabelPersonHelper $labelPersonHelper)
+    {
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        // nothing to add here
+    }
+
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
+
+    public function getLabels($key, array $values, mixed $data)
+    {
+        if ($key !== self::PREFIX.'_pid') {
+            throw new \UnexpectedValueException('this key should not be handled: '.$key);
+        }
+
+        return $this->labelPersonHelper->getLabel($key, $values, 'export.aggregator.activity.by_persons.Persons');
+    }
+
+    public function getQueryKeys($data)
+    {
+        return [self::PREFIX.'_pid'];
+    }
+
+    public function getTitle()
+    {
+        return 'export.aggregator.activity.by_persons.Group activity by persons';
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        $p = self::PREFIX;
+
+        $qb
+            ->leftJoin('activity.persons', "{$p}_p")
+            ->addSelect("{$p}_p.id AS {$p}_pid")
+            ->addGroupBy("{$p}_pid");
+    }
+
+    public function applyOn()
+    {
+        return Declarations::ACTIVITY;
+    }
+}
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/SentReceivedAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/SentReceivedAggregator.php
@@ -19,7 +19,9 @@ use Symfony\Contracts\Translation\TranslatorInterface;

 class SentReceivedAggregator implements AggregatorInterface
 {
-    public function __construct(private readonly TranslatorInterface $translator) {}
+    public function __construct(private readonly TranslatorInterface $translator)
+    {
+    }

    public function addRole(): ?string
    {
--- a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/AvgActivityDuration.php
+++ b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/AvgActivityDuration.php
@@ -11,8 +11,8 @@ declare(strict_types=1);

 namespace Chill\ActivityBundle\Export\Export\LinkedToACP;

-use Chill\ActivityBundle\Entity\Activity;
 use Chill\ActivityBundle\Export\Declarations;
+use Chill\ActivityBundle\Repository\ActivityRepository;
 use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
 use Chill\MainBundle\Export\AccompanyingCourseExportHelper;
 use Chill\MainBundle\Export\ExportInterface;
@@ -21,22 +21,24 @@ use Chill\MainBundle\Export\GroupedExportInterface;
 use Chill\PersonBundle\Entity\AccompanyingPeriodParticipation;
 use Chill\PersonBundle\Entity\Person\PersonCenterHistory;
 use Chill\PersonBundle\Export\Declarations as PersonDeclarations;
-use Doctrine\ORM\EntityManagerInterface;
-use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\Query;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Symfony\Component\Form\FormBuilderInterface;

 class AvgActivityDuration implements ExportInterface, GroupedExportInterface
 {
-    protected EntityRepository $repository;
+    private readonly bool $filterStatsByCenters;

    public function __construct(
-        EntityManagerInterface $em,
+        private readonly ActivityRepository $activityRepository,
+        ParameterBagInterface $parameterBag,
    ) {
-        $this->repository = $em->getRepository(Activity::class);
+        $this->filterStatsByCenters = $parameterBag->get('chill_main')['acl']['filter_stats_by_center'];
    }

-    public function buildForm(FormBuilderInterface $builder) {}
+    public function buildForm(FormBuilderInterface $builder)
+    {
+    }

    public function getFormDefaultData(): array
    {
@@ -91,23 +93,25 @@ class AvgActivityDuration implements ExportInterface, GroupedExportInterface
    {
        $centers = array_map(static fn ($el) => $el['center'], $acl);

-        $qb = $this->repository->createQueryBuilder('activity');
+        $qb = $this->activityRepository->createQueryBuilder('activity');

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

-        $qb
-            ->andWhere(
-                $qb->expr()->exists(
-                    'SELECT 1 FROM '.AccompanyingPeriodParticipation::class.' acl_count_part
+        if ($this->filterStatsByCenters) {
+            $qb
+                ->andWhere(
+                    $qb->expr()->exists(
+                        'SELECT 1 FROM '.AccompanyingPeriodParticipation::class.' acl_count_part
                    JOIN '.PersonCenterHistory::class.' acl_count_person_history WITH IDENTITY(acl_count_person_history.person) = IDENTITY(acl_count_part.person)
                    WHERE acl_count_part.accompanyingPeriod = acp.id AND acl_count_person_history.center IN (:authorized_centers)
                    '
+                    )
                )
-            )
-            ->setParameter('authorized_centers', $centers);
+                ->setParameter('authorized_centers', $centers);
+        }

        AccompanyingCourseExportHelper::addClosingMotiveExclusionClause($qb);

--- a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/AvgActivityVisitDuration.php
+++ b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/AvgActivityVisitDuration.php
@@ -24,16 +24,21 @@ use Chill\PersonBundle\Export\Declarations as PersonDeclarations;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\Query;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Symfony\Component\Form\FormBuilderInterface;

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

+    private readonly bool $filterStatsByCenters;
+
    public function __construct(
        EntityManagerInterface $em,
+        ParameterBagInterface $parameterBag,
    ) {
        $this->repository = $em->getRepository(Activity::class);
+        $this->filterStatsByCenters = $parameterBag->get('chill_main')['acl']['filter_stats_by_center'];
    }

    public function buildForm(FormBuilderInterface $builder)
@@ -101,16 +106,18 @@ class AvgActivityVisitDuration implements ExportInterface, GroupedExportInterfac
            ->select('AVG(activity.travelTime) as export_avg_activity_visit_duration')
            ->andWhere($qb->expr()->isNotNull('activity.travelTime'));

-        $qb
-            ->andWhere(
-                $qb->expr()->exists(
-                    'SELECT 1 FROM '.AccompanyingPeriodParticipation::class.' acl_count_part
+        if ($this->filterStatsByCenters) {
+            $qb
+                ->andWhere(
+                    $qb->expr()->exists(
+                        'SELECT 1 FROM '.AccompanyingPeriodParticipation::class.' acl_count_part
                    JOIN '.PersonCenterHistory::class.' acl_count_person_history WITH IDENTITY(acl_count_person_history.person) = IDENTITY(acl_count_part.person)
                    WHERE acl_count_part.accompanyingPeriod = acp.id AND acl_count_person_history.center IN (:authorized_centers)
                    '
+                    )
                )
-            )
-            ->setParameter('authorized_centers', $centers);
+                ->setParameter('authorized_centers', $centers);
+        }

        AccompanyingCourseExportHelper::addClosingMotiveExclusionClause($qb);

--- a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/CountActivity.php
+++ b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/CountActivity.php
@@ -24,19 +24,26 @@ use Chill\PersonBundle\Export\Declarations as PersonDeclarations;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\Query;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Symfony\Component\Form\FormBuilderInterface;

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

+    private readonly bool $filterStatsByCenters;
+
    public function __construct(
        EntityManagerInterface $em,
+        ParameterBagInterface $parameterBag,
    ) {
        $this->repository = $em->getRepository(Activity::class);
+        $this->filterStatsByCenters = $parameterBag->get('chill_main')['acl']['filter_stats_by_center'];
    }

-    public function buildForm(FormBuilderInterface $builder) {}
+    public function buildForm(FormBuilderInterface $builder)
+    {
+    }

    public function getFormDefaultData(): array
    {
@@ -95,16 +102,18 @@ class CountActivity implements ExportInterface, GroupedExportInterface
            ->createQueryBuilder('activity')
            ->join('activity.accompanyingPeriod', 'acp');

-        $qb
-            ->andWhere(
-                $qb->expr()->exists(
-                    'SELECT 1 FROM '.AccompanyingPeriodParticipation::class.' acl_count_part
+        if ($this->filterStatsByCenters) {
+            $qb
+                ->andWhere(
+                    $qb->expr()->exists(
+                        'SELECT 1 FROM '.AccompanyingPeriodParticipation::class.' acl_count_part
                    JOIN '.PersonCenterHistory::class.' acl_count_person_history WITH IDENTITY(acl_count_person_history.person) = IDENTITY(acl_count_part.person)
                    WHERE acl_count_part.accompanyingPeriod = acp.id AND acl_count_person_history.center IN (:authorized_centers)
                    '
+                    )
                )
-            )
-            ->setParameter('authorized_centers', $centers);
+                ->setParameter('authorized_centers', $centers);
+        }

        AccompanyingCourseExportHelper::addClosingMotiveExclusionClause($qb);

--- a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/CountHouseholdOnActivity.php
+++ b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/CountHouseholdOnActivity.php
@@ -0,0 +1,149 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\ActivityBundle\Export\Export\LinkedToACP;
+
+use Chill\ActivityBundle\Entity\Activity;
+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;
+use Chill\PersonBundle\Entity\AccompanyingPeriodParticipation;
+use Chill\PersonBundle\Entity\Household\HouseholdMember;
+use Chill\PersonBundle\Entity\Person\PersonCenterHistory;
+use Chill\PersonBundle\Export\Declarations as PersonDeclarations;
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\EntityRepository;
+use Doctrine\ORM\Query;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
+use Symfony\Component\Form\FormBuilderInterface;
+
+final readonly class CountHouseholdOnActivity implements ExportInterface, GroupedExportInterface
+{
+    private EntityRepository $repository;
+
+    private bool $filterStatsByCenters;
+
+    public function __construct(
+        EntityManagerInterface $em,
+        ParameterBagInterface $parameterBag,
+    ) {
+        $this->repository = $em->getRepository(Activity::class);
+        $this->filterStatsByCenters = $parameterBag->get('chill_main')['acl']['filter_stats_by_center'];
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+    }
+
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
+
+    public function getAllowedFormattersTypes(): array
+    {
+        return [FormatterInterface::TYPE_TABULAR];
+    }
+
+    public function getDescription(): string
+    {
+        return 'export.export.count_household_on_activity.description';
+    }
+
+    public function getGroup(): string
+    {
+        return 'Exports of activities linked to an accompanying period';
+    }
+
+    public function getLabels($key, array $values, $data)
+    {
+        if ('export_count_activity' !== $key) {
+            throw new \LogicException("the key {$key} is not used by this export");
+        }
+
+        return static fn ($value) => '_header' === $value ? 'export.export.count_household_on_activity.header' : $value;
+    }
+
+    public function getQueryKeys($data): array
+    {
+        return ['export_count_activity'];
+    }
+
+    public function getResult($query, $data)
+    {
+        return $query->getQuery()->getResult(Query::HYDRATE_SCALAR);
+    }
+
+    public function getTitle(): string
+    {
+        return 'export.export.count_household_on_activity.title';
+    }
+
+    public function getType(): string
+    {
+        return Declarations::ACTIVITY;
+    }
+
+    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
+    {
+        $centers = array_map(static fn ($el) => $el['center'], $acl);
+
+        $qb = $this->repository
+            ->createQueryBuilder('activity')
+            ->join('activity.persons', 'person')
+            ->join('activity.accompanyingPeriod', 'acp')
+            ->join(
+                HouseholdMember::class,
+                'householdmember',
+                Query\Expr\Join::WITH,
+                'person.id = IDENTITY(householdmember.person) AND householdmember.startDate <= activity.date AND (householdmember.endDate IS NULL OR householdmember.endDate > activity.date)'
+            )
+            ->join('householdmember.household', 'household');
+
+        if ($this->filterStatsByCenters) {
+            $qb
+                ->andWhere(
+                    $qb->expr()->exists(
+                        'SELECT 1 FROM '.AccompanyingPeriodParticipation::class.' acl_count_part
+                    JOIN '.PersonCenterHistory::class.' acl_count_person_history WITH IDENTITY(acl_count_person_history.person) = IDENTITY(acl_count_part.person)
+                    WHERE acl_count_part.accompanyingPeriod = acp.id AND acl_count_person_history.center IN (:authorized_centers)
+                    '
+                    )
+                )
+                ->setParameter('authorized_centers', $centers);
+        }
+
+        AccompanyingCourseExportHelper::addClosingMotiveExclusionClause($qb);
+
+        $qb->select('COUNT(DISTINCT household.id) as export_count_activity');
+
+        return $qb;
+    }
+
+    public function requiredRole(): string
+    {
+        return ActivityStatsVoter::STATS;
+    }
+
+    public function supportsModifiers(): array
+    {
+        return [
+            Declarations::ACTIVITY,
+            Declarations::ACTIVITY_ACP,
+            PersonDeclarations::ACP_TYPE,
+            PersonDeclarations::PERSON_TYPE,
+            PersonDeclarations::HOUSEHOLD_TYPE,
+        ];
+    }
+}
--- a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/CountPersonsOnActivity.php
+++ b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/CountPersonsOnActivity.php
@@ -0,0 +1,140 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\ActivityBundle\Export\Export\LinkedToACP;
+
+use Chill\ActivityBundle\Entity\Activity;
+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;
+use Chill\PersonBundle\Entity\AccompanyingPeriodParticipation;
+use Chill\PersonBundle\Entity\Person\PersonCenterHistory;
+use Chill\PersonBundle\Export\Declarations as PersonDeclarations;
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\EntityRepository;
+use Doctrine\ORM\Query;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
+use Symfony\Component\Form\FormBuilderInterface;
+
+class CountPersonsOnActivity implements ExportInterface, GroupedExportInterface
+{
+    protected EntityRepository $repository;
+
+    private readonly bool $filterStatsByCenters;
+
+    public function __construct(
+        EntityManagerInterface $em,
+        ParameterBagInterface $parameterBag,
+    ) {
+        $this->repository = $em->getRepository(Activity::class);
+        $this->filterStatsByCenters = $parameterBag->get('chill_main')['acl']['filter_stats_by_center'];
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+    }
+
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
+
+    public function getAllowedFormattersTypes(): array
+    {
+        return [FormatterInterface::TYPE_TABULAR];
+    }
+
+    public function getDescription(): string
+    {
+        return 'export.export.count_person_on_activity.description';
+    }
+
+    public function getGroup(): string
+    {
+        return 'Exports of activities linked to an accompanying period';
+    }
+
+    public function getLabels($key, array $values, $data)
+    {
+        if ('export_count_activity' !== $key) {
+            throw new \LogicException("the key {$key} is not used by this export");
+        }
+
+        return static fn ($value) => '_header' === $value ? 'export.export.count_person_on_activity.header' : $value;
+    }
+
+    public function getQueryKeys($data): array
+    {
+        return ['export_count_activity'];
+    }
+
+    public function getResult($query, $data)
+    {
+        return $query->getQuery()->getResult(Query::HYDRATE_SCALAR);
+    }
+
+    public function getTitle(): string
+    {
+        return 'export.export.count_person_on_activity.title';
+    }
+
+    public function getType(): string
+    {
+        return Declarations::ACTIVITY;
+    }
+
+    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
+    {
+        $centers = array_map(static fn ($el) => $el['center'], $acl);
+
+        $qb = $this->repository
+            ->createQueryBuilder('activity')
+            ->join('activity.persons', 'person')
+            ->join('activity.accompanyingPeriod', 'acp');
+
+        if ($this->filterStatsByCenters) {
+            $qb
+                ->andWhere(
+                    $qb->expr()->exists(
+                        'SELECT 1 FROM '.AccompanyingPeriodParticipation::class.' acl_count_part
+                    JOIN '.PersonCenterHistory::class.' acl_count_person_history WITH IDENTITY(acl_count_person_history.person) = IDENTITY(acl_count_part.person)
+                    WHERE acl_count_part.accompanyingPeriod = acp.id AND acl_count_person_history.center IN (:authorized_centers)
+                    '
+                    )
+                )
+                ->setParameter('authorized_centers', $centers);
+        }
+
+        AccompanyingCourseExportHelper::addClosingMotiveExclusionClause($qb);
+
+        $qb->select('COUNT(DISTINCT person.id) as export_count_activity');
+
+        return $qb;
+    }
+
+    public function requiredRole(): string
+    {
+        return ActivityStatsVoter::STATS;
+    }
+
+    public function supportsModifiers(): array
+    {
+        return [
+            Declarations::ACTIVITY,
+            Declarations::ACTIVITY_ACP,
+            PersonDeclarations::ACP_TYPE,
+            PersonDeclarations::PERSON_TYPE,
+        ];
+    }
+}
--- a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/ListActivity.php
+++ b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/ListActivity.php
@@ -20,13 +20,19 @@ use Chill\MainBundle\Export\AccompanyingCourseExportHelper;
 use Chill\MainBundle\Export\GroupedExportInterface;
 use Chill\MainBundle\Export\Helper\TranslatableStringExportLabelHelper;
 use Chill\MainBundle\Export\ListInterface;
-use Chill\PersonBundle\Entity\Person\PersonCenterHistory;
+use Chill\PersonBundle\Export\Helper\FilterListAccompanyingPeriodHelperInterface;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\Form\FormBuilderInterface;

-class ListActivity implements ListInterface, GroupedExportInterface
+final readonly class ListActivity implements ListInterface, GroupedExportInterface
 {
-    public function __construct(private readonly ListActivityHelper $helper, private readonly EntityManagerInterface $entityManager, private readonly TranslatableStringExportLabelHelper $translatableStringExportLabelHelper) {}
+    public function __construct(
+        private ListActivityHelper $helper,
+        private EntityManagerInterface $entityManager,
+        private TranslatableStringExportLabelHelper $translatableStringExportLabelHelper,
+        private FilterListAccompanyingPeriodHelperInterface $filterListAccompanyingPeriodHelper,
+    ) {
+    }

    public function buildForm(FormBuilderInterface $builder)
    {
@@ -107,21 +113,15 @@ class ListActivity implements ListInterface, GroupedExportInterface
            ->join('activity.accompanyingPeriod', 'acp')
            ->leftJoin('acp.participations', 'acppart')
            ->leftJoin('acppart.person', 'person')
-            ->andWhere('acppart.startDate != acppart.endDate OR acppart.endDate IS NULL')
-            ->andWhere(
-                $qb->expr()->exists(
-                    'SELECT 1
-                    FROM '.PersonCenterHistory::class.' acl_count_person_history
-                    WHERE acl_count_person_history.person = person
-                    AND acl_count_person_history.center IN (:authorized_centers)
-                    '
-                )
-            )
+            ->andWhere('acppart.startDate != acppart.endDate OR acppart.endDate IS NULL');
+
+        $this->filterListAccompanyingPeriodHelper->addFilterAccompanyingPeriods($qb, $requiredModifiers, $acl, $data);
+
+        $qb
            // some grouping are necessary
            ->addGroupBy('acp.id')
            ->addOrderBy('activity.date')
-            ->addOrderBy('activity.id')
-            ->setParameter('authorized_centers', $centers);
+            ->addOrderBy('activity.id');

        $this->helper->addSelect($qb);

--- a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/SumActivityDuration.php
+++ b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/SumActivityDuration.php
@@ -24,16 +24,20 @@ use Chill\PersonBundle\Export\Declarations as PersonDeclarations;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\Query;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Symfony\Component\Form\FormBuilderInterface;

 class SumActivityDuration implements ExportInterface, GroupedExportInterface
 {
    protected EntityRepository $repository;
+    private readonly bool $filterStatsByCenters;

    public function __construct(
        EntityManagerInterface $em,
+        ParameterBagInterface $parameterBag,
    ) {
        $this->repository = $em->getRepository(Activity::class);
+        $this->filterStatsByCenters = $parameterBag->get('chill_main')['acl']['filter_stats_by_center'];
    }

    public function buildForm(FormBuilderInterface $builder)
@@ -101,16 +105,18 @@ class SumActivityDuration implements ExportInterface, GroupedExportInterface
        $qb->select('SUM(activity.durationTime) as export_sum_activity_duration')
            ->andWhere($qb->expr()->isNotNull('activity.durationTime'));

-        $qb
-            ->andWhere(
-                $qb->expr()->exists(
-                    'SELECT 1 FROM '.AccompanyingPeriodParticipation::class.' acl_count_part
+        if ($this->filterStatsByCenters) {
+            $qb
+                ->andWhere(
+                    $qb->expr()->exists(
+                        'SELECT 1 FROM '.AccompanyingPeriodParticipation::class.' acl_count_part
                    JOIN '.PersonCenterHistory::class.' acl_count_person_history WITH IDENTITY(acl_count_person_history.person) = IDENTITY(acl_count_part.person)
                    WHERE acl_count_part.accompanyingPeriod = acp.id AND acl_count_person_history.center IN (:authorized_centers)
                    '
+                    )
                )
-            )
-            ->setParameter('authorized_centers', $centers);
+                ->setParameter('authorized_centers', $centers);
+        }

        AccompanyingCourseExportHelper::addClosingMotiveExclusionClause($qb);

--- a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/SumActivityVisitDuration.php
+++ b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/SumActivityVisitDuration.php
@@ -24,16 +24,20 @@ use Chill\PersonBundle\Export\Declarations as PersonDeclarations;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\Query;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Symfony\Component\Form\FormBuilderInterface;

 class SumActivityVisitDuration implements ExportInterface, GroupedExportInterface
 {
    protected EntityRepository $repository;
+    private readonly bool $filterStatsByCenters;

    public function __construct(
        EntityManagerInterface $em,
+        ParameterBagInterface $parameterBag,
    ) {
        $this->repository = $em->getRepository(Activity::class);
+        $this->filterStatsByCenters = $parameterBag->get('chill_main')['acl']['filter_stats_by_center'];
    }

    public function buildForm(FormBuilderInterface $builder)
@@ -101,16 +105,18 @@ class SumActivityVisitDuration implements ExportInterface, GroupedExportInterfac
        $qb->select('SUM(activity.travelTime) as export_sum_activity_visit_duration')
            ->andWhere($qb->expr()->isNotNull('activity.travelTime'));

-        $qb
-            ->andWhere(
-                $qb->expr()->exists(
-                    'SELECT 1 FROM '.AccompanyingPeriodParticipation::class.' acl_count_part
+        if ($this->filterStatsByCenters) {
+            $qb
+                ->andWhere(
+                    $qb->expr()->exists(
+                        'SELECT 1 FROM '.AccompanyingPeriodParticipation::class.' acl_count_part
                    JOIN '.PersonCenterHistory::class.' acl_count_person_history WITH IDENTITY(acl_count_person_history.person) = IDENTITY(acl_count_part.person)
                    WHERE acl_count_part.accompanyingPeriod = acp.id AND acl_count_person_history.center IN (:authorized_centers)
                    '
+                    )
                )
-            )
-            ->setParameter('authorized_centers', $centers);
+                ->setParameter('authorized_centers', $centers);
+        }

        AccompanyingCourseExportHelper::addClosingMotiveExclusionClause($qb);

--- a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/CountActivity.php
+++ b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/CountActivity.php
@@ -19,13 +19,23 @@ use Chill\MainBundle\Export\FormatterInterface;
 use Chill\MainBundle\Export\GroupedExportInterface;
 use Chill\PersonBundle\Export\Declarations as PersonDeclarations;
 use Doctrine\ORM\Query;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Symfony\Component\Form\FormBuilderInterface;

 class CountActivity implements ExportInterface, GroupedExportInterface
 {
-    public function __construct(protected ActivityRepository $activityRepository) {}
+    private readonly bool $filterStatsByCenters;

-    public function buildForm(FormBuilderInterface $builder) {}
+    public function __construct(
+        private readonly ActivityRepository $activityRepository,
+        ParameterBagInterface $parameterBag,
+    ) {
+        $this->filterStatsByCenters = $parameterBag->get('chill_main')['acl']['filter_stats_by_center'];
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+    }

    public function getFormDefaultData(): array
    {
@@ -82,23 +92,25 @@ class CountActivity implements ExportInterface, GroupedExportInterface

        $qb = $this->activityRepository
            ->createQueryBuilder('activity')
-            ->join('activity.person', 'person')
-            ->join('person.centerHistory', 'centerHistory');
+            ->join('activity.person', 'person');

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

-        $qb
-            ->where(
-                $qb->expr()->andX(
-                    $qb->expr()->lte('centerHistory.startDate', 'activity.date'),
-                    $qb->expr()->orX(
-                        $qb->expr()->isNull('centerHistory.endDate'),
-                        $qb->expr()->gt('centerHistory.endDate', 'activity.date')
+        if ($this->filterStatsByCenters) {
+            $qb
+                ->join('person.centerHistory', 'centerHistory')
+                ->where(
+                    $qb->expr()->andX(
+                        $qb->expr()->lte('centerHistory.startDate', 'activity.date'),
+                        $qb->expr()->orX(
+                            $qb->expr()->isNull('centerHistory.endDate'),
+                            $qb->expr()->gt('centerHistory.endDate', 'activity.date')
+                        )
                    )
                )
-            )
-            ->andWhere($qb->expr()->in('centerHistory.center', ':centers'))
-            ->setParameter('centers', $centers);
+                ->andWhere($qb->expr()->in('centerHistory.center', ':centers'))
+                ->setParameter('centers', $centers);
+        }

        return $qb;
    }
--- a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/CountHouseholdOnActivity.php
+++ b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/CountHouseholdOnActivity.php
@@ -0,0 +1,140 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\ActivityBundle\Export\Export\LinkedToPerson;
+
+use Chill\ActivityBundle\Export\Declarations;
+use Chill\ActivityBundle\Repository\ActivityRepository;
+use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
+use Chill\MainBundle\Export\ExportInterface;
+use Chill\MainBundle\Export\FormatterInterface;
+use Chill\MainBundle\Export\GroupedExportInterface;
+use Chill\PersonBundle\Entity\Household\HouseholdMember;
+use Chill\PersonBundle\Export\Declarations as PersonDeclarations;
+use Doctrine\ORM\Query;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
+use Symfony\Component\Form\FormBuilderInterface;
+
+final readonly class CountHouseholdOnActivity implements ExportInterface, GroupedExportInterface
+{
+    private bool $filterStatsByCenters;
+
+    public function __construct(
+        private ActivityRepository $activityRepository,
+        ParameterBagInterface $parameterBag,
+    ) {
+        $this->filterStatsByCenters = $parameterBag->get('chill_main')['acl']['filter_stats_by_center'];
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+    }
+
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
+
+    public function getAllowedFormattersTypes()
+    {
+        return [FormatterInterface::TYPE_TABULAR];
+    }
+
+    public function getDescription()
+    {
+        return 'export.export.count_household_on_activity_person.description';
+    }
+
+    public function getGroup(): string
+    {
+        return 'Exports of activities linked to a person';
+    }
+
+    public function getLabels($key, array $values, $data)
+    {
+        if ('export_count_activity' !== $key) {
+            throw new \LogicException("the key {$key} is not used by this export");
+        }
+
+        return static fn ($value) => '_header' === $value ? 'export.export.count_household_on_activity_person.header' : $value;
+    }
+
+    public function getQueryKeys($data)
+    {
+        return ['export_count_activity'];
+    }
+
+    public function getResult($query, $data)
+    {
+        return $query->getQuery()->getResult(Query::HYDRATE_SCALAR);
+    }
+
+    public function getTitle()
+    {
+        return 'export.export.count_household_on_activity_person.title';
+    }
+
+    public function getType(): string
+    {
+        return Declarations::ACTIVITY;
+    }
+
+    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
+    {
+        $centers = array_map(static fn ($el) => $el['center'], $acl);
+
+        $qb = $this->activityRepository
+            ->createQueryBuilder('activity')
+            ->join('activity.person', 'person')
+            ->join(
+                HouseholdMember::class,
+                'householdmember',
+                Query\Expr\Join::WITH,
+                'person = householdmember.person AND householdmember.startDate <= activity.date AND (householdmember.endDate IS NULL OR householdmember.endDate > activity.date)'
+            )
+            ->join('householdmember.household', 'household');
+
+        $qb->select('COUNT(DISTINCT household.id) as export_count_activity');
+
+        if ($this->filterStatsByCenters) {
+            $qb
+                ->join('person.centerHistory', 'centerHistory')
+                ->where(
+                    $qb->expr()->andX(
+                        $qb->expr()->lte('centerHistory.startDate', 'activity.date'),
+                        $qb->expr()->orX(
+                            $qb->expr()->isNull('centerHistory.endDate'),
+                            $qb->expr()->gt('centerHistory.endDate', 'activity.date')
+                        )
+                    )
+                )
+                ->andWhere($qb->expr()->in('centerHistory.center', ':centers'))
+                ->setParameter('centers', $centers);
+        }
+
+        return $qb;
+    }
+
+    public function requiredRole(): string
+    {
+        return ActivityStatsVoter::STATS;
+    }
+
+    public function supportsModifiers()
+    {
+        return [
+            Declarations::ACTIVITY,
+            Declarations::ACTIVITY_PERSON,
+            PersonDeclarations::PERSON_TYPE,
+            PersonDeclarations::HOUSEHOLD_TYPE,
+        ];
+    }
+}
--- a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/ListActivity.php
+++ b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/ListActivity.php
@@ -23,6 +23,7 @@ use Chill\PersonBundle\Export\Declarations as PersonDeclarations;
 use Doctrine\DBAL\Exception\InvalidArgumentException;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Query;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Validator\Constraints\Callback;
@@ -44,8 +45,17 @@ class ListActivity implements ListInterface, GroupedExportInterface
        'person_lastname',
        'person_id',
    ];
+    private readonly bool $filterStatsByCenters;

-    public function __construct(protected EntityManagerInterface $entityManager, protected TranslatorInterface $translator, protected TranslatableStringHelperInterface $translatableStringHelper, private readonly ActivityRepository $activityRepository) {}
+    public function __construct(
+        protected EntityManagerInterface $entityManager,
+        protected TranslatorInterface $translator,
+        protected TranslatableStringHelperInterface $translatableStringHelper,
+        private readonly ActivityRepository $activityRepository,
+        ParameterBagInterface $parameterBag,
+    ) {
+        $this->filterStatsByCenters = $parameterBag->get('chill_main')['acl']['filter_stats_by_center'];
+    }

    public function buildForm(FormBuilderInterface $builder)
    {
@@ -188,20 +198,22 @@ class ListActivity implements ListInterface, GroupedExportInterface

        $qb
            ->from('ChillActivityBundle:Activity', 'activity')
-            ->join('activity.person', 'actperson')
-            ->join('actperson.centerHistory', 'centerHistory');
+            ->join('activity.person', 'actperson');

-        $qb->where(
-            $qb->expr()->andX(
-                $qb->expr()->lte('centerHistory.startDate', 'activity.date'),
-                $qb->expr()->orX(
-                    $qb->expr()->isNull('centerHistory.endDate'),
-                    $qb->expr()->gt('centerHistory.endDate', 'activity.date')
+        if ($this->filterStatsByCenters) {
+            $qb->join('actperson.centerHistory', 'centerHistory');
+            $qb->where(
+                $qb->expr()->andX(
+                    $qb->expr()->lte('centerHistory.startDate', 'activity.date'),
+                    $qb->expr()->orX(
+                        $qb->expr()->isNull('centerHistory.endDate'),
+                        $qb->expr()->gt('centerHistory.endDate', 'activity.date')
+                    )
                )
            )
-        )
-            ->andWhere($qb->expr()->in('centerHistory.center', ':centers'))
-            ->setParameter('centers', $centers);
+                ->andWhere($qb->expr()->in('centerHistory.center', ':centers'))
+                ->setParameter('centers', $centers);
+        }

        foreach ($this->fields as $f) {
            if (\in_array($f, $data['fields'], true)) {
--- a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/StatActivityDuration.php
+++ b/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 Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Symfony\Component\Form\FormBuilderInterface;

 /**
@@ -30,19 +31,25 @@ use Symfony\Component\Form\FormBuilderInterface;
 class StatActivityDuration implements ExportInterface, GroupedExportInterface
 {
    final public const SUM = 'sum';
+    private readonly bool $filterStatsByCenters;

    /**
     * @param string $action the stat to perform
     */
    public function __construct(
        private readonly ActivityRepository $activityRepository,
+        ParameterBagInterface $parameterBag,
        /**
         * The action for this report.
         */
        protected string $action = 'sum'
-    ) {}
+    ) {
+        $this->filterStatsByCenters = $parameterBag->get('chill_main')['acl']['filter_stats_by_center'];
+    }

-    public function buildForm(FormBuilderInterface $builder) {}
+    public function buildForm(FormBuilderInterface $builder)
+    {
+    }

    public function getFormDefaultData(): array
    {
@@ -119,21 +126,23 @@ class StatActivityDuration implements ExportInterface, GroupedExportInterface
        }

        $qb->select($select)
-            ->join('activity.person', 'person')
-            ->join('person.centerHistory', 'centerHistory');
+            ->join('activity.person', 'person');

-        $qb
-            ->where(
-                $qb->expr()->andX(
-                    $qb->expr()->lte('centerHistory.startDate', 'activity.date'),
-                    $qb->expr()->orX(
-                        $qb->expr()->isNull('centerHistory.endDate'),
-                        $qb->expr()->gt('centerHistory.endDate', 'activity.date')
+        if ($this->filterStatsByCenters) {
+            $qb
+                ->join('person.centerHistory', 'centerHistory')
+                ->where(
+                    $qb->expr()->andX(
+                        $qb->expr()->lte('centerHistory.startDate', 'activity.date'),
+                        $qb->expr()->orX(
+                            $qb->expr()->isNull('centerHistory.endDate'),
+                            $qb->expr()->gt('centerHistory.endDate', 'activity.date')
+                        )
                    )
                )
-            )
-            ->andWhere($qb->expr()->in('centerHistory.center', ':centers'))
-            ->setParameter('centers', $centers);
+                ->andWhere($qb->expr()->in('centerHistory.center', ':centers'))
+                ->setParameter('centers', $centers);
+        }

        return $qb;
    }
--- a/src/Bundle/ChillActivityBundle/Export/Export/ListActivityHelper.php
+++ b/src/Bundle/ChillActivityBundle/Export/Export/ListActivityHelper.php
@@ -40,7 +40,8 @@ class ListActivityHelper
        private readonly TranslatableStringHelperInterface $translatableStringHelper,
        private readonly TranslatableStringExportLabelHelper $translatableStringLabelHelper,
        private readonly UserHelper $userHelper
-    ) {}
+    ) {
+    }

    public function addSelect(QueryBuilder $qb): void
    {
@@ -74,7 +75,9 @@ class ListActivityHelper
            ->addGroupBy('location.id');
    }

-    public function buildForm(FormBuilderInterface $builder) {}
+    public function buildForm(FormBuilderInterface $builder)
+    {
+    }

    public function getAllowedFormattersTypes()
    {
--- a/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/ActivityTypeFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/ActivityTypeFilter.php
@@ -15,18 +15,24 @@ use Chill\ActivityBundle\Entity\Activity;
 use Chill\ActivityBundle\Entity\ActivityType;
 use Chill\ActivityBundle\Repository\ActivityTypeRepositoryInterface;
 use Chill\MainBundle\Export\FilterInterface;
+use Chill\MainBundle\Form\Type\PickRollingDateType;
+use Chill\MainBundle\Service\RollingDate\RollingDateConverterInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use Chill\PersonBundle\Export\Declarations;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\FormBuilderInterface;

-class ActivityTypeFilter implements FilterInterface
+final readonly class ActivityTypeFilter implements FilterInterface
 {
+    private const BASE_EXISTS = 'SELECT 1 FROM '.Activity::class.' act_type_filter_activity WHERE act_type_filter_activity.accompanyingPeriod = acp';
+
    public function __construct(
-        private readonly ActivityTypeRepositoryInterface $activityTypeRepository,
-        private readonly TranslatableStringHelperInterface $translatableStringHelper
-    ) {}
+        private ActivityTypeRepositoryInterface $activityTypeRepository,
+        private TranslatableStringHelperInterface $translatableStringHelper,
+        private RollingDateConverterInterface $rollingDateConverter,
+    ) {
+    }

    public function addRole(): ?string
    {
@@ -35,13 +41,26 @@ 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']);
+        $exists = self::BASE_EXISTS;
+
+        if (count($data['accepted_activitytypes']) > 0) {
+            $exists .= ' AND act_type_filter_activity.activityType IN (:act_type_filter_activity_types)';
+            $qb->setParameter('act_type_filter_activity_types', $data['accepted_activitytypes']);
+        }
+
+        if (null !== $data['date_after']) {
+            $exists .= ' AND act_type_filter_activity.date >= :act_type_filter_activity_date_after';
+            $qb->setParameter('act_type_filter_activity_date_after', $this->rollingDateConverter->convert($data['date_after']));
+        }
+
+        if (null !== $data['date_before']) {
+            $exists .= ' AND act_type_filter_activity.date >= :act_type_filter_activity_date_before';
+            $qb->setParameter('act_type_filter_activity_date_before', $this->rollingDateConverter->convert($data['date_before']));
+        }
+
+        if (self::BASE_EXISTS !== $exists) {
+            $qb->andWhere($qb->expr()->exists($exists));
+        }
    }

    public function applyOn()
@@ -60,11 +79,27 @@ class ActivityTypeFilter implements FilterInterface
            'multiple' => true,
            'expanded' => true,
        ]);
+
+        $builder->add('date_after', PickRollingDateType::class, [
+            'label' => 'export.filter.activity.acp_by_activity_type.activity after',
+            'help' => 'export.filter.activity.acp_by_activity_type.activity after help',
+            'required' => false,
+        ]);
+
+        $builder->add('date_before', PickRollingDateType::class, [
+            'label' => 'export.filter.activity.acp_by_activity_type.activity before',
+            'help' => 'export.filter.activity.acp_by_activity_type.activity before help',
+            'required' => false,
+        ]);
    }

    public function getFormDefaultData(): array
    {
-        return [];
+        return [
+            'accepted_activitytypes' => [],
+            'date_after' => null,
+            'date_before' => null,
+        ];
    }

    public function describeAction($data, $format = 'string'): array
@@ -75,8 +110,12 @@ class ActivityTypeFilter implements FilterInterface
            $types[] = $this->translatableStringHelper->localize($aty->getName());
        }

-        return ['export.filter.activity.acp_by_activity_type.acp_containing_at_least_one_%activitytypes%', [
-            '%activitytypes%' => implode(', ', $types),
+        return ['export.filter.activity.acp_by_activity_type.acp_containing_at_least_one_activitytypes', [
+            'activitytypes' => implode(', ', $types),
+            'has_date_after' => null !== $data['date_after'] ? 1 : 0,
+            'date_after' => $this->rollingDateConverter->convert($data['date_after']),
+            'has_date_before' => null !== $data['date_before'] ? 1 : 0,
+            'date_before' => $this->rollingDateConverter->convert($data['date_before']),
        ]];
    }

--- a/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/BySocialActionFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/BySocialActionFilter.php
@@ -21,7 +21,9 @@ use Symfony\Component\Form\FormBuilderInterface;

 class BySocialActionFilter implements FilterInterface
 {
-    public function __construct(private readonly SocialActionRender $actionRender) {}
+    public function __construct(private readonly SocialActionRender $actionRender)
+    {
+    }

    public function addRole(): ?string
    {
--- a/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/BySocialIssueFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/BySocialIssueFilter.php
@@ -21,7 +21,9 @@ use Symfony\Component\Form\FormBuilderInterface;

 class BySocialIssueFilter implements FilterInterface
 {
-    public function __construct(private readonly SocialIssueRender $issueRender) {}
+    public function __construct(private readonly SocialIssueRender $issueRender)
+    {
+    }

    public function addRole(): ?string
    {
--- a/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/PeriodHavingActivityBetweenDatesFilter.php
+++ b/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()
    {
--- a/src/Bundle/ChillActivityBundle/Export/Filter/ActivityDateFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/ActivityDateFilter.php
@@ -13,21 +13,19 @@ namespace Chill\ActivityBundle\Export\Filter;

 use Chill\ActivityBundle\Export\Declarations;
 use Chill\MainBundle\Export\FilterInterface;
-use Chill\MainBundle\Form\Type\Export\FilterType;
 use Chill\MainBundle\Form\Type\PickRollingDateType;
 use Chill\MainBundle\Service\RollingDate\RollingDate;
 use Chill\MainBundle\Service\RollingDate\RollingDateConverterInterface;
 use Doctrine\ORM\Query\Expr;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\Form\FormError;
-use Symfony\Component\Form\FormEvent;
-use Symfony\Component\Form\FormEvents;
 use Symfony\Contracts\Translation\TranslatorInterface;

 class ActivityDateFilter implements FilterInterface
 {
-    public function __construct(protected TranslatorInterface $translator, private readonly RollingDateConverterInterface $rollingDateConverter) {}
+    public function __construct(protected TranslatorInterface $translator, private readonly RollingDateConverterInterface $rollingDateConverter)
+    {
+    }

    public function addRole(): ?string
    {
@@ -74,46 +72,6 @@ class ActivityDateFilter implements FilterInterface
            ->add('date_to', PickRollingDateType::class, [
                'label' => 'Activities before this date',
            ]);
-
-        $builder->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) {
-            /** @var \Symfony\Component\Form\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
--- a/src/Bundle/ChillActivityBundle/Export/Filter/ActivityPresenceFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/ActivityPresenceFilter.php
@@ -0,0 +1,83 @@
+<?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\Entity\ActivityPresence;
+use Chill\ActivityBundle\Export\Declarations;
+use Chill\MainBundle\Export\FilterInterface;
+use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
+use Doctrine\Common\Collections\Collection;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
+
+final readonly class ActivityPresenceFilter implements FilterInterface
+{
+    public function __construct(
+        private TranslatableStringHelperInterface $translatableStringHelper,
+        private TranslatorInterface $translator
+    ) {
+    }
+
+    public function getTitle()
+    {
+        return 'export.filter.activity.by_presence.Filter activity by activity presence';
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        $builder->add('presences', EntityType::class, [
+            'class' => ActivityPresence::class,
+            'choice_label' => fn (ActivityPresence $presence) => $this->translatableStringHelper->localize($presence->getName())
+                .($presence->isActive() ? '' : ' ('.$this->translator->trans('inactive').')'),
+            'multiple' => true,
+            'expanded' => true,
+            'label' => 'export.filter.activity.by_presence.presences',
+        ]);
+    }
+
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
+
+    public function describeAction($data, $format = 'string')
+    {
+        $presences = array_map(
+            fn (ActivityPresence $presence) => $this->translatableStringHelper->localize($presence->getName()),
+            $data['presences'] instanceof Collection ? $data['presences']->toArray() : $data['presences']
+        );
+
+        return [
+            'export.filter.activity.by_presence.Filtered by activity presence: only %presences%',
+            ['%presences%' => implode(', ', $presences)],
+        ];
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        $qb
+            ->andWhere('activity.attendee IN (:activity_presence_filter_presences)')
+            ->setParameter('activity_presence_filter_presences', $data['presences']);
+    }
+
+    public function applyOn()
+    {
+        return Declarations::ACTIVITY;
+    }
+}
--- a/src/Bundle/ChillActivityBundle/Export/Filter/ActivityTypeFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/ActivityTypeFilter.php
@@ -27,7 +27,8 @@ class ActivityTypeFilter implements ExportElementValidatedInterface, FilterInter
    public function __construct(
        protected TranslatableStringHelperInterface $translatableStringHelper,
        protected ActivityTypeRepositoryInterface $activityTypeRepository
-    ) {}
+    ) {
+    }

    public function addRole(): ?string
    {
@@ -80,7 +81,7 @@ class ActivityTypeFilter implements ExportElementValidatedInterface, FilterInter
        // collect all the reasons'name used in this filter in one array
        $reasonsNames = array_map(
            fn (ActivityType $t): string => $this->translatableStringHelper->localize($t->getName()),
-            $this->activityTypeRepository->findBy(['id' => $data['types']->toArray()])
+            $this->activityTypeRepository->findBy(['id' => $data['types'] instanceof \Doctrine\Common\Collections\Collection ? $data['types']->toArray() : $data['types']])
        );

        return ['Filtered by activity type: only %list%', [
--- a/src/Bundle/ChillActivityBundle/Export/Filter/ActivityUsersFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/ActivityUsersFilter.php
@@ -20,7 +20,9 @@ use Symfony\Component\Form\FormBuilderInterface;

 class ActivityUsersFilter implements FilterInterface
 {
-    public function __construct(private readonly UserRender $userRender) {}
+    public function __construct(private readonly UserRender $userRender)
+    {
+    }

    public function addRole(): ?string
    {
--- a/src/Bundle/ChillActivityBundle/Export/Filter/ByCreatorFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/ByCreatorFilter.php
@@ -20,7 +20,9 @@ use Symfony\Component\Form\FormBuilderInterface;

 class ByCreatorFilter implements FilterInterface
 {
-    public function __construct(private readonly UserRender $userRender) {}
+    public function __construct(private readonly UserRender $userRender)
+    {
+    }

    public function addRole(): ?string
    {
--- a/src/Bundle/ChillActivityBundle/Export/Filter/CreatorJobFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/CreatorJobFilter.php
@@ -0,0 +1,117 @@
+<?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\User\UserJobHistory;
+use Chill\MainBundle\Entity\UserJob;
+use Chill\MainBundle\Export\FilterInterface;
+use Chill\MainBundle\Repository\UserJobRepositoryInterface;
+use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Doctrine\Common\Collections\Collection;
+use Doctrine\ORM\Query\Expr\Join;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
+
+final readonly class CreatorJobFilter implements FilterInterface
+{
+    private const PREFIX = 'acp_act_filter_creator_job';
+
+    public function __construct(
+        private TranslatableStringHelper $translatableStringHelper,
+        private TranslatorInterface $translator,
+        private UserJobRepositoryInterface $userJobRepository,
+    ) {
+    }
+
+    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')
+                    )
+                )
+            )
+            ->andWhere(
+                $qb->expr()->in("{$p}_history.job", ":{$p}_jobs")
+            )
+            ->setParameter(
+                "{$p}_jobs",
+                $data['jobs'],
+            );
+    }
+
+    public function applyOn(): string
+    {
+        return Declarations::ACTIVITY;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        $builder
+            ->add('jobs', EntityType::class, [
+                'choices' => $this->userJobRepository->findAllOrderedByName(),
+                'class' => UserJob::class,
+                'choice_label' => fn (UserJob $s) => $this->translatableStringHelper->localize(
+                    $s->getLabel()
+                ).($s->isActive() ? '' : '('.$this->translator->trans('inactive').')'),
+                'label' => 'export.filter.activity.by_creator_job.job_form_label',
+                'multiple' => true,
+                'expanded' => true,
+            ]);
+    }
+
+    public function describeAction($data, $format = 'string'): array
+    {
+        $jobs = array_map(
+            fn (UserJob $job) => $this->translatableStringHelper->localize($job->getLabel()),
+            $data['jobs'] instanceof Collection ? $data['jobs']->toArray() : $data['jobs']
+        );
+
+        return ['export.filter.activity.by_creator_job.Filtered activity by user job: only %jobs%', [
+            '%jobs%' => implode(', ', $jobs),
+        ]];
+    }
+
+    public function getFormDefaultData(): array
+    {
+        return [
+            'jobs' => [],
+        ];
+    }
+
+    public function getTitle(): string
+    {
+        return 'export.filter.activity.by_creator_job.Filter activity by user job';
+    }
+}
--- a/src/Bundle/ChillActivityBundle/Export/Filter/CreatorScopeFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/CreatorScopeFilter.php
@@ -21,13 +21,14 @@ use Doctrine\ORM\QueryBuilder;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\FormBuilderInterface;

-class UserScopeFilter implements FilterInterface
+class CreatorScopeFilter implements FilterInterface
 {
-    private const PREFIX = 'acp_act_filter_user_scope';  // creator ? cfr translation
+    private const PREFIX = 'acp_act_filter_creator_scope';

    public function __construct(
        private readonly TranslatableStringHelper $translatableStringHelper
-    ) {}
+    ) {
+    }

    public function addRole(): ?string
    {
@@ -39,7 +40,7 @@ class UserScopeFilter implements FilterInterface
        $p = self::PREFIX;

        $qb
-            ->leftJoin('activity.user', "{$p}_user")  // createdBy ? cfr translation
+            ->leftJoin('activity.createdBy', "{$p}_user")
            ->leftJoin(
                UserScopeHistory::class,
                "{$p}_history",
--- a/src/Bundle/ChillActivityBundle/Export/Filter/EmergencyFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/EmergencyFilter.php
@@ -28,7 +28,9 @@ class EmergencyFilter implements FilterInterface

    private const DEFAULT_CHOICE = 'false';

-    public function __construct(private readonly TranslatorInterface $translator) {}
+    public function __construct(private readonly TranslatorInterface $translator)
+    {
+    }

    public function addRole(): ?string
    {
--- a/src/Bundle/ChillActivityBundle/Export/Filter/LocationTypeFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/LocationTypeFilter.php
@@ -21,7 +21,9 @@ use Symfony\Component\Form\FormBuilderInterface;

 class LocationTypeFilter implements FilterInterface
 {
-    public function __construct(private readonly TranslatableStringHelper $translatableStringHelper) {}
+    public function __construct(private readonly TranslatableStringHelper $translatableStringHelper)
+    {
+    }

    public function addRole(): ?string
    {
--- a/src/Bundle/ChillActivityBundle/Export/Filter/PersonFilters/ActivityReasonFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/PersonFilters/ActivityReasonFilter.php
@@ -17,6 +17,7 @@ use Chill\ActivityBundle\Repository\ActivityReasonRepository;
 use Chill\MainBundle\Export\ExportElementValidatedInterface;
 use Chill\MainBundle\Export\FilterInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Query\Expr;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
@@ -25,7 +26,9 @@ use Symfony\Component\Validator\Context\ExecutionContextInterface;

 class ActivityReasonFilter implements ExportElementValidatedInterface, FilterInterface
 {
-    public function __construct(protected TranslatableStringHelper $translatableStringHelper, protected ActivityReasonRepository $activityReasonRepository) {}
+    public function __construct(protected TranslatableStringHelper $translatableStringHelper, protected ActivityReasonRepository $activityReasonRepository)
+    {
+    }

    public function addRole(): ?string
    {
@@ -79,7 +82,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()).'"',
-            $this->activityReasonRepository->findBy(['id' => $data['reasons']->toArray()])
+            $this->activityReasonRepository->findBy(['id' => $data['reasons'] instanceof Collection ? $data['reasons']->toArray() : $data['reasons']])
        );

        return [
--- a/src/Bundle/ChillActivityBundle/Export/Filter/PersonFilters/PersonHavingActivityBetweenDateFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/PersonFilters/PersonHavingActivityBetweenDateFilter.php
@@ -32,7 +32,8 @@ final readonly class PersonHavingActivityBetweenDateFilter implements ExportElem
        private TranslatableStringHelper $translatableStringHelper,
        private ActivityReasonRepository $activityReasonRepository,
        private RollingDateConverterInterface $rollingDateConverter,
-    ) {}
+    ) {
+    }

    public function addRole(): ?string
    {
--- a/src/Bundle/ChillActivityBundle/Export/Filter/PersonsFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/PersonsFilter.php
@@ -0,0 +1,89 @@
+<?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\ActivityBundle\Tests\Export\Filter\PersonsFilterTest;
+use Chill\MainBundle\Export\FilterInterface;
+use Chill\PersonBundle\Form\Type\PickPersonDynamicType;
+use Chill\PersonBundle\Templating\Entity\PersonRenderInterface;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\FormBuilderInterface;
+
+/**
+ * @see PersonsFilterTest
+ */
+final readonly class PersonsFilter implements FilterInterface
+{
+    private const PREFIX = 'act_persons_filter';
+
+    public function __construct(private PersonRenderInterface $personRender)
+    {
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        $p = self::PREFIX;
+
+        $orX = $qb->expr()->orX();
+
+        foreach (array_values($data['accepted_persons']) as $key => $person) {
+            $orX->add($qb->expr()->isMemberOf(":{$p}_p_{$key}", 'activity.persons'));
+            $qb->setParameter(":{$p}_p_{$key}", $person);
+        }
+
+        $qb->andWhere($orX);
+    }
+
+    public function applyOn()
+    {
+        return Declarations::ACTIVITY;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        $builder->add('accepted_persons', PickPersonDynamicType::class, [
+            'multiple' => true,
+            'label' => 'export.filter.activity.by_persons.persons taking part on the activity',
+        ]);
+    }
+
+    public function getFormDefaultData(): array
+    {
+        return [
+            'accepted_persons' => [],
+        ];
+    }
+
+    public function describeAction($data, $format = 'string')
+    {
+        $users = [];
+
+        foreach ($data['accepted_persons'] as $u) {
+            $users[] = $this->personRender->renderString($u, []);
+        }
+
+        return ['export.filter.activity.by_persons.Filtered activity by persons: only %persons%', [
+            '%persons%' => implode(', ', $users),
+        ]];
+    }
+
+    public function getTitle(): string
+    {
+        return 'export.filter.activity.by_persons.Filter activity by persons';
+    }
+}
--- a/src/Bundle/ChillActivityBundle/Export/Filter/SentReceivedFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/SentReceivedFilter.php
@@ -23,13 +23,15 @@ use Symfony\Contracts\Translation\TranslatorInterface;
 class SentReceivedFilter implements FilterInterface
 {
    private const CHOICES = [
-        'is sent' => Activity::SENTRECEIVED_SENT,
-        'is received' => Activity::SENTRECEIVED_RECEIVED,
+        'export.filter.activity.by_sent_received.is sent' => Activity::SENTRECEIVED_SENT,
+        'export.filter.activity.by_sent_received.is received' => Activity::SENTRECEIVED_RECEIVED,
    ];

    private const DEFAULT_CHOICE = Activity::SENTRECEIVED_SENT;

-    public function __construct(private readonly TranslatorInterface $translator) {}
+    public function __construct(private readonly TranslatorInterface $translator)
+    {
+    }

    public function addRole(): ?string
    {
@@ -64,6 +66,7 @@ class SentReceivedFilter implements FilterInterface
            'multiple' => false,
            'expanded' => true,
            'empty_data' => self::DEFAULT_CHOICE,
+            'label' => 'export.filter.activity.by_sent_received.Sent or received',
        ]);
    }

--- a/src/Bundle/ChillActivityBundle/Export/Filter/UserFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/UserFilter.php
@@ -21,7 +21,9 @@ use Symfony\Component\Form\FormBuilderInterface;

 class UserFilter implements FilterInterface
 {
-    public function __construct(private readonly UserRender $userRender) {}
+    public function __construct(private readonly UserRender $userRender)
+    {
+    }

    public function addRole(): ?string
    {
--- a/src/Bundle/ChillActivityBundle/Export/Filter/UsersJobFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/UsersJobFilter.php
@@ -17,6 +17,7 @@ use Chill\MainBundle\Entity\User\UserJobHistory;
 use Chill\MainBundle\Entity\UserJob;
 use Chill\MainBundle\Export\FilterInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
+use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\FormBuilderInterface;
@@ -27,7 +28,8 @@ class UsersJobFilter implements FilterInterface

    public function __construct(
        private readonly TranslatableStringHelperInterface $translatableStringHelper
-    ) {}
+    ) {
+    }

    public function addRole(): ?string
    {
@@ -80,7 +82,7 @@ class UsersJobFilter implements FilterInterface
                ', ',
                array_map(
                    fn (UserJob $job) => $this->translatableStringHelper->localize($job->getLabel()),
-                    $data['jobs']->toArray()
+                    $data['jobs'] instanceof Collection ? $data['jobs']->toArray() : $data['jobs']
                )
            ),
        ]];
--- a/src/Bundle/ChillActivityBundle/Export/Filter/UsersScopeFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/UsersScopeFilter.php
@@ -18,6 +18,7 @@ use Chill\MainBundle\Entity\User\UserScopeHistory;
 use Chill\MainBundle\Export\FilterInterface;
 use Chill\MainBundle\Repository\ScopeRepositoryInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
+use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\FormBuilderInterface;
@@ -29,7 +30,8 @@ class UsersScopeFilter implements FilterInterface
    public function __construct(
        private readonly ScopeRepositoryInterface $scopeRepository,
        private readonly TranslatableStringHelperInterface $translatableStringHelper
-    ) {}
+    ) {
+    }

    public function addRole(): ?string
    {
@@ -83,7 +85,7 @@ class UsersScopeFilter implements FilterInterface
                ', ',
                array_map(
                    fn (Scope $s) => $this->translatableStringHelper->localize($s->getName()),
-                    $data['scopes']->toArray()
+                    $data['scopes'] instanceof Collection ? $data['scopes']->toArray() : $data['scopes']
                )
            ),
        ]];
--- a/src/Bundle/ChillActivityBundle/Form/ActivityType.php
+++ b/src/Bundle/ChillActivityBundle/Form/ActivityType.php
@@ -183,6 +183,7 @@ class ActivityType extends AbstractType
            $builder->add('attendee', EntityType::class, [
                'label' => $activityType->getLabel('attendee'),
                'required' => $activityType->isRequired('attendee'),
+                'placeholder' => false,
                'expanded' => true,
                'class' => ActivityPresence::class,
                'choice_label' => fn (ActivityPresence $activityPresence) => $this->translatableStringHelper->localize($activityPresence->getName()),
@@ -404,7 +405,7 @@ class ActivityType extends AbstractType
            ->setAllowedTypes('center', ['null', Center::class, 'array'])
            ->setAllowedTypes('role', ['string'])
            ->setAllowedTypes('activityType', \Chill\ActivityBundle\Entity\ActivityType::class)
-            ->setAllowedTypes('accompanyingPeriod', [\Chill\PersonBundle\Entity\AccompanyingPeriod::class, 'null']);
+            ->setAllowedTypes('accompanyingPeriod', [AccompanyingPeriod::class, 'null']);
    }

    public function getBlockPrefix(): string
--- a/src/Bundle/ChillActivityBundle/Form/ActivityTypeType.php
+++ b/src/Bundle/ChillActivityBundle/Form/ActivityTypeType.php
@@ -25,7 +25,9 @@ use Symfony\Component\OptionsResolver\OptionsResolver;

 class ActivityTypeType extends AbstractType
 {
-    public function __construct(private readonly TranslatableStringHelper $translatableStringHelper) {}
+    public function __construct(private readonly TranslatableStringHelper $translatableStringHelper)
+    {
+    }

    public function buildForm(FormBuilderInterface $builder, array $options)
    {
--- a/src/Bundle/ChillActivityBundle/Form/Type/PickActivityReasonType.php
+++ b/src/Bundle/ChillActivityBundle/Form/Type/PickActivityReasonType.php
@@ -28,7 +28,8 @@ class PickActivityReasonType extends AbstractType
        private readonly ActivityReasonRepository $activityReasonRepository,
        private readonly ActivityReasonRender $reasonRender,
        private readonly TranslatableStringHelperInterface $translatableStringHelper
-    ) {}
+    ) {
+    }

    public function configureOptions(OptionsResolver $resolver)
    {
--- a/src/Bundle/ChillActivityBundle/Form/Type/TranslatableActivityReasonCategoryType.php
+++ b/src/Bundle/ChillActivityBundle/Form/Type/TranslatableActivityReasonCategoryType.php
@@ -23,7 +23,9 @@ use Symfony\Contracts\Translation\TranslatorInterface;
 */
 class TranslatableActivityReasonCategoryType extends AbstractType
 {
-    public function __construct(private readonly TranslatableStringHelperInterface $translatableStringHelper, private readonly TranslatorInterface $translator) {}
+    public function __construct(private readonly TranslatableStringHelperInterface $translatableStringHelper, private readonly TranslatorInterface $translator)
+    {
+    }

    public function configureOptions(OptionsResolver $resolver)
    {
--- a/src/Bundle/ChillActivityBundle/Form/Type/TranslatableActivityType.php
+++ b/src/Bundle/ChillActivityBundle/Form/Type/TranslatableActivityType.php
@@ -20,7 +20,9 @@ use Symfony\Component\OptionsResolver\OptionsResolver;

 class TranslatableActivityType extends AbstractType
 {
-    public function __construct(protected TranslatableStringHelperInterface $translatableStringHelper, protected ActivityTypeRepositoryInterface $activityTypeRepository) {}
+    public function __construct(protected TranslatableStringHelperInterface $translatableStringHelper, protected ActivityTypeRepositoryInterface $activityTypeRepository)
+    {
+    }

    public function configureOptions(OptionsResolver $resolver)
    {
--- a/src/Bundle/ChillActivityBundle/Menu/AccompanyingCourseMenuBuilder.php
+++ b/src/Bundle/ChillActivityBundle/Menu/AccompanyingCourseMenuBuilder.php
@@ -23,7 +23,9 @@ use Symfony\Contracts\Translation\TranslatorInterface;
 */
 class AccompanyingCourseMenuBuilder implements LocalMenuBuilderInterface
 {
-    public function __construct(protected Security $security, protected TranslatorInterface $translator) {}
+    public function __construct(protected Security $security, protected TranslatorInterface $translator)
+    {
+    }

    public function buildMenu($menuId, MenuItem $menu, array $parameters)
    {
--- a/src/Bundle/ChillActivityBundle/Menu/AdminMenuBuilder.php
+++ b/src/Bundle/ChillActivityBundle/Menu/AdminMenuBuilder.php
@@ -20,7 +20,9 @@ use Symfony\Component\Security\Core\Security;
 */
 final readonly class AdminMenuBuilder implements LocalMenuBuilderInterface
 {
-    public function __construct(private Security $security) {}
+    public function __construct(private Security $security)
+    {
+    }

    public function buildMenu($menuId, MenuItem $menu, array $parameters)
    {
--- a/src/Bundle/ChillActivityBundle/Menu/PersonMenuBuilder.php
+++ b/src/Bundle/ChillActivityBundle/Menu/PersonMenuBuilder.php
@@ -23,11 +23,13 @@ use Symfony\Contracts\Translation\TranslatorInterface;
 */
 final readonly class PersonMenuBuilder implements LocalMenuBuilderInterface
 {
-    public function __construct(private AuthorizationCheckerInterface $authorizationChecker, private TranslatorInterface $translator) {}
+    public function __construct(private AuthorizationCheckerInterface $authorizationChecker, private TranslatorInterface $translator)
+    {
+    }

    public function buildMenu($menuId, MenuItem $menu, array $parameters)
    {
-        /** @var \Chill\PersonBundle\Entity\Person $person */
+        /** @var Person $person */
        $person = $parameters['person'];

        if ($this->authorizationChecker->isGranted(ActivityVoter::SEE, $person)) {
--- a/src/Bundle/ChillActivityBundle/Notification/ActivityNotificationHandler.php
+++ b/src/Bundle/ChillActivityBundle/Notification/ActivityNotificationHandler.php
@@ -18,7 +18,9 @@ use Chill\MainBundle\Notification\NotificationHandlerInterface;

 final readonly class ActivityNotificationHandler implements NotificationHandlerInterface
 {
-    public function __construct(private ActivityRepository $activityRepository) {}
+    public function __construct(private ActivityRepository $activityRepository)
+    {
+    }

    public function getTemplate(Notification $notification, array $options = []): string
    {
--- a/src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepository.php
+++ b/src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepository.php
@@ -44,7 +44,8 @@ final readonly class ActivityACLAwareRepository implements ActivityACLAwareRepos
        private EntityManagerInterface $em,
        private Security $security,
        private RequestStack $requestStack,
-    ) {}
+    ) {
+    }

    /**
     * @throws NonUniqueResultException
--- a/src/Bundle/ChillActivityBundle/Repository/ActivityDocumentACLAwareRepository.php
+++ b/src/Bundle/ChillActivityBundle/Repository/ActivityDocumentACLAwareRepository.php
@@ -33,16 +33,17 @@ final readonly class ActivityDocumentACLAwareRepository implements ActivityDocum
        private CenterResolverManagerInterface $centerResolverManager,
        private AuthorizationHelperForCurrentUserInterface $authorizationHelperForCurrentUser,
        private Security $security
-    ) {}
+    ) {
+    }

-    public function buildFetchQueryActivityDocumentLinkedToPersonFromPersonContext(Person $person, \DateTimeImmutable $startDate = null, \DateTimeImmutable $endDate = null, string $content = null): FetchQueryInterface
+    public function buildFetchQueryActivityDocumentLinkedToPersonFromPersonContext(Person $person, ?\DateTimeImmutable $startDate = null, ?\DateTimeImmutable $endDate = null, ?string $content = null): FetchQueryInterface
    {
        $query = $this->buildBaseFetchQueryActivityDocumentLinkedToPersonFromPersonContext($person, $startDate, $endDate, $content);

        return $this->addFetchQueryByPersonACL($query, $person);
    }

-    public function buildBaseFetchQueryActivityDocumentLinkedToPersonFromPersonContext(Person $person, \DateTimeImmutable $startDate = null, \DateTimeImmutable $endDate = null, string $content = null): FetchQuery
+    public function buildBaseFetchQueryActivityDocumentLinkedToPersonFromPersonContext(Person $person, ?\DateTimeImmutable $startDate = null, ?\DateTimeImmutable $endDate = null, ?string $content = null): FetchQuery
    {
        $storedObjectMetadata = $this->em->getClassMetadata(StoredObject::class);
        $activityMetadata = $this->em->getClassMetadata(Activity::class);
@@ -71,7 +72,7 @@ final readonly class ActivityDocumentACLAwareRepository implements ActivityDocum
        return $this->addWhereClauses($query, $startDate, $endDate, $content);
    }

-    public function buildFetchQueryActivityDocumentLinkedToAccompanyingPeriodFromPersonContext(Person $person, \DateTimeImmutable $startDate = null, \DateTimeImmutable $endDate = null, string $content = null): FetchQuery
+    public function buildFetchQueryActivityDocumentLinkedToAccompanyingPeriodFromPersonContext(Person $person, ?\DateTimeImmutable $startDate = null, ?\DateTimeImmutable $endDate = null, ?string $content = null): FetchQuery
    {
        $storedObjectMetadata = $this->em->getClassMetadata(StoredObject::class);
        $activityMetadata = $this->em->getClassMetadata(Activity::class);
@@ -122,7 +123,7 @@ final readonly class ActivityDocumentACLAwareRepository implements ActivityDocum
        return $this->addWhereClauses($query, $startDate, $endDate, $content);
    }

-    private function addWhereClauses(FetchQuery $query, \DateTimeImmutable $startDate = null, \DateTimeImmutable $endDate = null, string $content = null): FetchQuery
+    private function addWhereClauses(FetchQuery $query, ?\DateTimeImmutable $startDate = null, ?\DateTimeImmutable $endDate = null, ?string $content = null): FetchQuery
    {
        $storedObjectMetadata = $this->em->getClassMetadata(StoredObject::class);

--- a/src/Bundle/ChillActivityBundle/Repository/ActivityDocumentACLAwareRepositoryInterface.php
+++ b/src/Bundle/ChillActivityBundle/Repository/ActivityDocumentACLAwareRepositoryInterface.php
@@ -25,12 +25,12 @@ interface ActivityDocumentACLAwareRepositoryInterface
     *
     * This method must check the rights to see a document: the user must be allowed to see the given activities
     */
-    public function buildFetchQueryActivityDocumentLinkedToPersonFromPersonContext(Person $person, \DateTimeImmutable $startDate = null, \DateTimeImmutable $endDate = null, string $content = null): FetchQueryInterface;
+    public function buildFetchQueryActivityDocumentLinkedToPersonFromPersonContext(Person $person, ?\DateTimeImmutable $startDate = null, ?\DateTimeImmutable $endDate = null, ?string $content = null): FetchQueryInterface;

    /**
     * Return a fetch query for querying document's activities for an activity in accompanying periods, but for a given person.
     *
     * This method must check the rights to see a document: the user must be allowed to see the given accompanying periods
     */
-    public function buildFetchQueryActivityDocumentLinkedToAccompanyingPeriodFromPersonContext(Person $person, \DateTimeImmutable $startDate = null, \DateTimeImmutable $endDate = null, string $content = null): FetchQuery;
+    public function buildFetchQueryActivityDocumentLinkedToAccompanyingPeriodFromPersonContext(Person $person, ?\DateTimeImmutable $startDate = null, ?\DateTimeImmutable $endDate = null, ?string $content = null): FetchQuery;
 }
--- a/Show More
+++ b/Show More