add changie [ci-skip]

Re-configure test app
Remove references to old async upload bundle
2025-09-10 16:55:00 +00:00 · 2023-12-12 15:55:14 +01:00 · 2023-12-12 15:55:14 +01:00 · 2023-12-12 15:55:14 +01:00 · 2023-12-12 15:55:14 +01:00 · 2023-12-12 15:55:13 +01:00
1110 changed files with 4618 additions and 10985 deletions
--- a/.changes/unreleased/Feature-20231212-154841.yaml
+++ b/.changes/unreleased/Feature-20231212-154841.yaml
@@ -0,0 +1,5 @@
+kind: Feature
+body: '[DX] move async-upload-bundle features into chill-bundles'
+time: 2023-12-12T15:48:41.954970271+01:00
+custom:
+  Issue: "221"
--- a/.changes/v2.15.1.md
+++ b/.changes/v2.15.1.md
@@ -1,5 +0,0 @@
-## 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
@@ -1,5 +0,0 @@
-## 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
@@ -1,15 +0,0 @@
-## 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
@@ -1,3 +0,0 @@
-## 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
@@ -1,3 +0,0 @@
-## v2.16.2 - 2024-02-21
-### Fixed
-* Check for null values in closing motive of parcours d'accompagnement for correct rendering of template 
--- a/.changes/v2.16.3.md
+++ b/.changes/v2.16.3.md
@@ -1,5 +0,0 @@
-## v2.16.3 - 2024-02-26
-### Fixed
-* ([#236](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/236)) Fix translation of user job -> 'service' must be 'métier' 
-### UX
-* ([#232](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/232)) Order user jobs and services alphabetically in export filters 
--- a/.changes/v2.17.0.md
+++ b/.changes/v2.17.0.md
@@ -1,9 +0,0 @@
-## v2.17.0 - 2024-03-19
-### Feature
-* ([#237](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/237)) New export filter for social actions with an evaluation created between two dates 
-* ([#258](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/258)) In the list of accompangying period, add the list of person's centers and the duration of the course 
-* ([#238](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/238)) Allow to customize list person with new fields 
-* ([#159](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/159)) Admin can publish news on the homepage
-### Fixed
-* ([#264](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/264)) Fix languages: load the languages in all availables languages configured for Chill 
-* ([#259](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/259)) Keep a consistent behaviour between the filtering of activities within the document generation (model "accompanying period with activities"), and the same filter in the list of activities for an accompanying period 
--- a/.changes/v2.18.0.md
+++ b/.changes/v2.18.0.md
@@ -1,5 +0,0 @@
-## v2.18.0 - 2024-03-26
-### Feature
-* ([#268](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/268)) Improve admin UX to configure document templates for document generation 
-### Fixed
-* ([#267](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/267)) Fix the join between job and user in the user list (admin): show only the current user job 
--- a/.changes/v2.18.1.md
+++ b/.changes/v2.18.1.md
@@ -1,3 +0,0 @@
-## v2.18.1 - 2024-03-26
-### Fixed
-* Fix layout issue in document generation for admin (minor) 
--- a/.changes/v2.18.2.md
+++ b/.changes/v2.18.2.md
@@ -1,3 +0,0 @@
-## v2.18.2 - 2024-04-12
-### Fixed
-* ([#250](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/250)) Postal codes import : fix the source URL and the keys to handle each record 
--- a/.changes/v2.19.0.md
+++ b/.changes/v2.19.0.md
@@ -1,20 +0,0 @@
-## v2.19.0 - 2024-05-14
-### Feature
-* ([#197](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/197)) Make the script which subscribe to microsoft calendars changes more tolerant to errors or missing configuration on the microsoft side
-* ([#276](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/276)) Take closing date into account when computing the geographical unit on accompanying period. When a person moved after an accompanying period is closed, the date of closing accompanying period is took into account if it is earlier than the date given by the user.
-### Fixed
-* ([#270](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/270)) Fix broken link in homepage when a evaluation from a closed acc period was present in the homepage widget
-* ([#275](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/275)) Allow the filter "filter accompanying period by geographical unit" to take period's location on address into account
-### UX
-* Form for document generation moved to the top of document list page
-* ([#266](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/266)) Event bundle: adjust certain graphical issues for better user experience
-
-
-### Traduction francophone des principaux changements
-
- script de synchronisation des agendas de microsoft Outlook: le script est plus tolérant aux erreurs de configuration côté serveur (manque de droit d'accès);
- dans les statistiques sur les parcours d'accompagnements, regroupement et filtre par unité géographique: lorsque la date de prise en compte de l'adresse est postérieure à la fermeture du parcours, c'est la date de fermeture du parcours qui est prise en compte (cela permet de tenir compte de la localisation de l'usager au moment de la fermeture dans le cas où celui-ci aurait déménagé par la suite);
- sur la page d'accueil, il n'y a plus de rappel pour les évaluations pour les parcours cloturés;
- correction du filtre "filtrer par zone géographique"
- répétition du bouton pour générer un document en haut de la page "liste des documents", quand il y a plus de cinq documents;
- module événement: améliorerations graphiques
--- a/.editorconfig
+++ b/.editorconfig
@@ -23,7 +23,3 @@ max_line_length = 0
 indent_size = 2
 indent_style = space

-[.rst]
-ident_size = 3
-ident_style = space
-
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -34,8 +34,6 @@ variables:
    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=1

 stages:
    - Composer install
@@ -53,7 +51,7 @@ build:
        paths:
            - .cache/
    artifacts:
-        expire_in: 1 day
+        expire_in: 30 min
        paths:
            - bin
            - vendor/
@@ -67,7 +65,7 @@ code_style:
        paths:
            - .cache/
    artifacts:
-        expire_in: 1 day
+        expire_in: 30 min
        paths:
            - bin
            - vendor/
@@ -81,7 +79,7 @@ phpstan_tests:
        paths:
            - .cache/
    artifacts:
-        expire_in: 1 day
+        expire_in: 30 min
        paths:
            - bin
            - vendor/
@@ -96,7 +94,7 @@ rector_tests:
        paths:
            - .cache/
    artifacts:
-        expire_in: 1 day
+        expire_in: 30 min
        paths:
            - bin
            - vendor/
@@ -123,7 +121,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: 1 day
+        expire_in: 30 min
        paths:
            - bin
            - vendor/
--- a/.readthedocs.yml
+++ b/.readthedocs.yml
@@ -1,14 +1,10 @@
 ---
 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
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,93 +6,6 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html),
 and is generated by [Changie](https://github.com/miniscruff/changie).


-## v2.19.0 - 2024-05-14
-### Feature
-* ([#197](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/197)) Make the script which subscribe to microsoft calendars changes more tolerant to errors or missing configuration on the microsoft side
-* ([#276](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/276)) Take closing date into account when computing the geographical unit on accompanying period. When a person moved after an accompanying period is closed, the date of closing accompanying period is took into account if it is earlier than the date given by the user.
-### Fixed
-* ([#270](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/270)) Fix broken link in homepage when a evaluation from a closed acc period was present in the homepage widget
-* ([#275](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/275)) Allow the filter "filter accompanying period by geographical unit" to take period's location on address into account
-### UX
-* Form for document generation moved to the top of document list page
-* ([#266](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/266)) Event bundle: adjust certain graphical issues for better user experience
-
-
-### Traduction francophone des principaux changements
-
- script de synchronisation des agendas de microsoft Outlook: le script est plus tolérant aux erreurs de configuration côté serveur (manque de droit d'accès);
- dans les statistiques sur les parcours d'accompagnements, regroupement et filtre par unité géographique: lorsque la date de prise en compte de l'adresse est postérieure à la fermeture du parcours, c'est la date de fermeture du parcours qui est prise en compte (cela permet de tenir compte de la localisation de l'usager au moment de la fermeture dans le cas où celui-ci aurait déménagé par la suite);
- sur la page d'accueil, il n'y a plus de rappel pour les évaluations pour les parcours cloturés;
- correction du filtre "filtrer par zone géographique"
- répétition du bouton pour générer un document en haut de la page "liste des documents", quand il y a plus de cinq documents;
- module événement: améliorerations graphiques
-
-## v2.18.2 - 2024-04-12
-### Fixed
-* ([#250](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/250)) Postal codes import : fix the source URL and the keys to handle each record 
-
-## v2.18.1 - 2024-03-26
-### Fixed
-* Fix layout issue in document generation for admin (minor) 
-
-## v2.18.0 - 2024-03-26
-### Feature
-* ([#268](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/268)) Improve admin UX to configure document templates for document generation 
-### Fixed
-* ([#267](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/267)) Fix the join between job and user in the user list (admin): show only the current user job 
-
-## v2.17.0 - 2024-03-19
-### Feature
-* ([#237](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/237)) New export filter for social actions with an evaluation created between two dates 
-* ([#258](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/258)) In the list of accompangying period, add the list of person's centers and the duration of the course 
-* ([#238](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/238)) Allow to customize list person with new fields 
-* ([#159](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/159)) Admin can publish news on the homepage
-### Fixed
-* ([#264](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/264)) Fix languages: load the languages in all availables languages configured for Chill 
-* ([#259](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/259)) Keep a consistent behaviour between the filtering of activities within the document generation (model "accompanying period with activities"), and the same filter in the list of activities for an accompanying period 
-
-## v2.16.3 - 2024-02-26
-### Fixed
-* ([#236](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/236)) Fix translation of user job -> 'service' must be 'métier' 
-### UX
-* ([#232](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/232)) Order user jobs and services alphabetically in export filters 
-
-## 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" 
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,6 @@
        "ext-json": "*",
        "ext-openssl": "*",
        "ext-redis": "*",
-        "champs-libres/async-uploader-bundle": "dev-sf4#d57134aee8e504a83c902ff0cf9f8d36ac418290",
        "champs-libres/wopi-bundle": "dev-master@dev",
        "champs-libres/wopi-lib": "dev-master@dev",
        "doctrine/doctrine-bundle": "^2.1",
--- a/docs/README.md
+++ b/docs/README.md
@@ -27,7 +27,7 @@ To compile this documentation :
 Contribute
 ===========

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

 Licence
 =======
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -1,7 +1,6 @@
 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/development/exports.rst
+++ b/docs/source/development/exports.rst
@@ -242,129 +242,3 @@ This is an example of the *filter by birthdate*. This filter asks some informati
   Continue to explain the export framework

 .. _main bundle: https://git.framasoft.org/Chill-project/Chill-Main
-
-
-With many-to-* relationship, why should we set WHERE clauses in an EXISTS subquery instead of a JOIN ?
-``````````````````````````````````````````````````````````````````````````````````````````````````````
-
-As we described above, the doctrine builder is converted into a sql query. Let's see how to compute the "number of course
-which count at least one activity type with the id 7". For the purpose of this demonstration, we will restrict this on
-two accompanying period only: the ones with id 329 and 334.
-
-Let's see the list of activities associated with those accompanying period:
-
-.. code-block:: sql
-
-   SELECT id, accompanyingperiod_id, type_id FROM activity WHERE accompanyingperiod_id IN (329, 334) AND type_id = 7
-       ORDER BY accompanyingperiod_id;
-
-We see that we have 6 activities for the accompanying period with id 329, and only one for the 334's one.
-
-.. csv-table::
-   :header: id, accompanyingperiod_id, type_id
-
-   990,329,7
-   986,329,7
-   987,329,7
-   993,329,7
-   991,329,7
-   992,329,7
-   1000,334,7
-
-Let's calculate the average duration for those accompanying periods, and the number of period:
-
-.. code-block:: sql
-
-   SELECT AVG(age(COALESCE(closingdate, CURRENT_DATE), openingdate)), COUNT(id) from chill_person_accompanying_period WHERE id IN (329, 334);
-
-The result of this query is:
-
-.. csv-table::
-   :header: AVG, COUNT
-
-   2 years 2 mons 21 days 12 hours 0 mins 0.0 secs,2
-
-Now, we count the number of accompanying period, adding a :code:`JOIN` clause which make a link to the :code:`activity` table, and add a :code:`WHERE` clause to keep
-only the accompanying period which contains the given activity type:
-
-.. code-block:: sql
-
-   SELECT COUNT(chill_person_accompanying_period.id) from chill_person_accompanying_period
-                 JOIN activity ON chill_person_accompanying_period.id = activity.accompanyingperiod_id
-                 WHERE chill_person_accompanying_period.id IN (329, 334) AND activity.type_id = 7;
-
-What are the results here ?
-
-.. csv-table::
-   :header: COUNT
-
-   7
-
-:code:`7` ! Why this result ? Because the number of lines is duplicated for each activity. Let's see the list of rows which
-are taken into account for the computation:
-
-.. code-block:: sql
-
-   SELECT chill_person_accompanying_period.id, activity.id from chill_person_accompanying_period
-   JOIN activity ON chill_person_accompanying_period.id = activity.accompanyingperiod_id
-   WHERE chill_person_accompanying_period.id IN (329, 334) AND activity.type_id = 7;
-
-.. csv-table::
-   :header: accompanyingperiod.id, activity.id
-
-   329,993
-   334,1000
-   329,987
-   329,990
-   329,991
-   329,992
-   329,986
-
-For each activity, a row is created and, as we count the number of non-null :code:`accompanyingperiod.id` columns, we
-count one entry for each activity (actually, we count the number of activities).
-
-So, let's use the :code:`DISTINCT` keyword to count only once the equal ids:
-
-.. code-block::
-
-   SELECT COUNT(DISTINCT chill_person_accompanying_period.id) from chill_person_accompanying_period
-   JOIN activity ON chill_person_accompanying_period.id = activity.accompanyingperiod_id
-   WHERE chill_person_accompanying_period.id IN (329, 334) AND activity.type_id = 7;
-
-Now, it works again...
-
-.. csv-table::
-   :header: COUNT
-
-   2
-
-But, for the average duration, this won't work: the duration which are equals (because the :code:`openingdate` is the same and
-:code:`closingdate` is still :code:`NULL`, for instance) will be counted only once, which will give unexpected result.
-
-The solution is to move the condition "having an activity with activity type with id 7" in a :code:`EXISTS` clause:
-
-.. code-block:: sql
-
-   SELECT COUNT(chill_person_accompanying_period.id) from chill_person_accompanying_period
-   WHERE chill_person_accompanying_period.id IN (329, 334) AND EXISTS (SELECT 1 FROM activity WHERE type_id = 7 AND accompanyingperiod_id = chill_person_accompanying_period.id);
-
-The result is correct without :code:`DISTINCT` keyword:
-
-.. csv-table::
-   :header: COUNT
-
-   2
-
-And we can now compute the average duration without fear:
-
-.. code-block:: sql
-
-  SELECT AVG(age(COALESCE(closingdate, CURRENT_DATE), openingdate)) from chill_person_accompanying_period
-  WHERE chill_person_accompanying_period.id IN (329, 334) AND EXISTS (SELECT 1 FROM activity WHERE type_id = 7 AND accompanyingperiod_id = chill_person_accompanying_period.id);
-
-Give the result:
-
-.. csv-table::
-   :header: AVG
-
-   2 years 2 mons 21 days 12 hours 0 mins 0.0 secs
--- 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://gitea.champs-libres.be/Chill-project/chill-skeleton-basic.git
-   cd chill-skeleton-basic
+   git clone https://gitlab.com/Chill-Projet/chill-skeleton-basic.git
+   cd chill-app


 As a developer, the code will stay on your computer and will be executed in docker container. To avoid permission problem, the code should be run with the same uid/gid from your current user. This is why we get your current user id with the command ``id -u`` in each following scripts.
--- a/docs/source/installation/load-addresses.rst
+++ b/docs/source/installation/load-addresses.rst
@@ -8,16 +8,6 @@ Chill can store a list of geolocated address references, which are used to sugge

 Those addresses may be load from a dedicated source.

-Countries
-=========
-
-In order to load addresses into the chill application we first have to make sure that a list of countries is present.
-To import the countries run the following command.
-
-.. code-block:: bash
-
-    bin/console chill:main:countries:populate
-
 In France
 =========

--- a/exports_alias_conventions.md
+++ b/exports_alias_conventions.md
@@ -6,9 +6,7 @@ Add condition with distinct alias on each export join clauses (Indicators + Filt
 These are alias conventions :

 | 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                                |
--- 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.2.3",
+    "bootstrap": "^5.0.1",
    "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,4 +28,3 @@ 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,6 +13,4 @@ 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,8 +67,7 @@ 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(ActivityReasonCategory::class)->find($id);
+        $entity = $em->getRepository(\Chill\ActivityBundle\Entity\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(ActivityReasonCategory::class)->findAll();
+        $entities = $em->getRepository(\Chill\ActivityBundle\Entity\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(ActivityReasonCategory::class)->find($id);
+        $entity = $em->getRepository(\Chill\ActivityBundle\Entity\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(ActivityReasonCategory::class)->find($id);
+        $entity = $em->getRepository(\Chill\ActivityBundle\Entity\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,9 +24,7 @@ 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.
@@ -62,7 +60,7 @@ class ActivityReasonController extends AbstractController
    {
        $em = $this->getDoctrine()->getManager();

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

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

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

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

-        $entity = $em->getRepository(ActivityReason::class)->find($id);
+        $entity = $em->getRepository(\Chill\ActivityBundle\Entity\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,11 +291,7 @@ class ActivityType
    public function checkSocialActionsVisibility(ExecutionContextInterface $context, mixed $payload)
    {
        if ($this->socialIssuesVisible !== $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)
-            ) {
+            if (!(2 === $this->socialIssuesVisible && 1 === $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,9 +19,7 @@ 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
@@ -31,8 +31,7 @@ final readonly class ByActivityTypeAggregator implements AggregatorInterface
        private RollingDateConverterInterface $rollingDateConverter,
        private ActivityTypeRepositoryInterface $activityTypeRepository,
        private TranslatableStringHelperInterface $translatableStringHelper,
-    ) {
-    }
+    ) {}

    public function buildForm(FormBuilderInterface $builder)
    {
@@ -57,7 +56,7 @@ final readonly class ByActivityTypeAggregator implements AggregatorInterface

    public function getLabels($key, array $values, mixed $data)
    {
-        return function (int|string|null $value): string {
+        return function (null|int|string $value): string {
            if ('_header' === $value) {
                return 'export.aggregator.acp.by_activity_type.activity_type';
            }
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/BySocialActionAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/BySocialActionAggregator.php
@@ -20,9 +20,7 @@ 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,9 +20,7 @@ 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
@@ -20,13 +20,9 @@ use Symfony\Component\Form\FormBuilderInterface;

 final readonly class ActivityPresenceAggregator implements AggregatorInterface
 {
-    public function __construct(private ActivityPresenceRepositoryInterface $activityPresenceRepository, private TranslatableStringHelperInterface $translatableStringHelper)
-    {
-    }
+    public function __construct(private ActivityPresenceRepositoryInterface $activityPresenceRepository, private TranslatableStringHelperInterface $translatableStringHelper) {}

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

    public function getFormDefaultData(): array
    {
@@ -35,7 +31,7 @@ final readonly class ActivityPresenceAggregator implements AggregatorInterface

    public function getLabels($key, array $values, mixed $data)
    {
-        return function (int|string|null $value): string {
+        return function (null|int|string $value): string {
            if ('_header' === $value) {
                return 'export.aggregator.activity.by_activity_presence.header';
            }
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityTypeAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityTypeAggregator.php
@@ -22,9 +22,7 @@ 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
    {
@@ -58,7 +56,7 @@ class ActivityTypeAggregator implements AggregatorInterface

    public function getLabels($key, array $values, $data): \Closure
    {
-        return function (int|string|null $value): string {
+        return function (null|int|string $value): string {
            if ('_header' === $value) {
                return 'Activity type';
            }
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityUserAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityUserAggregator.php
@@ -22,9 +22,7 @@ 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,9 +20,7 @@ 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,8 +27,7 @@ class ActivityUsersJobAggregator implements AggregatorInterface
    public function __construct(
        private readonly UserJobRepositoryInterface $userJobRepository,
        private readonly TranslatableStringHelperInterface $translatableStringHelper
-    ) {
-    }
+    ) {}

    public function addRole(): ?string
    {
@@ -66,9 +65,7 @@ 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,8 +27,7 @@ class ActivityUsersScopeAggregator implements AggregatorInterface
    public function __construct(
        private readonly ScopeRepositoryInterface $scopeRepository,
        private readonly TranslatableStringHelperInterface $translatableStringHelper
-    ) {
-    }
+    ) {}

    public function addRole(): ?string
    {
@@ -66,9 +65,7 @@ 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,9 +20,7 @@ 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,9 +20,7 @@ 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
@@ -27,8 +27,7 @@ class CreatorJobAggregator implements AggregatorInterface
    public function __construct(
        private readonly UserJobRepositoryInterface $userJobRepository,
        private readonly TranslatableStringHelper $translatableStringHelper
-    ) {
-    }
+    ) {}

    public function addRole(): ?string
    {
@@ -66,9 +65,7 @@ class CreatorJobAggregator 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/CreatorScopeAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/CreatorScopeAggregator.php
@@ -27,8 +27,7 @@ class CreatorScopeAggregator implements AggregatorInterface
    public function __construct(
        private readonly ScopeRepository $scopeRepository,
        private readonly TranslatableStringHelper $translatableStringHelper
-    ) {
-    }
+    ) {}

    public function addRole(): ?string
    {
@@ -66,9 +65,7 @@ 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/LocationTypeAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/LocationTypeAggregator.php
@@ -20,9 +20,7 @@ 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/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;
+namespace Chill\ActivityBundle\Export\Aggregator\PersonAggregators;

 use Chill\ActivityBundle\Export\Declarations;
 use Chill\ActivityBundle\Repository\ActivityReasonCategoryRepository;
@@ -25,12 +25,7 @@ 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
    {
@@ -54,7 +49,7 @@ class ActivityReasonAggregator implements AggregatorInterface, ExportElementVali

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

        // join category if necessary
@@ -65,12 +60,19 @@ 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);
+        }
    }

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

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

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

    public function getLabels($key, array $values, $data)
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/PersonAggregators/PersonAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/PersonAggregators/PersonAggregator.php
@@ -19,9 +19,7 @@ use Symfony\Component\Form\FormBuilderInterface;

 final readonly class PersonAggregator implements AggregatorInterface
 {
-    public function __construct(private LabelPersonHelper $labelPersonHelper)
-    {
-    }
+    public function __construct(private LabelPersonHelper $labelPersonHelper) {}

    public function buildForm(FormBuilderInterface $builder)
    {
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/PersonsAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/PersonsAggregator.php
@@ -25,9 +25,7 @@ final readonly class PersonsAggregator implements AggregatorInterface
 {
    private const PREFIX = 'act_persons_agg';

-    public function __construct(private LabelPersonHelper $labelPersonHelper)
-    {
-    }
+    public function __construct(private LabelPersonHelper $labelPersonHelper) {}

    public function buildForm(FormBuilderInterface $builder)
    {
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/SentReceivedAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/SentReceivedAggregator.php
@@ -19,9 +19,7 @@ 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
@@ -36,9 +36,7 @@ class AvgActivityDuration implements ExportInterface, GroupedExportInterface
        $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
    {
--- a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/CountActivity.php
+++ b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/CountActivity.php
@@ -41,9 +41,7 @@ class CountActivity implements ExportInterface, GroupedExportInterface
        $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
    {
--- a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/CountHouseholdOnActivity.php
+++ b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/CountHouseholdOnActivity.php
@@ -42,9 +42,7 @@ final readonly class CountHouseholdOnActivity implements ExportInterface, Groupe
        $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
    {
--- a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/CountPersonsOnActivity.php
+++ b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/CountPersonsOnActivity.php
@@ -41,9 +41,7 @@ class CountPersonsOnActivity implements ExportInterface, GroupedExportInterface
        $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
    {
--- a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/ListActivity.php
+++ b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/ListActivity.php
@@ -31,8 +31,7 @@ final readonly class ListActivity implements ListInterface, GroupedExportInterfa
        private EntityManagerInterface $entityManager,
        private TranslatableStringExportLabelHelper $translatableStringExportLabelHelper,
        private FilterListAccompanyingPeriodHelperInterface $filterListAccompanyingPeriodHelper,
-    ) {
-    }
+    ) {}

    public function buildForm(FormBuilderInterface $builder)
    {
--- a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/CountActivity.php
+++ b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/CountActivity.php
@@ -33,9 +33,7 @@ class CountActivity implements ExportInterface, GroupedExportInterface
        $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
    {
--- a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/CountHouseholdOnActivity.php
+++ b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/CountHouseholdOnActivity.php
@@ -34,9 +34,7 @@ final readonly class CountHouseholdOnActivity implements ExportInterface, Groupe
        $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
    {
--- a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/StatActivityDuration.php
+++ b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/StatActivityDuration.php
@@ -47,9 +47,7 @@ class StatActivityDuration implements ExportInterface, GroupedExportInterface
        $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
    {
--- a/src/Bundle/ChillActivityBundle/Export/Export/ListActivityHelper.php
+++ b/src/Bundle/ChillActivityBundle/Export/Export/ListActivityHelper.php
@@ -40,8 +40,7 @@ class ListActivityHelper
        private readonly TranslatableStringHelperInterface $translatableStringHelper,
        private readonly TranslatableStringExportLabelHelper $translatableStringLabelHelper,
        private readonly UserHelper $userHelper
-    ) {
-    }
+    ) {}

    public function addSelect(QueryBuilder $qb): void
    {
@@ -75,9 +74,7 @@ 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
@@ -31,8 +31,7 @@ final readonly class ActivityTypeFilter implements FilterInterface
        private ActivityTypeRepositoryInterface $activityTypeRepository,
        private TranslatableStringHelperInterface $translatableStringHelper,
        private RollingDateConverterInterface $rollingDateConverter,
-    ) {
-    }
+    ) {}

    public function addRole(): ?string
    {
--- a/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/BySocialActionFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/BySocialActionFilter.php
@@ -21,9 +21,7 @@ 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,9 +21,7 @@ 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,8 +23,7 @@ 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
@@ -23,9 +23,7 @@ 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
    {
--- a/src/Bundle/ChillActivityBundle/Export/Filter/ActivityPresenceFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/ActivityPresenceFilter.php
@@ -26,8 +26,7 @@ final readonly class ActivityPresenceFilter implements FilterInterface
    public function __construct(
        private TranslatableStringHelperInterface $translatableStringHelper,
        private TranslatorInterface $translator
-    ) {
-    }
+    ) {}

    public function getTitle()
    {
--- a/src/Bundle/ChillActivityBundle/Export/Filter/ActivityTypeFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/ActivityTypeFilter.php
@@ -27,8 +27,7 @@ class ActivityTypeFilter implements ExportElementValidatedInterface, FilterInter
    public function __construct(
        protected TranslatableStringHelperInterface $translatableStringHelper,
        protected ActivityTypeRepositoryInterface $activityTypeRepository
-    ) {
-    }
+    ) {}

    public function addRole(): ?string
    {
--- a/src/Bundle/ChillActivityBundle/Export/Filter/ActivityUsersFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/ActivityUsersFilter.php
@@ -20,9 +20,7 @@ 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,9 +20,7 @@ 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
@@ -32,8 +32,7 @@ final readonly class CreatorJobFilter implements FilterInterface
        private TranslatableStringHelper $translatableStringHelper,
        private TranslatorInterface $translator,
        private UserJobRepositoryInterface $userJobRepository,
-    ) {
-    }
+    ) {}

    public function addRole(): ?string
    {
@@ -80,7 +79,7 @@ final readonly class CreatorJobFilter implements FilterInterface
    {
        $builder
            ->add('jobs', EntityType::class, [
-                'choices' => $this->userJobRepository->findAllActive(),
+                'choices' => $this->userJobRepository->findAllOrderedByName(),
                'class' => UserJob::class,
                'choice_label' => fn (UserJob $s) => $this->translatableStringHelper->localize(
                    $s->getLabel()
--- a/src/Bundle/ChillActivityBundle/Export/Filter/CreatorScopeFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/CreatorScopeFilter.php
@@ -15,7 +15,6 @@ use Chill\ActivityBundle\Export\Declarations;
 use Chill\MainBundle\Entity\Scope;
 use Chill\MainBundle\Entity\User\UserScopeHistory;
 use Chill\MainBundle\Export\FilterInterface;
-use Chill\MainBundle\Repository\ScopeRepositoryInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Doctrine\ORM\Query\Expr\Join;
 use Doctrine\ORM\QueryBuilder;
@@ -27,10 +26,8 @@ class CreatorScopeFilter implements FilterInterface
    private const PREFIX = 'acp_act_filter_creator_scope';

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

    public function addRole(): ?string
    {
@@ -78,7 +75,6 @@ class CreatorScopeFilter implements FilterInterface
        $builder
            ->add('scopes', EntityType::class, [
                'class' => Scope::class,
-                'choices' => $this->scopeRepository->findAllActive(),
                'choice_label' => fn (Scope $s) => $this->translatableStringHelper->localize(
                    $s->getName()
                ),
--- a/src/Bundle/ChillActivityBundle/Export/Filter/EmergencyFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/EmergencyFilter.php
@@ -28,9 +28,7 @@ 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,9 +21,7 @@ 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
@@ -26,9 +26,7 @@ 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
    {
--- a/src/Bundle/ChillActivityBundle/Export/Filter/PersonFilters/PersonHavingActivityBetweenDateFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/PersonFilters/PersonHavingActivityBetweenDateFilter.php
@@ -32,8 +32,7 @@ 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
@@ -26,9 +26,7 @@ final readonly class PersonsFilter implements FilterInterface
 {
    private const PREFIX = 'act_persons_filter';

-    public function __construct(private PersonRenderInterface $personRender)
-    {
-    }
+    public function __construct(private PersonRenderInterface $personRender) {}

    public function addRole(): ?string
    {
--- a/src/Bundle/ChillActivityBundle/Export/Filter/SentReceivedFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/SentReceivedFilter.php
@@ -29,9 +29,7 @@ class SentReceivedFilter implements FilterInterface

    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
    {
--- a/src/Bundle/ChillActivityBundle/Export/Filter/UserFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/UserFilter.php
@@ -21,9 +21,7 @@ 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
@@ -16,7 +16,6 @@ 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\TranslatableStringHelperInterface;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\QueryBuilder;
@@ -28,10 +27,8 @@ class UsersJobFilter implements FilterInterface
    private const PREFIX = 'act_filter_user_job';

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

    public function addRole(): ?string
    {
@@ -71,7 +68,6 @@ class UsersJobFilter implements FilterInterface
        $builder
            ->add('jobs', EntityType::class, [
                'class' => UserJob::class,
-                'choices' => $this->userJobRepository->findAllActive(),
                'choice_label' => fn (UserJob $j) => $this->translatableStringHelper->localize($j->getLabel()),
                'multiple' => true,
                'expanded' => true,
--- a/src/Bundle/ChillActivityBundle/Export/Filter/UsersScopeFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/UsersScopeFilter.php
@@ -30,8 +30,7 @@ class UsersScopeFilter implements FilterInterface
    public function __construct(
        private readonly ScopeRepositoryInterface $scopeRepository,
        private readonly TranslatableStringHelperInterface $translatableStringHelper
-    ) {
-    }
+    ) {}

    public function addRole(): ?string
    {
--- a/src/Bundle/ChillActivityBundle/Form/ActivityType.php
+++ b/src/Bundle/ChillActivityBundle/Form/ActivityType.php
@@ -95,7 +95,7 @@ class ActivityType extends AbstractType
            ]);
        }

-        /** @var AccompanyingPeriod|null $accompanyingPeriod */
+        /** @var \Chill\PersonBundle\Entity\AccompanyingPeriod|null $accompanyingPeriod */
        $accompanyingPeriod = null;

        if ($options['accompanyingPeriod'] instanceof AccompanyingPeriod) {
@@ -183,7 +183,6 @@ 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()),
@@ -405,7 +404,7 @@ class ActivityType extends AbstractType
            ->setAllowedTypes('center', ['null', Center::class, 'array'])
            ->setAllowedTypes('role', ['string'])
            ->setAllowedTypes('activityType', \Chill\ActivityBundle\Entity\ActivityType::class)
-            ->setAllowedTypes('accompanyingPeriod', [AccompanyingPeriod::class, 'null']);
+            ->setAllowedTypes('accompanyingPeriod', [\Chill\PersonBundle\Entity\AccompanyingPeriod::class, 'null']);
    }

    public function getBlockPrefix(): string
--- a/src/Bundle/ChillActivityBundle/Form/ActivityTypeType.php
+++ b/src/Bundle/ChillActivityBundle/Form/ActivityTypeType.php
@@ -25,9 +25,7 @@ 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,8 +28,7 @@ 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,9 +23,7 @@ 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,9 +20,7 @@ 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,9 +23,7 @@ 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,9 +20,7 @@ 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,13 +23,11 @@ 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 Person $person */
+        /** @var \Chill\PersonBundle\Entity\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,9 +18,7 @@ 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,8 +44,7 @@ final readonly class ActivityACLAwareRepository implements ActivityACLAwareRepos
        private EntityManagerInterface $em,
        private Security $security,
        private RequestStack $requestStack,
-    ) {
-    }
+    ) {}

    /**
     * @throws NonUniqueResultException
@@ -243,8 +242,7 @@ final readonly class ActivityACLAwareRepository implements ActivityACLAwareRepos
            thirdparties.thirdpartyids,
            persons.personids,
            actions.socialactionids,
-            issues.socialissueids,
-            a.user_id
+            issues.socialissueids

        FROM activity a
        LEFT JOIN chill_main_location location ON a.location_id = location.id
@@ -284,7 +282,6 @@ final readonly class ActivityACLAwareRepository implements ActivityACLAwareRepos
            ->addJoinedEntityResult(ActivityPresence::class, 'activityPresence', 'a', 'attendee')
            ->addFieldResult('activityPresence', 'presence_id', 'id')
            ->addFieldResult('activityPresence', 'presence_name', 'name')
-            ->addScalarResult('user_id', 'userId', Types::INTEGER)

            // results which cannot be mapped into entity
            ->addScalarResult('comment_comment', 'comment', Types::TEXT)
--- a/src/Bundle/ChillActivityBundle/Repository/ActivityDocumentACLAwareRepository.php
+++ b/src/Bundle/ChillActivityBundle/Repository/ActivityDocumentACLAwareRepository.php
@@ -33,17 +33,16 @@ 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);
@@ -72,7 +71,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);
@@ -123,7 +122,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/src/Bundle/ChillActivityBundle/Repository/ActivityPresenceRepository.php
+++ b/src/Bundle/ChillActivityBundle/Repository/ActivityPresenceRepository.php
@@ -34,7 +34,7 @@ class ActivityPresenceRepository implements ActivityPresenceRepositoryInterface
        return $this->repository->findAll();
    }

-    public function findBy(array $criteria, ?array $orderBy = null, ?int $limit = null, ?int $offset = null): array
+    public function findBy(array $criteria, array $orderBy = null, int $limit = null, int $offset = null): array
    {
        return $this->findBy($criteria, $orderBy, $limit, $offset);
    }
--- a/src/Bundle/ChillActivityBundle/Repository/ActivityPresenceRepositoryInterface.php
+++ b/src/Bundle/ChillActivityBundle/Repository/ActivityPresenceRepositoryInterface.php
@@ -25,7 +25,7 @@ interface ActivityPresenceRepositoryInterface
    /**
     * @return array|ActivityPresence[]
     */
-    public function findBy(array $criteria, ?array $orderBy = null, ?int $limit = null, ?int $offset = null): array;
+    public function findBy(array $criteria, array $orderBy = null, int $limit = null, int $offset = null): array;

    public function findOneBy(array $criteria): ?ActivityPresence;

--- a/src/Bundle/ChillActivityBundle/Repository/ActivityTypeRepository.php
+++ b/src/Bundle/ChillActivityBundle/Repository/ActivityTypeRepository.php
@@ -48,7 +48,7 @@ final class ActivityTypeRepository implements ActivityTypeRepositoryInterface
    /**
     * @return array|ActivityType[]
     */
-    public function findBy(array $criteria, ?array $orderBy = null, ?int $limit = null, ?int $offset = null): array
+    public function findBy(array $criteria, array $orderBy = null, int $limit = null, int $offset = null): array
    {
        return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
    }
--- a/src/Bundle/ChillActivityBundle/Service/DocGenerator/ActivityContext.php
+++ b/src/Bundle/ChillActivityBundle/Service/DocGenerator/ActivityContext.php
@@ -51,8 +51,7 @@ class ActivityContext implements
        private readonly BaseContextData $baseContextData,
        private readonly ThirdPartyRender $thirdPartyRender,
        private readonly ThirdPartyRepository $thirdPartyRepository
-    ) {
-    }
+    ) {}

    public function adminFormReverseTransform(array $data): array
    {
--- a/src/Bundle/ChillActivityBundle/Service/DocGenerator/ListActivitiesByAccompanyingPeriodContext.php
+++ b/src/Bundle/ChillActivityBundle/Service/DocGenerator/ListActivitiesByAccompanyingPeriodContext.php
@@ -11,7 +11,6 @@ declare(strict_types=1);

 namespace Chill\ActivityBundle\Service\DocGenerator;

-use Chill\ActivityBundle\Entity\Activity;
 use Chill\ActivityBundle\Entity\ActivityPresence;
 use Chill\ActivityBundle\Entity\ActivityType;
 use Chill\ActivityBundle\Repository\ActivityACLAwareRepositoryInterface;
@@ -57,8 +56,7 @@ class ListActivitiesByAccompanyingPeriodContext implements
        private readonly ThirdPartyRepository $thirdPartyRepository,
        private readonly TranslatableStringHelperInterface $translatableStringHelper,
        private readonly UserRepository $userRepository
-    ) {
-    }
+    ) {}

    public function adminFormReverseTransform(array $data): array
    {
@@ -113,7 +111,7 @@ class ListActivitiesByAccompanyingPeriodContext implements
    }

    /**
-     * @return list<Activity>
+     * @return list
     */
    private function filterActivitiesByUser(array $activities, User $user): array
    {
@@ -121,12 +119,6 @@ class ListActivitiesByAccompanyingPeriodContext implements
            array_filter(
                $activities,
                function ($activity) use ($user) {
-                    $u = $activity['user'];
-
-                    if (null !== $u && $u['username'] === $user->getUsername()) {
-                        return true;
-                    }
-
                    $activityUsernames = array_map(static fn ($user) => $user['username'], $activity['users'] ?? []);

                    return \in_array($user->getUsername(), $activityUsernames, true);
@@ -136,7 +128,7 @@ class ListActivitiesByAccompanyingPeriodContext implements
    }

    /**
-     * @return list<AccompanyingPeriod\AccompanyingPeriodWork>
+     * @return list
     */
    private function filterWorksByUser(array $works, User $user): array
    {
@@ -223,15 +215,6 @@ class ListActivitiesByAccompanyingPeriodContext implements
        foreach ($activities as $row) {
            $activity = $row[0];

-            $user = match (null === $row['userId']) {
-                false => $this->userRepository->find($row['userId']),
-                true => null,
-            };
-
-            $activity['user'] = $this->normalizer->normalize($user, 'docgen', [
-                AbstractNormalizer::GROUPS => ['docgen:read'], 'docgen:expects' => User::class,
-            ]);
-
            $activity['date'] = $this->normalizer->normalize($activity['date'], 'docgen', [
                AbstractNormalizer::GROUPS => ['docgen:read'], 'docgen:expects' => \DateTime::class,
            ]);
--- a/src/Bundle/ChillActivityBundle/Service/GenericDoc/Providers/AccompanyingPeriodActivityGenericDocProvider.php
+++ b/src/Bundle/ChillActivityBundle/Service/GenericDoc/Providers/AccompanyingPeriodActivityGenericDocProvider.php
@@ -34,10 +34,9 @@ final readonly class AccompanyingPeriodActivityGenericDocProvider implements Gen
        private EntityManagerInterface $em,
        private Security $security,
        private ActivityDocumentACLAwareRepositoryInterface $activityDocumentACLAwareRepository,
-    ) {
-    }
+    ) {}

-    public function buildFetchQueryForAccompanyingPeriod(AccompanyingPeriod $accompanyingPeriod, ?\DateTimeImmutable $startDate = null, ?\DateTimeImmutable $endDate = null, ?string $content = null, ?string $origin = null): FetchQueryInterface
+    public function buildFetchQueryForAccompanyingPeriod(AccompanyingPeriod $accompanyingPeriod, \DateTimeImmutable $startDate = null, \DateTimeImmutable $endDate = null, string $content = null, string $origin = null): FetchQueryInterface
    {
        $storedObjectMetadata = $this->em->getClassMetadata(StoredObject::class);
        $activityMetadata = $this->em->getClassMetadata(Activity::class);
@@ -100,7 +99,7 @@ final readonly class AccompanyingPeriodActivityGenericDocProvider implements Gen
        return $this->security->isGranted(AccompanyingPeriodVoter::SEE, $person);
    }

-    public function buildFetchQueryForPerson(Person $person, ?\DateTimeImmutable $startDate = null, ?\DateTimeImmutable $endDate = null, ?string $content = null, ?string $origin = null): FetchQueryInterface
+    public function buildFetchQueryForPerson(Person $person, \DateTimeImmutable $startDate = null, \DateTimeImmutable $endDate = null, string $content = null, string $origin = null): FetchQueryInterface
    {
        return $this->activityDocumentACLAwareRepository
            ->buildFetchQueryActivityDocumentLinkedToAccompanyingPeriodFromPersonContext($person, $startDate, $endDate, $content);
--- a/src/Bundle/ChillActivityBundle/Service/GenericDoc/Providers/PersonActivityGenericDocProvider.php
+++ b/src/Bundle/ChillActivityBundle/Service/GenericDoc/Providers/PersonActivityGenericDocProvider.php
@@ -25,10 +25,9 @@ final readonly class PersonActivityGenericDocProvider implements GenericDocForPe
    public function __construct(
        private Security $security,
        private ActivityDocumentACLAwareRepositoryInterface $personActivityDocumentACLAwareRepository,
-    ) {
-    }
+    ) {}

-    public function buildFetchQueryForPerson(Person $person, ?\DateTimeImmutable $startDate = null, ?\DateTimeImmutable $endDate = null, ?string $content = null, ?string $origin = null): FetchQueryInterface
+    public function buildFetchQueryForPerson(Person $person, \DateTimeImmutable $startDate = null, \DateTimeImmutable $endDate = null, string $content = null, string $origin = null): FetchQueryInterface
    {
        return $this->personActivityDocumentACLAwareRepository->buildFetchQueryActivityDocumentLinkedToPersonFromPersonContext(
            $person,
--- a/src/Bundle/ChillActivityBundle/Service/GenericDoc/Renderers/AccompanyingPeriodActivityGenericDocRenderer.php
+++ b/src/Bundle/ChillActivityBundle/Service/GenericDoc/Renderers/AccompanyingPeriodActivityGenericDocRenderer.php
@@ -20,9 +20,7 @@ use Chill\DocStoreBundle\Repository\StoredObjectRepository;

 final readonly class AccompanyingPeriodActivityGenericDocRenderer implements GenericDocRendererInterface
 {
-    public function __construct(private StoredObjectRepository $objectRepository, private ActivityRepository $activityRepository)
-    {
-    }
+    public function __construct(private StoredObjectRepository $objectRepository, private ActivityRepository $activityRepository) {}

    public function supports(GenericDocDTO $genericDocDTO, $options = []): bool
    {
--- a/src/Bundle/ChillActivityBundle/Tests/Controller/ActivityControllerTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Controller/ActivityControllerTest.php
@@ -310,7 +310,7 @@ final class ActivityControllerTest extends WebTestCase
    }

    /**
-     * @return ActivityType
+     * @return \Chill\ActivityBundle\Entity\ActivityType
     */
    private function getRandomActivityType()
    {
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/PersonAggregators/ActivityReasonAggregatorTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/PersonAggregators/ActivityReasonAggregatorTest.php
@@ -9,10 +9,10 @@ declare(strict_types=1);
 * the LICENSE file that was distributed with this source code.
 */

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

 use Chill\ActivityBundle\Entity\Activity;
-use Chill\ActivityBundle\Export\Aggregator\ActivityReasonAggregator;
+use Chill\ActivityBundle\Export\Aggregator\PersonAggregators\ActivityReasonAggregator;
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
 use Doctrine\ORM\EntityManagerInterface;
 use Prophecy\PhpUnit\ProphecyTrait;
@@ -33,14 +33,14 @@ final class ActivityReasonAggregatorTest extends AbstractAggregatorTest
        self::bootKernel();

        $this->aggregator = self::$container->get(ActivityReasonAggregator::class);
-        /*
+
        $request = $this->prophesize()
            ->willExtend(\Symfony\Component\HttpFoundation\Request::class);

        $request->getLocale()->willReturn('fr');

        self::$container->get('request_stack')
-                    ->push($request->reveal());*/
+            ->push($request->reveal());
    }

    public function getAggregator()
@@ -65,12 +65,7 @@ final class ActivityReasonAggregatorTest extends AbstractAggregatorTest
        return [
            $em->createQueryBuilder()
                ->select('count(activity.id)')
-                ->from(Activity::class, 'activity')
-                ->join('activity.person', 'person'),
-            $em->createQueryBuilder()
-                ->select('count(activity.id)')
-                ->from(Activity::class, 'activity')
-                ->join('activity.accompanyingPeriod', 'accompanyingPeriod'),
+                ->from(Activity::class, 'activity'),
            $em->createQueryBuilder()
                ->select('count(activity.id)')
                ->from(Activity::class, 'activity')
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Julien Fastré	3fb04594eb	add changie [ci-skip]	2023-12-12 15:55:14 +01:00
Julien Fastré	1065706e60	Re-configure test app	2023-12-12 15:55:14 +01:00
Julien Fastré	f131572344	Remove references to old async upload bundle	2023-12-12 15:55:14 +01:00
Julien Fastré	45e1ce034a	Add ConfigureOpenstackObjectStorageCommand to ChillDocStoreBundle Added new command file "ConfigureOpenstackObjectStorageCommand.php" under ChillDocStoreBundle that helps in setting up OpenStack container for document storage. Along with the command, added corresponding test file "ConfigureOpenstackObjectStorageCommandTest.php" to ensure the functionality is working as expected.	2023-12-12 15:55:14 +01:00
Julien Fastré	82ca321715	Add exceptions for async file handling failures Introduced two new exceptions, `BadCallToRemoteServer` and `TempUrlRemoteServerException`, to improve error handling in asynchronous file operations. These exceptions are thrown when there are issues with the remote server during an async file operation such as HTTP status codes >= 400 and if the server is unreachable.	2023-12-12 15:55:13 +01:00
Julien Fastré	28d09a8206	Add form and types to handle async files	2023-12-12 15:55:13 +01:00
Julien Fastré	1195767eb3	Add Twig AsyncUploadExtension and its associated test Created AsyncUploadExtension under Chill\DocStoreBundle\AsyncUpload\Templating to provide Twig filter functions for generating URLs for asynchronous file uploads. To ensure correctness, AsyncUploadExtensionTest was implemented in Bundle\ChillDocStoreBundle\Tests\AsyncUpload\Templating. Service definitions were also updated in services.yaml.	2023-12-12 15:55:13 +01:00
Julien Fastré	4fd5a37df3	Add serializer groups to SignedUrl and SignedUrlPost classes, include tests Serializer groups have been added to the SignedUrl and SignedUrlPost classes to ensure correct serialization. Two new test files were also included: SignedUrlNormalizerTest and SignedUrlPostNormalizerTest which test the normalization of instances of the classes.	2023-12-12 15:55:13 +01:00
Julien Fastré	450e7c348b	Fix and clean DI configuration for chill_doc_store for usage with AsyncUpload	2023-12-12 15:55:12 +01:00
Julien Fastré	a70572266f	Refactor TempUrlOpenstackGenerator to use parameter bag and Bundle configuration The TempUrlOpenstackGenerator now uses a ParameterBag for configuration instead of individual parameters. This simplifies the handling of configuration values and makes the code more maintainable. The parameter configuration has also been included in the chill_doc_store configuration array for a unified approach.	2023-12-12 15:55:12 +01:00
Julien Fastré	d688022825	Add Controller to get asyncUpload signatures Added new files for handling asynchronous file uploads in ChillDocStoreBundle. The new files include a controller for generating temporary URLs (AsyncUploadController.php), a security authorization file (AsyncUploadVoter.php), and a corresponding test file (AsyncUploadControllerTest.php). These implementations permit asynchronous uploads via POST, GET, and HEAD methods while maintaining security protocols.	2023-12-12 11:36:14 +01:00
Julien Fastré	264fff5c36	Implement asynchronous upload feature in Openstack Object Store Those features were previously stored in champs-libres/async-upload-bundle This commit introduces several new classes within the ChillDocStore bundle for handling asynchronous uploads onto an Openstack Object Store. Specifically, the TempUrlOpenstackGenerator, SignedUrl, TempUrlGeneratorInterface, TempUrlGenerateEvent, and TempUrlGeneratorException classes have been created. This implementation will allow for generating "temporary URLs", which assist in securely and temporarily uploading resources to the OpenStack Object Store. This feature enables the handling of file uploads in a more scalable and efficient manner in high-volume environments. Additionally, corresponding unit tests have also been added to ensure the accuracy of this new feature.	2023-12-12 11:36:14 +01:00