improve workflow decision form

fix workflow redirection in accompanying period work edit
minor fix and renaming
2025-09-15 11:14:59 +00:00 · 2022-02-01 10:02:33 +01:00 · 2022-01-31 21:09:00 +01:00 · 2022-01-31 16:55:19 +01:00 · 2022-01-31 15:51:21 +01:00 · 2022-01-31 15:40:40 +01:00
1728 changed files with 104277 additions and 72248 deletions
--- a/.env.test
+++ b/.env.test
@@ -3,4 +3,3 @@
 # Run tests from root to adapt your own environment
 KERNEL_CLASS='App\Kernel'
 APP_SECRET='$ecretf0rt3st'
-DATABASE_URL=postgresql://postgres:postgres@db:5432/postgres?serverVersion=12&charset=utf8
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,5 @@ docs/build/
 .phpunit.result.cache
 ###< phpunit/phpunit ###

+/.php-cs-fixer.cache
+/.idea/
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,24 +1,10 @@
 ---
-image: registry.gitlab.com/chill-projet/chill-app/php-base-image:7.4

 # Select what we should cache between builds
 cache:
    paths:
        - tests/app/vendor/
-    - .composer
-
-before_script:
-  # add extensions to postgres
-  - PGPASSWORD=$POSTGRES_PASSWORD psql -U $POSTGRES_USER -h db -c "CREATE EXTENSION IF NOT EXISTS unaccent; CREATE EXTENSION IF NOT EXISTS pg_trgm;"
-  # Install and run Composer
-  - mkdir -p $COMPOSER_HOME
-  - curl -sS https://getcomposer.org/installer | php
-  - php -d memory_limit=2G composer.phar install
-  - php tests/app/bin/console doctrine:migrations:migrate -n
-  - php -d memory_limit=2G tests/app/bin/console cache:clear --env=dev
-  - php -d memory_limit=3G tests/app/bin/console doctrine:fixtures:load -n
-  - php -d memory_limit=2G tests/app/bin/console cache:clear --env=test
-  - echo "before_script finished"
+        - .cache

 # Bring in any services we need http://docs.gitlab.com/ee/ci/docker/using_docker_images.html#what-is-a-service
 # See http://docs.gitlab.com/ee/ci/services/README.html for examples.
@@ -30,9 +16,12 @@ services:

 # Set any variables we need
 variables:
+    GIT_DEPTH: 1
    # Configure postgres environment variables (https://hub.docker.com/r/_/postgres/)
    POSTGRES_USER: postgres
    POSTGRES_PASSWORD: postgres
+    # configure database access
+    DATABASE_URL: postgresql://postgres:postgres@db:5432/postgres?serverVersion=12&charset=utf8
    # fetch the chill-app using git submodules
    GIT_SUBMODULE_STRATEGY: recursive
    REDIS_HOST: redis
@@ -40,11 +29,72 @@ variables:
    REDIS_URL: redis://redis:6379
    # change vendor dir to make the app install into tests/apps
    COMPOSER_VENDOR_DIR: tests/app/vendor
-  # cache some composer data
-  COMPOSER_HOME: .composer

+stages:
+    - Composer install
+    - Tests

-# Run our tests
-test:
+build:
+    stage: Composer install
+    image: registry.gitlab.com/chill-projet/chill-app/php-base-image:7.4
+    before_script:
+        - curl -sS https://getcomposer.org/installer | php
+        - php -d memory_limit=2G composer.phar config -g cache-dir "$(pwd)/.cache"
    script:
-    - php -d memory_limit=3G bin/phpunit --colors=never
+        - php -d memory_limit=2G composer.phar install --optimize-autoloader --no-ansi --no-interaction --no-progress
+    cache:
+        paths:
+            - .cache/
+    artifacts:
+        expire_in: 30 min
+        paths:
+            - bin
+            - tests/app/vendor/
+
+code_style:
+    stage: Tests
+    image: registry.gitlab.com/chill-projet/chill-app/php-base-image:7.4
+    script:
+        - bin/grumphp run --tasks=phpcsfixer
+    artifacts:
+        expire_in: 30 min
+        paths:
+            - bin
+            - tests/app/vendor/
+
+phpstan_tests:
+    stage: Tests
+    image: registry.gitlab.com/chill-projet/chill-app/php-base-image:7.4
+    script:
+        - bin/grumphp run --tasks=phpstan
+    artifacts:
+        expire_in: 30 min
+        paths:
+            - bin
+            - tests/app/vendor/
+
+psalm_tests:
+    stage: Tests
+    image: registry.gitlab.com/chill-projet/chill-app/php-base-image:7.4
+    script:
+        - bin/grumphp run --tasks=psalm
+    artifacts:
+        expire_in: 30 min
+        paths:
+            - bin
+            - tests/app/vendor/
+
+unit_tests:
+    stage: Tests
+    image: registry.gitlab.com/chill-projet/chill-app/php-base-image:7.4
+    script:
+        - php tests/app/bin/console doctrine:migrations:migrate -n
+        - php -d memory_limit=2G tests/app/bin/console cache:clear --env=dev
+        - php -d memory_limit=3G tests/app/bin/console doctrine:fixtures:load -n
+        - php -d memory_limit=2G tests/app/bin/console cache:clear --env=test
+        - php -d memory_limit=4G bin/phpunit --colors=never
+    artifacts:
+        expire_in: 30 min
+        paths:
+            - bin
+            - tests/app/vendor/
--- a/.php_cs.dist.php
+++ b/.php_cs.dist.php
@@ -0,0 +1,79 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+/** @var \drupol\PhpCsFixerConfigsPhp\Config\Php73 $config */
+$config = require __DIR__ . '/tests/app/vendor/drupol/php-conventions/config/php73/php_cs_fixer.config.php';
+
+$config
+    ->getFinder()
+    ->ignoreDotFiles(false)
+    ->notPath('tests/app')
+    ->name(['.php_cs.dist.php']);
+
+$rules = $config->getRules();
+
+$riskyRules = [
+    'ternary_to_elvis_operator' => false,
+    'php_unit_mock_short_will_return' => false,
+    'php_unit_set_up_tear_down_visibility' => false,
+    'php_unit_construct' => false,
+    'php_unit_dedicate_assert' => false,
+    'php_unit_expectation' => false,
+    'php_unit_mock' => false,
+    'php_unit_namespaced' => false,
+    'php_unit_no_expectation_annotation' => false,
+    'php_unit_test_case_static_method_calls' => false,
+    'php_unit_test_annotation' => false,
+    //    'final_internal_class' => false,
+    //    'strict_param' => false,
+    //    'declare_strict_types' => false,
+    //    'strict_comparison' => false,
+    //    'no_unreachable_default_argument_value' => false,
+    //    'ereg_to_preg' => false,
+    //    'ordered_interfaces' => false,
+    //    'error_suppression' => false,
+    //    'non_printable_character' => false,
+    //    'ordered_traits' => false,
+    //    'no_useless_sprintf' => false,
+    //    'dir_constant' => false,
+    //    'no_alias_functions' => false,
+    //    'implode_call' => false,
+    //    'combine_nested_dirname' => false,
+    //    'pow_to_exponentiation' => false,
+    //    'comment_to_phpdoc' => false,
+    //    'no_unset_on_property' => false,
+    //    'native_constant_invocation' => false,
+    //    'function_to_constant' => false,
+    //    'is_null' => false,
+    //    'native_function_invocation' => false,
+    //    'no_trailing_whitespace_in_string' => false,
+    //    'array_push' => false,
+    //    'fopen_flag_order' => false,
+    //    'fopen_flags' => false,
+    //    'logical_operators' => false,
+    //    'modernize_types_casting' => false,
+    //    'no_homoglyph_names' => false,
+    //    'no_unneeded_final_method' => false,
+    //    'random_api_migration' => false,
+    //    'static_lambda' => false,
+    //    'set_type_to_cast' => false,
+    //    'string_line_ending' => false,
+    //    'psr_autoloading' => false,
+];
+
+$rules = array_merge(
+    $rules,
+    $riskyRules
+);
+
+$rules['header_comment']['header'] = trim(file_get_contents(__DIR__ . '/resource/header.txt'));
+
+return $config->setRules($rules);
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,7 +11,232 @@ and this project adheres to
 ## Unreleased

 <!-- write down unreleased development here -->
+* renommer "dossier numéro" en "parcours numéro" dans les résultats de recherche
+* renomme date de début en date d'ouverture dans le formulaire parcours

+
+## Test releases
+
+### test release 2021-01-31
+
+[fast_actions] improve fast-actions buttons override mechanism, fix https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/413
+[homepage widget] add vue homepage_widget with asynchone loading, give a global view resume of the user concerned actions, notifications, etc.  
+* [person] accompanying course: optimisation: do not fetch some resources for the banner (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/409)
+* [person] accompanying course: close modal when edit participation (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/420)
+* [person] accompanying course: treat validation error when editing on-the-fly entities (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/420)
+* [activity] show activity attendee (présence) in the activity list (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/412)
+* [activity] admin: change validation rule for social action visible field (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/413)
+* [parcours]: component added to change the opening date of a parcours (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/411)
+* [search]: listing of parcours display changed (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/410)
+* [user]: page with accompanying periods to which is user is referent (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/408)
+* [person] age added to renderstring + renderbox/ vue component created to display person text (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/389)
+* [household member editor] allow to push to existing household
+* [workflow][notification] improve how notifications and workflows are 'attached' to entities: contextual list, counter, buttons and vue modal
+
+
+### test release 2021-01-28
+
+* [person] improve filiations vis graph: disable physics, use chill colors for persons-households-course, increase label of relations, remove labels on household arrows and other improvements (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/286, https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/362)
+* [activity] Order activity by date and by id (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/364)
+* [main] increase length of 4 Address fields (change to TEXT, no size limits) (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/277)
+* [main] Add confidential option for address, in edit and view (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/165)
+* [person] name suggestions within create person form when person is created departing from a search input (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/377)
+* [person] Add residential address entity, form and list for each person
+* [aside_activity]: dynamicUserPickerType used (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/399)
+* dispatching list
+
+
+### test release 2021-01-26
+
+* [parcours] comments truncated if too long + link added (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/406)
+* [person]: possibility to add person resources (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/382)
+* [person ressources]: module added
+
+
+### test release 2022-01-24
+
+* [person] name suggestions within create person form when person is created departing from a search input (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/377)
+* [notification: formulaire création] descend la box avec la description dans le bas du formulaire
+* [notification for activity]: fix link to activity
+* [notification] add "URGENT" before accompanying course with emergency = true
+* [notification] add a "read more" button on system notification
+* [notification] add `[Chill]` in the subject of each notification, automatically
+* [notification] add a counter for notification in activity list and accompanying period list, and search results
+* [parcours] bugfix if deathdate is not defined (eg. for a thirdparty) parcours is still displayed. Gave error before.
+* [workflow] add breadcrumb to show steps
+* [popover] add popover html popup mechanism (used by workflow breadcrumb)
+* [templates] improve updatedBy macro in item metadatas
+* [parcours]: bug fix when comment is pinned all other comments remain in the collection (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/385)
+* [workflow] 
+  * add My workflow section with my opened subscriptions
+  * apply workflow on documents, accompanyingCourseWork and Evaluations
+* [wopi-link] a new vue component allow to open wopi link in a fullscreen chill-themed modal
+
+### test release 2022-01-19
+* vuejs: add dead information on all on-the-fly person render boxes, in vis graph and other templates (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/271)
+* [thirdparty] fix bug in 3rd party view: types was replaced by thirdPartyTypes
+* [main] location form type: fix unmapped address field (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/246)
+* [activity] fix wrong import of js assets for adding and viewing documents in activity (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/83 & https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/176)
+* [person]: space added between deathdate and age in twig renderbox (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/380)
+* [forms] dynamic picker types for user/person/thirdparty types created (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/386)
+
+### test release 2022-01-17
+
+* [main] Add editableByUser field to locationType entity, adapt the admin template and add this condition in the location-type endpoint (see https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/297)
+* [main] Add mainLocation field to User entity and add it in user form type
+* rewrite page which allow to select activity
+* [main] Add mainLocation field to User entity and add it in user form type
+* [course list in person context] show full username/label for ref
+* [accompanying period work] remove the possibility to  generate document from an accompanying period work
+* vuejs: add validation on required fields for AddPerson, Address and Location components
+* vuejs: treat 422 validation errors in locations and AddPerson components
+* [person]: space added between deathdate and age in twig renderbox (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/380)
+
+## Test releases
+* vuejs: add validation on required fields for AddPerson, Address and Location components
+* vuejs: treat 422 validation errors in locations and AddPerson components
+* [person]: space added between deathdate and age in twig renderbox (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/380)
+
+### test release 2022-01-12
+
+* fix thirdparty normalizer on telephone field: https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/322
+
+### test release 2022-01-11
+
+* vuejs: translate in French all multiselect widgets
+* [address] define address lines according postal standards for France and Belgium (default) and change AddressRender, chill_entity_render_box and AddressRenderBox.vue
+* [household] change translations (champs-libres/departement-de-la-vendee/accent-suivi-developpement#109)
+* [household] add address i18n in household component (champs-libres/departement-de-la-vendee/accent-suivi-developpement#158)
+* [household] add on the fly i18n in household component
+* [household] redirect to the household page when a household is created from a person (champs-libres/departement-de-la-vendee/accent-suivi-developpement#175)
+* [household] household member editor: display alert if some members have already an household (champs-libres/departement-de-la-vendee/accent-suivi-developpement#172)
+* [household] household member editor: do not add in new members if the member is included in the members of household (champs-libres/departement-de-la-vendee/accent-suivi-developpement#123)
+* [household] household member editor: remove markNoAddress button (champs-libres/departement-de-la-vendee/accent-suivi-developpement#109)
+* [person]: ordering fields in add person (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/61)
+* [person]: Add email and alt names in add person (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/61)
+* [accompanyingCourse] Add a delete action and delete buttons to delete a accompanying course when step = DRAFT (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/64)
+* [accompanyingCourse] Add a administrative location in the accompanying course, set the user current location as default, allow to select a location in a select field and do not allow to confirm the accompanying course if location is empty.
+* [accompanyingCourse] Add the administrative location in the available variables for document generation
+* AddAddress: optimize loading: wait for the user finish typing;
+* UserPicker: fix bug with deprecated role
+* docgen: add base context + tests
+* docgen: add age for person
+* [household menu] fix filiation order https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/265
+* [AddAddress]: optimize loading: wait for the user finish typing;
+* [UserPicker]: fix bug with deprecated role
+* [docgen]: add base context + tests
+* [docgen]: add age for person
+* [task]: fix dropdown menu style + fix bug in singleTaskController (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/338)
+* Household: fix bug when moving person on the same day (see https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/281)
+* Household: show date validFrom and validTo when moving
+* address reference: add index for refid
+* [accompanyingCourse_work] fix styles conflicts + fix bug with remove goal (remove goals one at a time)
+* [accompanyingCourse] improve masonry on resume page, add origin
+* [notification] new notification interface, can be associated to AccompanyingCourse/Period, Activities.
+  * List notifications, show, and comment in User section
+  * Notify button and contextual notification box on associated objects pages
+* [accompanyingCourse] add a comment for each resource associated. A modal allow to save comment. Comment is displayed in on-the-fly show modal of the accompanyingCourse context (edit page + resume page).
+
+### test release 2021-12-14
+
+* [asideactivity] creation of aside activity category fixed (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/262)
+* [vendee/person] fix typo "situation professionelle" => "situation professionnelle"
+* [main] add availableForUsers condition from locationType in the location API endpoint (champs-libres/departement-de-la-vendee/accent-suivi-developpement#248)
+* [main] add the current location of the user as API point + add it in the activity location list (champs-libres/departement-de-la-vendee/accent-suivi-developpement#247)
+* [activity] improve show/new/edit templates, fix SEE and SEE_DETAILS acl
+* [badges] create specific badge for TMS, and make person/thirdparty badges clickable with on-the-fly modal in :
+    * concerned groups items (activity, calendar)
+    * accompanyingCourseWork lists
+    * accompanyingCourse lists
+* [acompanyingCourse] add initial comment on Resume page
+* [person] create button full width (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/330)
+
+### test release 2021-12-11
+
+* [main] add order field to civility
+* [main] change address format in case the country is France, in Address render box and address normalizer
+* [person] add validator for accompanying period with a test on social issues (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/76)
+* [activity] fix visibility for location
+* [origin] fix origin: use correctly the translatable strings
+    * /!\ everyone must update the origin table. As there is only one row, execute `update chill_person_accompanying_period_origin set label = jsonb_build_object('fr', 'appel téléphonique');`
+* [person] redirect bug fixed.
+* [action] add an unrelated issue within action creation.
+* [origin] fix origin: use correctly the translatable strings
+    * /!\ everyone must update the origin table. As there is only one row, execute `update chill_person_accompanying_period_origin set label = jsonb_build_object('fr', 'appel téléphonique');`
+* [main] change order of civilities in civility fixtures (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/191)
+* [person] set min attr in the minimum of children field (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/191)
+* [person] add marital status date in person view (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/191)
+* [person] show number of children + allow set number of children to null (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/191)
+* [person] show acceptSMS option (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/191)
+* [person] add death information in person render box in twig and vue render boxes (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/191)
+* [asideactivity] creation of aside activity category fixed (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/262)
+* [vendee/person] fix typo "situation professionelle" => "situation professionnelle"
+* [accompanyingcourse_work] Changes in layout/behavior of edit form (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/321)
+* [badge-entity] design coherency between pills badge-person and 3 kinds of badge-thirdparty
+* [AddPersons] suggestions row are clickable, not only checkbox
+
+### test release 2021-12-06
+
+* [main] address: use search API end points for getting postal code and reference address (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/316)
+* [main] address: in edit mode, select the encoded values in multiselect for address reference and city (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/316)
+* [person search] fix bug when using birthdate after and birthdate before
+* [person search] increase pertinence when lastname begins with search pattern
+* [activity/actions] Améliore la cohérence du design entre
+  * la page résumé d'un parcours (liste d'actions récentes et liste d'activités récentes)
+  * la page liste des actions
+  * la page liste des activités (contexte personne / contexte parcours)
+* [household] field to edit wheter person is titulaire of household or not removed (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/322)
+* [activity] create work if a work with same social action is not associated to the activity
+* [visgraph] improve and fix bugs on vis-network relationship graph
+* [bugfix] posting of birth- and deathdate through api fixed.
+* [suggestions] improve suggestions lists
+
+### Test release 2021-11-19 - bis
+
+* [household] do not allow to create two addresses on the same date
+* [activity] handle case when there is no social action associated to social issue
+* [activity] layout for issues / actions
+* [activity][bugfix] in edit mode, the form will now load the social action list
+
+
+### Test release 2021-11-29
+
+* [person] suggest entities (person | thirdparty) when creating/editing the accompanying course (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/119)
+* [activity] add custom validation on the Activity class, based on what is required from the ActivityType (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/188)
+* [main] translate multiselect messages when selecting/creating address
+* [main] set the coordinates of the city when creating a new address OR choosing "pas d'adresse complète"
+* Use the user.label in accompanying course banner, instead of username;
+* fix: show validation message when closing accompanying course;
+* [thirdparty] link from modal to thirdparty detail page fixed (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/228)
+* [assets] new asset to style suggestions lists (with add/remove item link) (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/258)
+* [accompanyingCourseWorkEdit] improves hyphenation and line breaks for long badges
+* [acompanyingCourse] improve Resume page
+  * complete all needed informations,
+  * actions and activities are clickables,
+  * better placement with js masonry blocks on top of content area,
+  * https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/101
+  * https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/295
+* [activity/calendar] on show page, concerned groups of persons table adapt itself to isVisibles options
+* [activity] remove the "plus" button in activity list
+* [activity] check ACL on activity list in person context
+* [list for accompanying course in person] filter list using ACL
+* [validation] toasts are displayed for errors when modifying accompanying course (generalization required).
+* [period] only the user can enable confidentiality
+* add an endpoint for checking permissions. See https://gitlab.com/Chill-Projet/chill-bundles/-/merge_requests/232
+* [activity] for a new activity: suggest and create on-the-fly locations based on the accompanying course location + location of the suggested parties
+* [calendar] for a new rdv: suggest and create on-the-fly locations based on the accompanying course location + location of the suggested parties
+
+
+## Test releases
+
+### Test release 2021-11-22
+
+* [activity] delete admin_user_show in twig template because this route is not defined and should be defined
+* [activity] suggest requestor, user and ressources for adding persons|user|3rdparty
+* [calendar] suggest persons, professionals and invites for adding persons|3rdparty|user
+* [activity] take into account the restrictions on person|thirdparties|users visibilities defined in ActivityType
+* [main] Add currentLocation to the User entity + add a page for selecting this location + add in the user menu (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/133)
+* [activity] add user current location as default location for a new activity (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/133)
 * [task] Select2 field in task form to allow search for a user (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/167)
 * remove "search by phone configuration option": search by phone is now executed by default
 * remplacer le classement par ordre alphabétique par un classement par ordre de pertinence, qui tient compte:
@@ -28,9 +253,11 @@ and this project adheres to
 * [person] create an accompanying course: add client-side validation if no origin (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/210)
 * [person] fix bounds for computing current person address: the new address appears immediatly
 * [docgen] create a normalizer and serializer for normalization on doc format
-
-
-## Test releases
+* [person normalization] the key center is now "centers" and is an array. Empty array if no center
+* [accompanyingCourse] Ability to close accompanying course (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/296)
+* [task] Select2 field in task form to allow search for a user (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/167)
+* [list result] show all courses, except ones with period closed
+* [accompanyingCourse] improve banner with small carousel to display slide social-issues or slide associated persons (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/69)

 ### Test release 2021-11-15

@@ -48,6 +275,8 @@ and this project adheres to
 * [person] do not ask for center any more on person creation
 * [3party] do not ask for center any more on 3party creation

+## Test releases
+
 ### Test release 2021-11-08

 * [person]: Display the name of a user when searching after a User (TMS)
@@ -114,7 +343,7 @@ and this project adheres to
    * fast creation buttons
    * add ordering for types

-* [AccompanyingCourse Resume page] badge-title for AccompanyingCourseWork and for Activities;
+* [AccompanyingCourse Resume page] dashboard for AccompanyingCourseWork and for Activities;
 * Improve badges behaviour with small screens;

 * [ThirdParty]:
--- a/CONVENTIONS.md
+++ b/CONVENTIONS.md
@@ -98,7 +98,7 @@ Finalement, il importe ici de définir ce qu'est un bloc, ce qu'est une zone d'a

 Par exemple pour mettre un style au titre on précise juste h3 dans la cascade bloc.

-```sass
+```scss
 div.bloc {
   // un bloc générique, utilisé à plusieurs endroits
   &.bloc-dark {
@@ -381,3 +381,31 @@ A chaque fois qu'un lien est indiqué, vérifier si on ne doit pas utiliser la f
    * utiliser `chill_return_path_or` dans le bouton "Cancel";
    * pour les boutons "enregistrer et voir" et "Enregistrer et fermer" => ?

+### Assets pour les listes de suggestion
+
+Créer une liste de suggestions à ajouter (tout l'item est cliquable)
+```html
+<ul class="list-suggest add-items">
+   <li>
+      <span>item</span>
+   </li>
+</ul>
+```
+Créer une liste de suggestions à enlever (avec une croix rouge cliquable, l'ancre a est vide)
+```html
+<ul class="list-suggest remove-items">
+    <li>
+        <span>
+            item
+        </span>
+    </li>
+</ul>
+```
+Créer un titre enlevable (avec une croix rouge cliquable, l'ancre a est vide)
+```html
+<div class="item-title">
+    <span>title</span>
+</div>
+```
+Les classes `cols` ou `inline` peuvent être ajoutées à côté de `list-suggest` pour modifier la disposition de la liste.
+Dans le dernier exemple, on met une classe `removable` sur le span, si on veut pouvoir enlever l'élément.
--- a/8
+++ b/8
@@ -629,12 +629,12 @@ to attach them to the start of each source file to most effectively
 state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.

-    chill-bundles
-    Copyright (C) 2021  Chill Project
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>

    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
+    it under the terms of the GNU Affero General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
    (at your option) any later version.

    This program is distributed in the hope that it will be useful,
--- a/composer.json
+++ b/composer.json
@@ -1,80 +1,84 @@
 {
    "name": "chill-project/chill-bundles",
-    "type": "library",
    "description": "Most used bundles for chill-project",
+    "license": "AGPL-3.0-only",
+    "type": "library",
    "keywords": [
        "chill",
        "social worker"
    ],
-    "license": "AGPL-3.0-only",
    "require": {
-        "champs-libres/async-uploader-bundle": "dev-sf4",
-        "champs-libres/wopi-bundle": "dev-master",
-        "composer/package-versions-deprecated": "^1.10",
+        "php": "^7.4",
+        "champs-libres/async-uploader-bundle": "dev-sf4#d57134aee8e504a83c902ff0cf9f8d36ac418290",
+        "champs-libres/wopi-bundle": "dev-master#59b468503b9413f8d588ef9e626e7675560db3d8",
+        "champs-libres/wopi-lib": "dev-master#0e1da19bb6de820080b8651867a7e475be590060",
        "doctrine/doctrine-bundle": "^2.1",
        "doctrine/doctrine-migrations-bundle": "^3.0",
        "doctrine/orm": "^2.7",
        "erusev/parsedown": "^1.7",
        "graylog2/gelf-php": "^1.5",
-        "knplabs/knp-menu": "^3.1",
        "knplabs/knp-menu-bundle": "^3.0",
        "knplabs/knp-time-bundle": "^1.12",
        "league/csv": "^9.7.1",
        "nyholm/psr7": "^1.4",
+        "ocramius/package-versions": "^1.10",
        "phpoffice/phpspreadsheet": "^1.16",
        "ramsey/uuid-doctrine": "^1.7",
        "sensio/framework-extra-bundle": "^5.5",
-        "symfony/asset": "4.*",
-        "symfony/browser-kit": "^5.2",
-        "symfony/css-selector": "^5.2",
-        "symfony/expression-language": "4.*",
-        "symfony/form": "4.*",
-        "symfony/intl": "4.*",
-        "symfony/mime": "^4 || ^5",
+        "spomky-labs/base64url": "^2.0",
+        "symfony/asset": "^4.4",
+        "symfony/browser-kit": "^4.4",
+        "symfony/css-selector": "^4.4",
+        "symfony/expression-language": "^4.4",
+        "symfony/form": "^4.4",
+        "symfony/framework-bundle": "^4.4",
+        "symfony/intl": "^4.4",
+        "symfony/mailer": "^5.4",
+        "symfony/mime": "^5.4",
        "symfony/monolog-bundle": "^3.5",
-        "symfony/security-bundle": "4.*",
-        "symfony/serializer": "^5.2",
+        "symfony/security-bundle": "^4.4",
+        "symfony/serializer": "^5.3",
        "symfony/swiftmailer-bundle": "^3.5",
-        "symfony/templating": "4.*",
-        "symfony/translation": "4.*",
+        "symfony/templating": "^4.4",
+        "symfony/translation": "^4.4",
        "symfony/twig-bundle": "^4.4",
-        "symfony/validator": "4.*",
+        "symfony/validator": "^4.4",
        "symfony/webpack-encore-bundle": "^1.11",
-        "symfony/workflow": "4.*",
-        "symfony/yaml": "4.*",
-        "twig/extra-bundle": "^2.12 || ^3.0",
+        "symfony/workflow": "^4.4",
+        "symfony/yaml": "^4.4",
+        "twig/extra-bundle": "^3.0",
        "twig/intl-extra": "^3.0",
        "twig/markdown-extra": "^3.3",
-        "twig/twig": "^2.12 || ^3.0"
+        "twig/string-extra": "^3.3",
+        "twig/twig": "^3.0"
+    },
+    "require-dev": {
+        "doctrine/doctrine-fixtures-bundle": "^3.3",
+        "drupol/php-conventions": "^5",
+        "fakerphp/faker": "^1.13",
+        "nelmio/alice": "^3.8",
+        "phpspec/prophecy-phpunit": "^2.0",
+        "phpstan/phpstan-strict-rules": "^1.0",
+        "phpunit/phpunit": ">= 7.5",
+        "symfony/debug-bundle": "^5.1",
+        "symfony/dotenv": "^4.4",
+        "symfony/maker-bundle": "^1.20",
+        "symfony/phpunit-bridge": "^4.4",
+        "symfony/stopwatch": "^4.4",
+        "symfony/var-dumper": "^4.4",
+        "symfony/web-profiler-bundle": "^4.4"
    },
    "conflict": {
        "symfony/symfony": "*"
    },
-    "require-dev": {
-        "doctrine/doctrine-fixtures-bundle": "^3.3",
-        "fakerphp/faker": "^1.13",
-        "nelmio/alice": "^3.8",
-        "phpstan/extension-installer": "^1.1",
-        "phpstan/phpstan": "^1.0",
-        "phpstan/phpstan-strict-rules": "^1.0",
-        "phpunit/phpunit": "^7.0",
-        "symfony/debug-bundle": "^5.1",
-        "symfony/dotenv": "^5.1",
-        "symfony/maker-bundle": "^1.20",
-        "symfony/phpunit-bridge": "^5.2",
-        "symfony/stopwatch": "^5.1",
-        "symfony/var-dumper": "4.*",
-        "symfony/web-profiler-bundle": "^5.0"
-    },
-    "config": {
-        "bin-dir": "bin",
-        "vendor-dir": "tests/app/vendor"
-    },
    "autoload": {
        "psr-4": {
            "Chill\\ActivityBundle\\": "src/Bundle/ChillActivityBundle",
+            "Chill\\AsideActivityBundle\\": "src/Bundle/ChillAsideActivityBundle/src",
            "Chill\\BudgetBundle\\": "src/Bundle/ChillBudgetBundle",
+            "Chill\\CalendarBundle\\": "src/Bundle/ChillCalendarBundle",
            "Chill\\CustomFieldsBundle\\": "src/Bundle/ChillCustomFieldsBundle",
+            "Chill\\DocGeneratorBundle\\": "src/Bundle/ChillDocGeneratorBundle",
            "Chill\\DocStoreBundle\\": "src/Bundle/ChillDocStoreBundle",
            "Chill\\EventBundle\\": "src/Bundle/ChillEventBundle",
            "Chill\\FamilyMemberBundle\\": "src/Bundle/ChillFamilyMemberBundle",
@@ -83,9 +87,6 @@
            "Chill\\ReportBundle\\": "src/Bundle/ChillReportBundle",
            "Chill\\TaskBundle\\": "src/Bundle/ChillTaskBundle",
            "Chill\\ThirdPartyBundle\\": "src/Bundle/ChillThirdPartyBundle",
-            "Chill\\AsideActivityBundle\\": "src/Bundle/ChillAsideActivityBundle/src",
-            "Chill\\DocGeneratorBundle\\": "src/Bundle/ChillDocGeneratorBundle",
-            "Chill\\CalendarBundle\\": "src/Bundle/ChillCalendarBundle",
            "Chill\\WopiBundle\\": "src/Bundle/ChillWopiBundle/src"
        }
    },
@@ -95,12 +96,23 @@
            "Chill\\DocGeneratorBundle\\Tests\\": "src/Bundle/ChillDocGeneratorBundle/tests"
        }
    },
-    "minimum-stability": "dev",
-    "prefer-stable": true,
+    "config": {
+        "allow-plugins": {
+            "composer/package-versions-deprecated": true,
+            "ergebnis/composer-normalize": true,
+            "ocramius/package-versions": true,
+            "phpro/grumphp": true,
+            "phpstan/extension-installer": true
+        },
+        "bin-dir": "bin",
+        "optimize-autoloader": true,
+        "sort-packages": true,
+        "vendor-dir": "tests/app/vendor"
+    },
    "scripts": {
        "auto-scripts": {
-            "cache:clear": "symfony-cmd",
-            "assets:install %PUBLIC_DIR%": "symfony-cmd"
+            "assets:install %PUBLIC_DIR%": "symfony-cmd",
+            "cache:clear": "symfony-cmd"
        }
    }
 }
--- a/docs/source/_static/code/exports/BirthdateFilter.php
+++ b/docs/source/_static/code/exports/BirthdateFilter.php
@@ -1,19 +1,24 @@
 <?php

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

+use Chill\MainBundle\Export\ExportElementValidatedInterface;
 use Chill\MainBundle\Export\FilterInterface;
+use DateTime;
+use Doctrine\ORM\Query\Expr;
 use Symfony\Component\Form\Extension\Core\Type\DateType;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
-use Symfony\Component\Validator\Constraints;
-use Symfony\Component\Form\FormEvent;
-use Symfony\Component\Form\FormEvents;
-use Doctrine\ORM\Query\Expr;
-use Chill\MainBundle\Form\Type\Export\FilterType;
-use Symfony\Component\Form\FormError;
-use Chill\MainBundle\Export\ExportElementValidatedInterface;

-class BirthdateFilter implements FilterInterface, ExportElementValidatedInterface
+class BirthdateFilter implements ExportElementValidatedInterface, FilterInterface
 {
    // add specific role for this filter
    public function addRole()
@@ -22,78 +27,16 @@ class BirthdateFilter implements FilterInterface, ExportElementValidatedInterfac
        return null;
    }

-    // we give information on which type of export this filter applies
-    public function applyOn()
-    {
-        return 'person';
-    }
-
-    public function getTitle()
-    {
-        return 'Filter by person\'s birthdate';
-    }
-
-    // we build a form to collect some parameters from the users
-    public function buildForm(\Symfony\Component\Form\FormBuilderInterface $builder)
-    {
-        $builder->add('date_from', DateType::class, array(
-            'label' => "Born after this date",
-            'data'  => new \DateTime(),
-            'attr'  => array('class' => 'datepicker'),
-            'widget'=> 'single_text',
-            'format' => 'dd-MM-yyyy',
-        ));
-        
-        $builder->add('date_to', DateType::class, array(
-            'label' => "Born before this date",
-            'data'  => new \DateTime(),
-            'attr'  => array('class' => 'datepicker'),
-            'widget'=> 'single_text',
-            'format' => 'dd-MM-yyyy',
-        ));
-        
-    }
-   
-    // the form created above must be validated. The process of validation
-    // is executed here. This function is added by the interface 
-    // `ExportElementValidatedInterface`, and can be ignore if there is 
-    // no need for a validation
-    public function validateForm($data, ExecutionContextInterface $context)
-    { 
-        $date_from = $data['date_from'];
-        $date_to   = $data['date_to'];
-        
-        if ($date_from === null) {
-            $context->buildViolation('The "date from" should not be empty')
-                //->atPath('date_from')
-                ->addViolation();
-        }
-        
-        if ($date_to === null) {
-            $context->buildViolation('The "date to" should not be empty')
-                //->atPath('date_to')
-                ->addViolation();
-        }
-        
-        if (
-            ($date_from !== null && $date_to !== null)
-            &&
-            $date_from >= $date_to
-        ) {
-            $context->buildViolation('The date "date to" should be after the '
-                . 'date given in "date from" field')
-                ->addViolation();
-        }
-    }
-
-
    // here, we alter the query created by Export
    public function alterQuery(\Doctrine\ORM\QueryBuilder $qb, $data)
    {
        $where = $qb->getDQLPart('where');
        // we create the clause here
-        $clause = $qb->expr()->between('person.birthdate', ':date_from', 
-            ':date_to');
+        $clause = $qb->expr()->between(
+            'person.birthdate',
+            ':date_from',
+            ':date_to'
+        );

        // we have to take care **not to** remove previous clauses...
        if ($where instanceof Expr\Andx) {
@@ -108,16 +51,76 @@ class BirthdateFilter implements FilterInterface, ExportElementValidatedInterfac
        $qb->setParameter('date_to', $data['date_to']);
    }

+    // we give information on which type of export this filter applies
+    public function applyOn()
+    {
+        return 'person';
+    }
+
+    // we build a form to collect some parameters from the users
+    public function buildForm(\Symfony\Component\Form\FormBuilderInterface $builder)
+    {
+        $builder->add('date_from', DateType::class, [
+            'label' => 'Born after this date',
+            'data' => new DateTime(),
+            'attr' => ['class' => 'datepicker'],
+            'widget' => 'single_text',
+            'format' => 'dd-MM-yyyy',
+        ]);
+
+        $builder->add('date_to', DateType::class, [
+            'label' => 'Born before this date',
+            'data' => new DateTime(),
+            'attr' => ['class' => 'datepicker'],
+            'widget' => 'single_text',
+            'format' => 'dd-MM-yyyy',
+        ]);
+    }
+
    // here, we create a simple string which will describe the action of
    // the filter in the Response
    public function describeAction($data, $format = 'string')
    {
-        return array('Filtered by person\'s birtdate: '
-            . 'between %date_from% and %date_to%', array(
+        return ['Filtered by person\'s birtdate: '
+            . 'between %date_from% and %date_to%', [
                '%date_from%' => $data['date_from']->format('d-m-Y'),
-                '%date_to%'   => $data['date_to']->format('d-m-Y')
-            ));
+                '%date_to%' => $data['date_to']->format('d-m-Y'),
+            ], ];
    }

+    public function getTitle()
+    {
+        return 'Filter by person\'s birthdate';
+    }

+    // the form created above must be validated. The process of validation
+    // is executed here. This function is added by the interface
+    // `ExportElementValidatedInterface`, and can be ignore if there is
+    // no need for a validation
+    public function validateForm($data, ExecutionContextInterface $context)
+    {
+        $date_from = $data['date_from'];
+        $date_to = $data['date_to'];
+
+        if (null === $date_from) {
+            $context->buildViolation('The "date from" should not be empty')
+                //->atPath('date_from')
+                ->addViolation();
+        }
+
+        if (null === $date_to) {
+            $context->buildViolation('The "date to" should not be empty')
+                //->atPath('date_to')
+                ->addViolation();
+        }
+
+        if (
+            (null !== $date_from && null !== $date_to)
+            && $date_from >= $date_to
+        ) {
+            $context->buildViolation('The date "date to" should be after the '
+                . 'date given in "date from" field')
+                ->addViolation();
+        }
+    }
 }
--- a/docs/source/_static/code/exports/CountPerson.php
+++ b/docs/source/_static/code/exports/CountPerson.php
@@ -1,62 +1,99 @@
 <?php

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

 namespace Chill\PersonBundle\Export\Export;

 use Chill\MainBundle\Export\ExportInterface;
-use Doctrine\ORM\QueryBuilder;
-use Symfony\Component\Form\FormBuilderInterface;
-use Doctrine\ORM\Query;
-use Chill\PersonBundle\Security\Authorization\PersonVoter;
-use Symfony\Component\Security\Core\Role\Role;
-use Chill\PersonBundle\Export\Declarations;
 use Chill\MainBundle\Export\FormatterInterface;
+use Chill\PersonBundle\Export\Declarations;
+use Chill\PersonBundle\Security\Authorization\PersonVoter;
 use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\Query;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\Security\Core\Role\Role;

-/**
- * 
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- */
 class CountPerson implements ExportInterface
 {
    /**
-     *
     * @var EntityManagerInterface
     */
    protected $entityManager;

    public function __construct(
        EntityManagerInterface $em
-            )
-    {
+    ) {
        $this->entityManager = $em;
    }

+    public function buildForm(FormBuilderInterface $builder)
+    {
+        // this export does not add any form
+    }
+
+    public function getAllowedFormattersTypes()
+    {
+        return [FormatterInterface::TYPE_TABULAR];
+    }
+
+    public function getDescription()
+    {
+        return 'Count peoples by various parameters.';
+    }
+
+    public function getLabels($key, array $values, $data)
+    {
+        // the Closure which will be executed by the formatter.
+        return function ($value) {
+            switch ($value) {
+                case '_header':
+                    // we have to process specifically the '_header' string,
+                    // which will be used by the formatter to show a column title
+                    return $this->getTitle();
+
+                default:
+                    // for all value, we do not process them and return them
+                    // immediatly
+                    return $value;
+            }
+        };
+    }
+
+    public function getQueryKeys($data)
+    {
+        // this array match the result keys in the query. We have only
+        // one column.
+        return ['export_result'];
+    }
+
+    public function getResult($qb, $data)
+    {
+        return $qb->getQuery()->getResult(Query::HYDRATE_SCALAR);
+    }
+
+    public function getTitle()
+    {
+        return 'Count peoples';
+    }
+
    public function getType()
    {
        return Declarations::PERSON_TYPE;
    }

-    public function getDescription()
-    {
-        return "Count peoples by various parameters.";
-    }
-    
-    public function getTitle()
-    {
-        return "Count peoples";
-    }
-    
-    public function requiredRole()
-    {
-        return new Role(PersonVoter::STATS);
-    }
-    
-    public function initiateQuery(array $requiredModifiers,  array $acl, array $data = array())
+    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
    {
        // we gather all center the user choose.
-        $centers = array_map(function($el) { return $el['center']; }, $acl);
+        $centers = array_map(static function ($el) {
+            return $el['center'];
+        }, $acl);

        $qb = $this->entityManager->createQueryBuilder();

@@ -65,54 +102,18 @@ class CountPerson implements ExportInterface
            ->join('person.center', 'center')
            ->andWhere('center IN (:authorized_centers)')
            ->setParameter('authorized_centers', $centers);
-                ;
-        

        return $qb;
    }

-    public function getResult($qb, $data)
+    public function requiredRole()
    {
-        return $qb->getQuery()->getResult(Query::HYDRATE_SCALAR);
-    }
-    
-    public function getQueryKeys($data)
-    {
-        // this array match the result keys in the query. We have only
-        // one column.
-        return array('export_result');
-    }
-    
-    public function getLabels($key, array $values, $data)
-    {
-        
-        // the Closure which will be executed by the formatter. 
-        return function($value) {
-            switch($value) {
-                case '_header':
-                  // we have to process specifically the '_header' string, 
-                  // which will be used by the formatter to show a column title
-                  return $this->getTitle();
-                default:
-                  // for all value, we do not process them and return them
-                  // immediatly
-                  return $value;
-        };
-    }
-    
-    public function getAllowedFormattersTypes()
-    {
-        return array(FormatterInterface::TYPE_TABULAR);
-    }
-    
-    public function buildForm(FormBuilderInterface $builder) {
-        // this export does not add any form
+        return new Role(PersonVoter::STATS);
    }

    public function supportsModifiers()
    {
        // explain the export manager which formatters and filters are allowed
-        return array(Declarations::PERSON_TYPE, Declarations::PERSON_IMPLIED_IN);
+        return [Declarations::PERSON_TYPE, Declarations::PERSON_IMPLIED_IN];
    }
-    
 }
--- a/docs/source/development/pagination/example.php
+++ b/docs/source/development/pagination/example.php
@@ -1,19 +1,26 @@
 <?php

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

 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
-use Symfony\Component\HttpFoundation\Request;
-
-
-class ItemController extends Controller {

+class example extends Controller
+{
    public function yourAction()
    {
        $em = $this->getDoctrine()->getManager();
        // first, get the number of total item are available
        $total = $em
-             ->createQuery("SELECT COUNT (item.id) FROM ChillMyBundle:Item item")
+            ->createQuery('SELECT COUNT (item.id) FROM ChillMyBundle:Item item')
            ->getSingleScalarResult();

        // get the PaginatorFactory
@@ -25,18 +32,18 @@ class ItemController extends Controller {

        // launch your query on item. Limit the query to the results
        // for the current page using the paginator
-        $items = $em->createQuery("SELECT item FROM ChillMyBundle:Item item WHERE <your clause>")
+        $items = $em->createQuery('SELECT item FROM ChillMyBundle:Item item WHERE <your clause>')
            // use the paginator to get the first item number
            ->setFirstResult($paginator->getCurrentPage()->getFirstItemNumber())
            // use the paginator to get the number of items to display
            ->setMaxResults($paginator->getItemsPerPage());

-        return $this->render('ChillMyBundle:Item:list.html.twig', array(
+        return $this->render(
+            'ChillMyBundle:Item:list.html.twig',
+            [
                'items' => $items,
-                'paginator' => $paginator
+                'paginator' => $paginator,
+            ]
        );
-            
    }
-
 }
-
--- a/docs/source/development/useful-snippets/controller-secured-for-person.php
+++ b/docs/source/development/useful-snippets/controller-secured-for-person.php
@@ -1,33 +1,43 @@
 <?php

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

 use Chill\HealthBundle\Security\Authorization\ConsultationVoter;
-use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Chill\PersonBundle\Security\Authorization\PersonVoter;
+use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Symfony\Component\Security\Core\Role\Role;

 class ConsultationController extends Controller
 {
    /**
-     * 
     * @param int $id personId
-     * @return \Symfony\Component\HttpFoundation\Response
+     *
     * @throws type
+     *
+     * @return \Symfony\Component\HttpFoundation\Response
     */
    public function listAction($id)
    {
-        /* @var $person \Chill\PersonBundle\Entity\Person */
+        /** @var \Chill\PersonBundle\Entity\Person $person */
        $person = $this->get('chill.person.repository.person')
            ->find($id);

-        if ($person === null) {
-            throw $this->createNotFoundException("The person is not found");
+        if (null === $person) {
+            throw $this->createNotFoundException('The person is not found');
        }

        $this->denyAccessUnlessGranted(PersonVoter::SEE, $person);

-        /* @var $authorizationHelper \Chill\MainBundle\Security\Authorization\AuthorizationHelper */
+        /** @var \Chill\MainBundle\Security\Authorization\AuthorizationHelper $authorizationHelper */
        $authorizationHelper = $this->get('chill.main.security.'
            . 'authorization.helper');

@@ -46,10 +56,9 @@ class ConsultationController extends Controller
            ->setParameter('circles', $circles)
            ->getResult();

-        return $this->render('ChillHealthBundle:Consultation:list.html.twig', array(
+        return $this->render('ChillHealthBundle:Consultation:list.html.twig', [
            'person' => $person,
-                'consultations' => $consultations
-            ));    
+            'consultations' => $consultations,
+        ]);
    }
 }
-
--- a/docs/source/development/user-interface/widgets/ChillMainConfiguration.php
+++ b/docs/source/development/user-interface/widgets/ChillMainConfiguration.php
@@ -1,40 +1,43 @@
 <?php
-   # Chill\MainBundle\DependencyInjection\Configuration.php

-   namespace Chill\MainBundle\DependencyInjection;
-
-   use Symfony\Component\Config\Definition\Builder\TreeBuilder;
-   use Symfony\Component\Config\Definition\ConfigurationInterface;
-   use Chill\MainBundle\DependencyInjection\Widget\AddWidgetConfigurationTrait;
-   use Symfony\Component\DependencyInjection\ContainerBuilder;
-
-   /**
-    * Configure the main bundle
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
 */
-   class Configuration implements ConfigurationInterface
-   {

+declare(strict_types=1);
+
+namespace Chill\MainBundle\DependencyInjection;
+
+use Chill\MainBundle\DependencyInjection\Widget\AddWidgetConfigurationTrait;
+use Symfony\Component\Config\Definition\Builder\TreeBuilder;
+use Symfony\Component\Config\Definition\ConfigurationInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+/**
+ * Configure the main bundle.
+ */
+class ChillMainConfiguration implements ConfigurationInterface
+{
    use AddWidgetConfigurationTrait;

    /**
-	*
     * @var ContainerBuilder
     */
    private $containerBuilder;

-       
-       public function __construct(array $widgetFactories = array(), 
-	       ContainerBuilder $containerBuilder)
-       {
+    public function __construct(
+        array $widgetFactories,
+        ContainerBuilder $containerBuilder
+    ) {
        // we register here widget factories (see below)
        $this->setWidgetFactories($widgetFactories);
        // we will need the container builder later...
        $this->containerBuilder = $containerBuilder;
    }

-       /**
-	* {@inheritDoc}
-	*/
    public function getConfigTreeBuilder()
    {
        $treeBuilder = new TreeBuilder();
@@ -44,7 +47,6 @@
            ->children()

                // ...
-
            ->arrayNode('widgets')
            ->canBeDisabled()
            ->children()
@@ -54,11 +56,8 @@
            ->end() // end of widgets
            ->end() // end of root/children
            ->end() // end of root
-	   ;
-
+;

        return $treeBuilder;
    }
-   }
-
-
+}
--- a/docs/source/development/user-interface/widgets/ChillMainExtension.php
+++ b/docs/source/development/user-interface/widgets/ChillMainExtension.php
@@ -1,16 +1,19 @@
 <?php

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

 namespace Chill\MainBundle\DependencyInjection;

-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\Config\FileLocator;
-use Symfony\Component\HttpKernel\DependencyInjection\Extension;
-use Symfony\Component\DependencyInjection\Loader;
-use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
 use Chill\MainBundle\DependencyInjection\Widget\Factory\WidgetFactoryInterface;
-use Chill\MainBundle\DependencyInjection\Configuration;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\HttpKernel\DependencyInjection\Extension;

 /**
 * This class load config for chillMainExtension.
@@ -18,19 +21,23 @@ use Chill\MainBundle\DependencyInjection\Configuration;
 class ChillMainExtension extends Extension implements Widget\HasWidgetFactoriesExtensionInterface
 {
    /**
-     * widget factory
+     * widget factory.
     *
     * @var WidgetFactoryInterface[]
     */
-    protected $widgetFactories = array();
+    protected $widgetFactories = [];

    public function addWidgetFactory(WidgetFactoryInterface $factory)
    {
        $this->widgetFactories[] = $factory;
    }

+    public function getConfiguration(array $config, ContainerBuilder $container)
+    {
+        return new Configuration($this->widgetFactories, $container);
+    }
+
    /**
-     * 
     * @return WidgetFactoryInterface[]
     */
    public function getWidgetFactories()
@@ -45,15 +52,11 @@ class ChillMainExtension extends Extension implements Widget\HasWidgetFactoriesE
        $config = $this->processConfiguration($configuration, $configs);

        // add the key 'widget' without the key 'enable'
-        $container->setParameter('chill_main.widgets', 
-            array('homepage' => $config['widgets']['homepage']));
+        $container->setParameter(
+            'chill_main.widgets',
+            ['homepage' => $config['widgets']['homepage']]
+        );

        // ...
    }
-    
-    public function getConfiguration(array $config, ContainerBuilder $container)
-    {
-        return new Configuration($this->widgetFactories, $container);
-    }
-    
 }
--- a/docs/source/development/user-interface/widgets/ChillPersonAddAPersonListWidgetFactory.php
+++ b/docs/source/development/user-interface/widgets/ChillPersonAddAPersonListWidgetFactory.php
@@ -1,17 +1,24 @@
 <?php

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

 namespace Chill\PersonBundle\Widget;

 use Chill\MainBundle\DependencyInjection\Widget\Factory\AbstractWidgetFactory;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\Config\Definition\Builder\NodeBuilder;
+use Symfony\Component\DependencyInjection\ContainerBuilder;

 /**
 * add configuration for the person_list widget.
 */
-class PersonListWidgetFactory extends AbstractWidgetFactory
+class ChillPersonAddAPersonListWidgetFactory extends AbstractWidgetFactory
 {
    /*
     * append the option to the configuration
@@ -29,27 +36,16 @@ class PersonListWidgetFactory extends AbstractWidgetFactory
        $node->scalarNode('filtering_class')
            ->defaultNull()
            ->end();
-            
    }

-   /*
-    * return an array with the allowed places where the widget can be rendered
+    /**
+     * return an array with the allowed places where the widget can be rendered.
     *
     * @return string[]
     */
    public function getAllowedPlaces()
    {
-        return array('homepage');
-    }
-    
-   /* 
-    * return the widget alias
-    *
-    * @return string
-    */
-    public function getWidgetAlias()
-    {
-        return 'person_list';
+        return ['homepage'];
    }

    /*
@@ -65,5 +61,13 @@ class PersonListWidgetFactory extends AbstractWidgetFactory
        return 'chill_person.widget.person_list';
    }

+    /**
+     * return the widget alias.
+     *
+     * @return string
+     */
+    public function getWidgetAlias()
+    {
+        return 'person_list';
+    }
 }
-
--- a/docs/source/development/user-interface/widgets/ChillPersonAddAPersonWidget.php
+++ b/docs/source/development/user-interface/widgets/ChillPersonAddAPersonWidget.php
@@ -1,56 +1,63 @@
 <?php
-# Chill/PersonBundle/Widget/PersonListWidget.php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);

 namespace Chill\PersonBundle\Widget;

+use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
 use Chill\MainBundle\Templating\Widget\WidgetInterface;
+use Chill\PersonBundle\Security\Authorization\PersonVoter;
+use DateTime;
+use Doctrine\DBAL\Types\Type;
+use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\Query\Expr;
-use Doctrine\DBAL\Types\Type;
-use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
-use Symfony\Component\Security\Core\User\UserInterface;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorage;
-use Chill\PersonBundle\Security\Authorization\PersonVoter;
 use Symfony\Component\Security\Core\Role\Role;
-use Doctrine\ORM\EntityManager;
+use Symfony\Component\Security\Core\User\UserInterface;
+use Twig_Environment;

 /**
 * add a widget with person list.
 *
 * The configuration is defined by `PersonListWidgetFactory`
 */
-class PersonListWidget implements WidgetInterface
+class ChillPersonAddAPersonWidget implements WidgetInterface
 {
-    
    /**
-     * Repository for persons
-     * 
-     * @var EntityRepository
-     */
-    protected $personRepository;
-    
-    /**
-     * The entity manager
-     *
-     * @var EntityManager
-     */
-    protected $entityManager;
-    
-    /**
-     * the authorization helper
+     * the authorization helper.
     *
     * @var AuthorizationHelper;
     */
    protected $authorizationHelper;

    /**
+     * The entity manager.
     *
+     * @var EntityManager
+     */
+    protected $entityManager;
+
+    /**
+     * Repository for persons.
+     *
+     * @var EntityRepository
+     */
+    protected $personRepository;
+
+    /**
     * @var TokenStorage
     */
    protected $tokenStorage;

    /**
-     *
     * @var UserInterface
     */
    protected $user;
@@ -68,13 +75,11 @@ class PersonListWidget implements WidgetInterface
    }

    /**
-     * 
     * @param type $place
-     * @param array $context
-     * @param array $config
+     *
     * @return string
     */
-    public function render(\Twig_Environment $env, $place, array $context, array $config)
+    public function render(Twig_Environment $env, $place, array $context, array $config)
    {
        $qb = $this->personRepository
            ->createQueryBuilder('person');
@@ -86,9 +91,8 @@ class PersonListWidget implements WidgetInterface
        $and->add($qb->expr()->in('person.center', ':centers'));
        $qb->setParameter('centers', $centers);

-
        // add the "only active" where clause
-        if ($config['only_active'] === true) {
+        if (true === $config['only_active']) {
            $qb->join('person.accompanyingPeriods', 'ap');
            $or = new Expr\Orx();
            // add the case where closingDate IS NULL
@@ -101,7 +105,7 @@ class PersonListWidget implements WidgetInterface
                (new Expr())->between(':now', 'ap.openingDate', 'ap.closingDate')
            );
            $and->add($or);
-            $qb->setParameter('now', new \DateTime(), Type::DATE);
+            $qb->setParameter('now', new DateTime(), Type::DATE);
        }

        // adding the where clause to the query
@@ -113,17 +117,15 @@ class PersonListWidget implements WidgetInterface

        return $env->render(
            'ChillPersonBundle:Widget:homepage_person_list.html.twig',
-            array('persons' => $persons)
+            ['persons' => $persons]
        );
    }

    /**
-     * 
     * @return UserInterface
     */
    private function getUser()
    {
        // return a user
    }
-
 }
--- a/docs/source/development/user-interface/widgets/ChillPersonExtension.php
+++ b/docs/source/development/user-interface/widgets/ChillPersonExtension.php
@@ -1,51 +1,48 @@
 <?php

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

 namespace Chill\PersonBundle\DependencyInjection;

 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\Config\FileLocator;
-use Symfony\Component\HttpKernel\DependencyInjection\Extension;
-use Symfony\Component\DependencyInjection\Loader;
 use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
-use Chill\MainBundle\DependencyInjection\MissingBundleException;
-use Chill\PersonBundle\Security\Authorization\PersonVoter;
+use Symfony\Component\HttpKernel\DependencyInjection\Extension;

 /**
- * This is the class that loads and manages your bundle configuration
+ * This is the class that loads and manages your bundle configuration.
 *
 * To learn more see {@link http://symfony.com/doc/current/cookbook/bundles/extension.html}
 */
 class ChillPersonExtension extends Extension implements PrependExtensionInterface
 {
-    /**
-     * {@inheritDoc}
-     */
    public function load(array $configs, ContainerBuilder $container)
    {
        // ...
    }

-    
    /**
-     * 
-     * Add a widget "add a person" on the homepage, automatically
+     * Add a widget "add a person" on the homepage, automatically.
     *
     * @param \Chill\PersonBundle\DependencyInjection\containerBuilder $container
     */
    public function prepend(ContainerBuilder $container)
    {
-        $container->prependExtensionConfig('chill_main', array(
-            'widgets' => array(
-                'homepage' => array(
-                    array(
+        $container->prependExtensionConfig('chill_main', [
+            'widgets' => [
+                'homepage' => [
+                    [
                        'widget_alias' => 'add_person',
-                        'order' => 2
-                    )
-                )
-            )
-        ));
+                        'order' => 2,
+                    ],
+                ],
+            ],
+        ]);
    }
 }
-
--- a/grumphp.yml
+++ b/grumphp.yml
@@ -0,0 +1,39 @@
+imports:
+    - {
+          resource: tests/app/vendor/drupol/php-conventions/config/php73/grumphp.yml,
+      }
+
+parameters:
+    tasks.phpcsfixer.config: .php_cs.dist.php
+    tasks.license.name: AGPL-3.0
+    tasks.license.holder: Champs-Libres
+    tasks.license.date_from: 2001
+
+    tasks.phpcsfixer.allow_risky: true
+    tasks.phpcsfixer.diff: true
+    tasks.phpstan.level: 1
+    tasks.phpstan.blocking: true
+    tasks.phpstan.ignore_patterns:
+        - "/.github/"
+        - "/.idea/"
+        - "/build/"
+        - "/benchmarks/"
+        - "/docs/"
+        - "/node_modules/"
+        - "/resource/"
+        - "/spec/"
+        - "/var/"
+        - "/vendor/"
+
+    # Psalm
+    tasks.psalm.blocking: true
+    tasks.psalm.ignore_patterns:
+        - "/.github/"
+        - "/.idea/"
+        - "/build/"
+        - "/benchmarks/"
+        - "/node_modules/"
+        - "/resource/"
+        - "/spec/"
+        - "/var/"
+        - "/vendor/"
--- a/package.json.txt
+++ b/package.json.txt
@@ -1,3 +0,0 @@
-add npm/yarn dependency in package.json :
-
-"select2-bootstrap-theme": "0.1.0-beta.10",
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -10,16 +10,6 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldsGroupController.php

-		-
-			message: "#^Instantiated class PhpOffice\\\\PhpWord\\\\TemplateProcessor not found\\.$#"
-			count: 1
-			path: src/Bundle/ChillDocGeneratorBundle/Controller/DocGeneratorController.php
-
-		-
-			message: "#^Instantiated class PhpOffice\\\\PhpWord\\\\TemplateProcessor not found\\.$#"
-			count: 1
-			path: src/Bundle/ChillDocGeneratorBundle/Controller/DocGeneratorTemplateController.php
-
 		-
 			message: "#^Variable \\$participation might not be defined\\.$#"
 			count: 3
@@ -90,11 +80,6 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillPersonBundle/Form/ChoiceLoader/PersonChoiceLoader.php

-		-
-			message: "#^Foreach overwrites \\$action with its value variable\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkRepository.php
-
 		-
 			message: "#^Foreach overwrites \\$action with its value variable\\.$#"
 			count: 1
--- a/phpstan-critical.neon
+++ b/phpstan-critical.neon
@@ -30,36 +30,6 @@ parameters:
            count: 2
            path: src/Bundle/ChillPersonBundle/Household/MembersEditorFactory.php

-        -
-            message: "#^Parameter \\$action of method Chill\\\\PersonBundle\\\\Repository\\\\AccompanyingPeriod\\\\AccompanyingPeriodWorkRepository\\:\\:buildQueryBySocialActionWithDescendants\\(\\) has invalid type Chill\\\\PersonBundle\\\\Repository\\\\AccompanyingPeriod\\\\SocialAction\\.$#"
-            count: 1
-            path: src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkRepository.php
-
-        -
-            message: "#^Parameter \\$action of method Chill\\\\PersonBundle\\\\Repository\\\\AccompanyingPeriod\\\\AccompanyingPeriodWorkRepository\\:\\:countBySocialActionWithDescendants\\(\\) has invalid type Chill\\\\PersonBundle\\\\Repository\\\\AccompanyingPeriod\\\\SocialAction\\.$#"
-            count: 1
-            path: src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkRepository.php
-
-        -
-            message: "#^Undefined variable\\: \\$action$#"
-            count: 1
-            path: src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkRepository.php
-
-        -
-            message: "#^Undefined variable\\: \\$limit$#"
-            count: 1
-            path: src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkRepository.php
-
-        -
-            message: "#^Undefined variable\\: \\$offset$#"
-            count: 1
-            path: src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkRepository.php
-
-        -
-            message: "#^Undefined variable\\: \\$orderBy$#"
-            count: 1
-            path: src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkRepository.php
-
        -
            message: "#^Variable variables are not allowed\\.$#"
            count: 4
@@ -70,11 +40,6 @@ parameters:
            count: 1
            path: src/Bundle/ChillPersonBundle/Serializer/Normalizer/MembersEditorNormalizer.php

-        -
-            message: "#^Undefined variable\\: \\$value$#"
-            count: 1
-            path: src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/LocationValidityValidator.php
-
        -
            message: "#^Undefined variable\\: \\$choiceSlug$#"
            count: 1
--- a/phpstan-deprecations.neon
+++ b/phpstan-deprecations.neon
--- a/phpstan-types.neon
+++ b/phpstan-types.neon
@@ -1,15 +1,5 @@
 parameters:
 	ignoreErrors:
-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 1
-			path: src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivitytACL.php
-
-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 1
-			path: src/Bundle/ChillActivityBundle/Entity/Activity.php
-
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
 			count: 1
@@ -20,11 +10,6 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillActivityBundle/Entity/ActivityReasonCategory.php

-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 1
-			path: src/Bundle/ChillActivityBundle/Export/Export/ListActivity.php
-
 		-
 			message: "#^Method Chill\\\\ActivityBundle\\\\Export\\\\Export\\\\StatActivityDuration\\:\\:getDescription\\(\\) should return string but return statement is missing\\.$#"
 			count: 1
@@ -35,11 +20,6 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillActivityBundle/Export/Export/StatActivityDuration.php

-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 1
-			path: src/Bundle/ChillActivityBundle/Form/ActivityType.php
-
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
 			count: 1
@@ -55,36 +35,6 @@ parameters:
 			count: 2
 			path: src/Bundle/ChillActivityBundle/Form/ActivityType.php

-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 1
-			path: src/Bundle/ChillActivityBundle/Menu/AdminMenuBuilder.php
-
-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 1
-			path: src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepository.php
-
-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 1
-			path: src/Bundle/ChillActivityBundle/Security/Authorization/ActivityStatsVoter.php
-
-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 2
-			path: src/Bundle/ChillActivityBundle/Timeline/TimelineActivityProvider.php
-
-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 1
-			path: src/Bundle/ChillAsideActivityBundle/src/Form/AsideActivityFormType.php
-
-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 1
-			path: src/Bundle/ChillAsideActivityBundle/src/Menu/AdminMenuBuilder.php
-
 		-
 			message: "#^Only booleans are allowed in an if condition, mixed given\\.$#"
 			count: 3
@@ -95,36 +45,16 @@ parameters:
 			count: 2
 			path: src/Bundle/ChillBudgetBundle/Form/ResourceType.php

-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 2
-			path: src/Bundle/ChillBudgetBundle/Security/Authorization/BudgetElementVoter.php
-
-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 1
-			path: src/Bundle/ChillCalendarBundle/Entity/Calendar.php
-
 		-
 			message: "#^Only booleans are allowed in an if condition, mixed given\\.$#"
 			count: 1
 			path: src/Bundle/ChillCustomFieldsBundle/Command/CreateFieldsOnGroupCommand.php

-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldsGroupController.php
-
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
 			count: 1
 			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/AbstractCustomField.php

-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 3
-			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldChoice.php
-
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
 			count: 4
@@ -190,21 +120,11 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillDocStoreBundle/Entity/DocumentCategory.php

-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 1
-			path: src/Bundle/ChillEventBundle/Entity/Participation.php
-
 		-
 			message: "#^Method Chill\\\\EventBundle\\\\Entity\\\\Participation\\:\\:offsetGet\\(\\) should return mixed but return statement is missing\\.$#"
 			count: 1
 			path: src/Bundle/ChillEventBundle/Entity/Participation.php

-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 1
-			path: src/Bundle/ChillEventBundle/Form/ChoiceLoader/EventChoiceLoader.php
-
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
 			count: 1
@@ -225,11 +145,6 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillEventBundle/Form/StatusType.php

-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 1
-			path: src/Bundle/ChillEventBundle/Form/Type/PickEventType.php
-
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
 			count: 2
@@ -240,16 +155,6 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillEventBundle/Search/EventSearch.php

-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 2
-			path: src/Bundle/ChillEventBundle/Security/Authorization/EventVoter.php
-
-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 2
-			path: src/Bundle/ChillEventBundle/Security/Authorization/ParticipationVoter.php
-
 		-
 			message: "#^Casting to string something that's already string\\.$#"
 			count: 5
@@ -260,11 +165,6 @@ parameters:
 			count: 2
 			path: src/Bundle/ChillFamilyMembersBundle/Form/FamilyMemberType.php

-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 2
-			path: src/Bundle/ChillFamilyMembersBundle/Security/Voter/FamilyMemberVoter.php
-
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
 			count: 1
@@ -285,16 +185,6 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillMainBundle/CRUD/Resolver/Resolver.php

-		-
-			message: "#^Call to function array_search\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/CRUD/Routing/CRUDRoutesLoader.php
-
-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 2
-			path: src/Bundle/ChillMainBundle/CRUD/Routing/CRUDRoutesLoader.php
-
 		-
 			message: "#^Method Chill\\\\MainBundle\\\\Command\\\\ChillImportUsersCommand\\:\\:execute\\(\\) should return int but return statement is missing\\.$#"
 			count: 1
@@ -305,11 +195,6 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillMainBundle/Command/ChillImportUsersCommand.php

-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 2
-			path: src/Bundle/ChillMainBundle/Command/ChillUserSendRenewPasswordCodeCommand.php
-
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
 			count: 1
@@ -320,11 +205,6 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillMainBundle/Command/ChillUserSendRenewPasswordCodeCommand.php

-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 2
-			path: src/Bundle/ChillMainBundle/Command/LoadAndUpdateLanguagesCommand.php
-
 		-
 			message: "#^Method Chill\\\\MainBundle\\\\Command\\\\LoadAndUpdateLanguagesCommand\\:\\:execute\\(\\) should return int but return statement is missing\\.$#"
 			count: 1
@@ -360,36 +240,6 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillMainBundle/Controller/PostalCodeController.php

-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 2
-			path: src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadLanguages.php
-
-		-
-			message: "#^Call to function array_search\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 5
-			path: src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/ExportsCompilerPass.php
-
-		-
-			message: "#^Call to function array_search\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/SearchableServicesCompilerPass.php
-
-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/DependencyInjection/Configuration.php
-
-		-
-			message: "#^Call to function array_search\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/DependencyInjection/Widget/AbstractWidgetsCompilerPass.php
-
-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/DependencyInjection/Widget/AbstractWidgetsCompilerPass.php
-
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
 			count: 1
@@ -405,21 +255,11 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillMainBundle/Entity/Embeddable/CommentEmbeddable.php

-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Entity/User.php
-
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
 			count: 1
 			path: src/Bundle/ChillMainBundle/Entity/User.php

-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 6
-			path: src/Bundle/ChillMainBundle/Export/ExportManager.php
-
 		-
 			message: "#^Only booleans are allowed in a ternary operator condition, mixed given\\.$#"
 			count: 1
@@ -450,11 +290,6 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillMainBundle/Form/Type/ChillTextareaType.php

-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Form/Type/ComposedRoleScopeType.php
-
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
 			count: 3
@@ -465,66 +300,21 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillMainBundle/Form/Type/DataTransformer/ObjectToIdTransformer.php

-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Form/Type/Export/PickCenterType.php
-
-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Form/Type/TranslatableStringFormType.php
-
-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 2
-			path: src/Bundle/ChillMainBundle/Phonenumber/PhonenumberHelper.php
-
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
 			count: 2
 			path: src/Bundle/ChillMainBundle/Phonenumber/PhonenumberHelper.php

-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Search/Entity/SearchUserApiProvider.php
-
-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 2
-			path: src/Bundle/ChillMainBundle/Security/Authorization/AbstractChillVoter.php
-
-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 2
-			path: src/Bundle/ChillMainBundle/Security/Authorization/DefaultVoterHelper.php
-
-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 2
-			path: src/Bundle/ChillMainBundle/Security/ParentRoleHelper.php
-
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
 			count: 1
 			path: src/Bundle/ChillMainBundle/Security/PasswordRecover/PasswordRecoverEvent.php

-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Security/PasswordRecover/PasswordRecoverVoter.php
-
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
 			count: 1
 			path: src/Bundle/ChillMainBundle/Security/PasswordRecover/TokenManager.php

-		-
-			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
-			count: 3
-			path: src/Bundle/ChillMainBundle/Templating/Entity/AddressRender.php
-
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
 			count: 1
@@ -535,21 +325,11 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillMainBundle/Timeline/TimelineBuilder.php

-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 2
-			path: src/Bundle/ChillMainBundle/Validation/Validator/RoleScopeScopePresence.php
-
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
 			count: 1
 			path: src/Bundle/ChillMainBundle/Validation/Validator/ValidPhonenumber.php

-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Actions/Remove/PersonMove.php
-
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
 			count: 1
@@ -575,51 +355,16 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillPersonBundle/Command/ChillPersonMoveCommand.php

-		-
-			message: "#^Call to function array_search\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 3
-			path: src/Bundle/ChillPersonBundle/Command/ImportPeopleFromCSVCommand.php
-
-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 3
-			path: src/Bundle/ChillPersonBundle/Command/ImportPeopleFromCSVCommand.php
-
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
 			count: 6
 			path: src/Bundle/ChillPersonBundle/Command/ImportPeopleFromCSVCommand.php

-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Controller/PersonController.php
-
-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/DependencyInjection/CompilerPass/AccompanyingPeriodTimelineCompilerPass.php
-
-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
-
-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Entity/Person.php
-
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
 			count: 2
 			path: src/Bundle/ChillPersonBundle/Entity/PersonPhone.php

-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 2
-			path: src/Bundle/ChillPersonBundle/Export/AbstractAccompanyingPeriodExportElement.php
-
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
 			count: 1
@@ -630,26 +375,11 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillPersonBundle/Export/Aggregator/NationalityAggregator.php

-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 3
-			path: src/Bundle/ChillPersonBundle/Export/Export/ListPerson.php
-
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
 			count: 2
 			path: src/Bundle/ChillPersonBundle/Export/Export/ListPerson.php

-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Export/Filter/GenderFilter.php
-
-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Form/ChoiceLoader/PersonChoiceLoader.php
-
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
 			count: 1
@@ -670,26 +400,6 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillPersonBundle/Form/Type/PersonPhoneType.php

-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Form/Type/PickPersonType.php
-
-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Household/MembersEditor.php
-
-		-
-			message: "#^Method Chill\\\\PersonBundle\\\\Repository\\\\AccompanyingPeriod\\\\AccompanyingPeriodWorkRepository\\:\\:buildQueryBySocialActionWithDescendants\\(\\) has invalid return type Chill\\\\PersonBundle\\\\Repository\\\\AccompanyingPeriod\\\\QueryBuilder\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkRepository.php
-
-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 2
-			path: src/Bundle/ChillPersonBundle/Repository/PersonRepository.php
-
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
 			count: 3
@@ -700,71 +410,26 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillPersonBundle/Search/PersonSearch.php

-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Search/SearchPersonApiProvider.php
-
-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkDenormalizer.php
-
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
 			count: 2
 			path: src/Bundle/ChillPersonBundle/Templating/Entity/ClosingMotiveRender.php

-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Timeline/AbstractTimelineAccompanyingPeriod.php
-
-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 1
-			path: src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadReportACL.php
-
-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 1
-			path: src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadReports.php
-
 		-
 			message: "#^Method Chill\\\\ReportBundle\\\\DataFixtures\\\\ORM\\\\LoadReports\\:\\:getRandomChoice\\(\\) should return array\\<string\\>\\|string but return statement is missing\\.$#"
 			count: 1
 			path: src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadReports.php

-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 4
-			path: src/Bundle/ChillReportBundle/Export/Export/ReportList.php
-
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
 			count: 2
 			path: src/Bundle/ChillReportBundle/Export/Export/ReportList.php

-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 1
-			path: src/Bundle/ChillReportBundle/Security/Authorization/ReportVoter.php
-
 		-
 			message: "#^Method Chill\\\\ReportBundle\\\\Security\\\\Authorization\\\\ReportVoter\\:\\:supports\\(\\) should return bool but return statement is missing\\.$#"
 			count: 1
 			path: src/Bundle/ChillReportBundle/Security/Authorization/ReportVoter.php

-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 4
-			path: src/Bundle/ChillReportBundle/Timeline/TimelineReportProvider.php
-
-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 1
-			path: src/Bundle/ChillTaskBundle/DataFixtures/ORM/LoadTaskACL.php
-
 		-
 			message: "#^Casting to string something that's already string\\.$#"
 			count: 3
@@ -790,31 +455,11 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillTaskBundle/Timeline/SingleTaskTaskLifeCycleEventTimelineProvider.php

-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 1
-			path: src/Bundle/ChillTaskBundle/Timeline/TaskLifeCycleEventTimelineProvider.php
-
 		-
 			message: "#^Method Chill\\\\TaskBundle\\\\Timeline\\\\TaskLifeCycleEventTimelineProvider\\:\\:getTransitionByName\\(\\) should return Symfony\\\\Component\\\\Workflow\\\\Transition but return statement is missing\\.$#"
 			count: 1
 			path: src/Bundle/ChillTaskBundle/Timeline/TaskLifeCycleEventTimelineProvider.php

-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 1
-			path: src/Bundle/ChillThirdPartyBundle/DependencyInjection/CompilerPass/ThirdPartyTypeCompilerPass.php
-
-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 4
-			path: src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php
-
-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 1
-			path: src/Bundle/ChillThirdPartyBundle/Form/ChoiceLoader/ThirdPartyChoiceLoader.php
-
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
 			count: 1
@@ -825,11 +470,6 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillThirdPartyBundle/Repository/ThirdPartyRepository.php

-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 1
-			path: src/Bundle/ChillThirdPartyBundle/Search/ThirdPartyApiSearch.php
-
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
 			count: 1
@@ -840,11 +480,6 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillThirdPartyBundle/Search/ThirdPartySearch.php

-		-
-			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
-			count: 1
-			path: src/Bundle/ChillThirdPartyBundle/Security/Voter/ThirdPartyVoter.php
-
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
 			count: 1
--- a/phpstan.neon.dist
+++ b/phpstan.neon.dist
@@ -3,6 +3,7 @@ parameters:
    paths:
        - src/
    excludePaths:
+        - docs/
        - src/Bundle/*/Tests/*
        - src/Bundle/*/tests/*
        - src/Bundle/*/Test/*
@@ -18,7 +19,8 @@ parameters:
        - src/Bundle/*/src/Resources/*

 includes:
-    - phpstan-types.neon
-    - phpstan-critical.neon
    - phpstan-baseline.neon
+    - phpstan-critical.neon
+    - phpstan-deprecations.neon
+    - phpstan-types.neon

--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -2,7 +2,7 @@

 <!-- https://phpunit.readthedocs.io/en/latest/configuration.html -->
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="tests/app/vendor/phpunit/phpunit/phpunit.xsd"
         backupGlobals="false"
         colors="true"
         bootstrap="tests/app/tests/bootstrap.php"
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
--- a/psalm.xml
+++ b/psalm.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<psalm
+    errorLevel="7"
+    resolveFromConfigFile="true"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns="https://getpsalm.org/schema/config"
+    xsi:schemaLocation="https://getpsalm.org/schema/config tests/app/vendor/vimeo/psalm/config.xsd"
+    errorBaseline="psalm-baseline.xml"
+>
+    <projectFiles>
+        <directory name="src" />
+        <ignoreFiles>
+            <directory name="./tests/" />
+        </ignoreFiles>
+    </projectFiles>
+</psalm>
--- a/resource/header.txt
+++ b/resource/header.txt
@@ -0,0 +1,5 @@
+Chill is a software for social workers
+
+For the full copyright and license information, please view
+the LICENSE file that was distributed with this source code.
+
--- a/src/Bundle/ChillActivityBundle/ChillActivityBundle.php
+++ b/src/Bundle/ChillActivityBundle/ChillActivityBundle.php
@@ -1,5 +1,14 @@
 <?php

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

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

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

 namespace Chill\ActivityBundle\Controller;

+use Chill\ActivityBundle\Entity\Activity;
 use Chill\ActivityBundle\Entity\ActivityReason;
+use Chill\ActivityBundle\Form\ActivityType;
 use Chill\ActivityBundle\Repository\ActivityACLAwareRepositoryInterface;
 use Chill\ActivityBundle\Repository\ActivityRepository;
 use Chill\ActivityBundle\Repository\ActivityTypeCategoryRepository;
 use Chill\ActivityBundle\Repository\ActivityTypeRepository;
 use Chill\ActivityBundle\Security\Authorization\ActivityVoter;
+use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable;
 use Chill\MainBundle\Repository\LocationRepository;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\Person;
@@ -17,45 +27,47 @@ use Chill\PersonBundle\Privacy\PrivacyEvent;
 use Chill\PersonBundle\Repository\AccompanyingPeriodRepository;
 use Chill\PersonBundle\Repository\PersonRepository;
 use Chill\ThirdPartyBundle\Repository\ThirdPartyRepository;
+use DateTime;
 use Doctrine\ORM\EntityManagerInterface;
+use InvalidArgumentException;
 use Psr\Log\LoggerInterface;
+use RuntimeException;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
+use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\HttpFoundation\Request;
-use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
-use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Security\Core\Role\Role;
-use Chill\ActivityBundle\Entity\Activity;
-use Chill\ActivityBundle\Form\ActivityType;
-use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable;
+
 use Symfony\Component\Serializer\SerializerInterface;
+use function array_key_exists;

 final class ActivityController extends AbstractController
 {
-    private EventDispatcherInterface $eventDispatcher;
-
-    private LoggerInterface $logger;
-
-    private SerializerInterface $serializer;
+    private AccompanyingPeriodRepository $accompanyingPeriodRepository;

    private ActivityACLAwareRepositoryInterface $activityACLAwareRepository;

+    private ActivityRepository $activityRepository;
+
+    private ActivityTypeCategoryRepository $activityTypeCategoryRepository;
+
    private ActivityTypeRepository $activityTypeRepository;

-    private ThirdPartyRepository $thirdPartyRepository;
-
-    private PersonRepository $personRepository;
-
-    private LocationRepository $locationRepository;
-
    private EntityManagerInterface $entityManager;

-    private ActivityRepository $activityRepository;
+    private EventDispatcherInterface $eventDispatcher;

-    private AccompanyingPeriodRepository $accompanyingPeriodRepository;
+    private LocationRepository $locationRepository;

-    private ActivityTypeCategoryRepository $activityTypeCategoryRepository;
+    private LoggerInterface $logger;
+
+    private PersonRepository $personRepository;
+
+    private SerializerInterface $serializer;
+
+    private ThirdPartyRepository $thirdPartyRepository;

    public function __construct(
        ActivityACLAwareRepositoryInterface $activityACLAwareRepository,
@@ -85,6 +97,151 @@ final class ActivityController extends AbstractController
        $this->serializer = $serializer;
    }

+    /**
+     * Deletes a Activity entity.
+     *
+     * @param mixed $id
+     */
+    public function deleteAction(Request $request, $id)
+    {
+        $view = null;
+
+        [$person, $accompanyingPeriod] = $this->getEntity($request);
+
+        $activity = $this->activityRepository->find($id);
+
+        if (!$activity) {
+            throw $this->createNotFoundException('Unable to find Activity entity.');
+        }
+
+        if ($activity->getAccompanyingPeriod() instanceof AccompanyingPeriod) {
+            $view = 'ChillActivityBundle:Activity:confirm_deleteAccompanyingCourse.html.twig';
+            $accompanyingPeriod = $activity->getAccompanyingPeriod();
+        } else {
+            $view = 'ChillActivityBundle:Activity:confirm_deletePerson.html.twig';
+        }
+
+        // TODO
+        // $this->denyAccessUnlessGranted('CHILL_ACTIVITY_DELETE', $activity);
+
+        $form = $this->createDeleteForm($activity->getId(), $person, $accompanyingPeriod);
+
+        if ($request->getMethod() === Request::METHOD_DELETE) {
+            $form->handleRequest($request);
+
+            if ($form->isValid()) {
+                $this->logger->notice('An activity has been removed', [
+                    'by_user' => $this->getUser()->getUsername(),
+                    'activity_id' => $activity->getId(),
+                    'person_id' => $activity->getPerson() ? $activity->getPerson()->getId() : null,
+                    'comment' => $activity->getComment()->getComment(),
+                    'scope_id' => $activity->getScope() ? $activity->getScope()->getId() : null,
+                    'reasons_ids' => $activity->getReasons()
+                        ->map(
+                            static fn (ActivityReason $ar): int => $ar->getId()
+                        )
+                        ->toArray(),
+                    'type_id' => $activity->getActivityType()->getId(),
+                    'duration' => $activity->getDurationTime() ? $activity->getDurationTime()->format('U') : null,
+                    'date' => $activity->getDate()->format('Y-m-d'),
+                    'attendee' => $activity->getAttendee(),
+                ]);
+
+                $this->entityManager->remove($activity);
+                $this->entityManager->flush();
+
+                $this->addFlash('success', $this->get('translator')
+                    ->trans('The activity has been successfully removed.'));
+
+                $params = $this->buildParamsToUrl($person, $accompanyingPeriod);
+
+                return $this->redirectToRoute('chill_activity_activity_list', $params);
+            }
+        }
+
+        if (null === $view) {
+            throw $this->createNotFoundException('Template not found');
+        }
+
+        return $this->render($view, [
+            'activity' => $activity,
+            'delete_form' => $form->createView(),
+            'person' => $person,
+            'accompanyingCourse' => $accompanyingPeriod,
+        ]);
+    }
+
+    /**
+     * Displays a form to edit an existing Activity entity.
+     */
+    public function editAction(int $id, Request $request): Response
+    {
+        $view = null;
+
+        [$person, $accompanyingPeriod] = $this->getEntity($request);
+
+        $entity = $this->activityRepository->find($id);
+
+        if (null === $entity) {
+            throw $this->createNotFoundException('Unable to find Activity entity.');
+        }
+
+        if ($entity->getAccompanyingPeriod() instanceof AccompanyingPeriod) {
+            $view = 'ChillActivityBundle:Activity:editAccompanyingCourse.html.twig';
+            $accompanyingPeriod = $entity->getAccompanyingPeriod();
+        } else {
+            $view = 'ChillActivityBundle:Activity:editPerson.html.twig';
+        }
+        // TODO
+        // $this->denyAccessUnlessGranted('CHILL_ACTIVITY_UPDATE', $entity);
+
+        $form = $this->createForm(ActivityType::class, $entity, [
+            'center' => $entity->getCenter(),
+            'role' => new Role('CHILL_ACTIVITY_UPDATE'),
+            'activityType' => $entity->getActivityType(),
+            'accompanyingPeriod' => $accompanyingPeriod,
+        ])->handleRequest($request);
+
+        if ($form->isSubmitted() && $form->isValid()) {
+            $this->entityManager->persist($entity);
+            $this->entityManager->flush();
+
+            $this->addFlash('success', $this->get('translator')->trans('Success : activity updated!'));
+
+            $params = $this->buildParamsToUrl($person, $accompanyingPeriod);
+            $params['id'] = $entity->getId();
+
+            return $this->redirectToRoute('chill_activity_activity_show', $params);
+        }
+
+        $deleteForm = $this->createDeleteForm($entity->getId(), $person, $accompanyingPeriod);
+
+        /*
+         * TODO
+        $event = new PrivacyEvent($person, array(
+            'element_class' => Activity::class,
+            'element_id' => $entity->getId(),
+            'action' => 'edit'
+        ));
+        $this->eventDispatcher->dispatch(PrivacyEvent::PERSON_PRIVACY_EVENT, $event);
+         */
+
+        if (null === $view) {
+            throw $this->createNotFoundException('Template not found');
+        }
+
+        $activity_array = $this->serializer->normalize($entity, 'json', ['groups' => 'read']);
+
+        return $this->render($view, [
+            'entity' => $entity,
+            'edit_form' => $form->createView(),
+            'delete_form' => $deleteForm->createView(),
+            'person' => $person,
+            'accompanyingCourse' => $accompanyingPeriod,
+            'activity_json' => $activity_array,
+        ]);
+    }
+
    /**
     * Lists all Activity entities.
     */
@@ -99,11 +256,11 @@ final class ActivityController extends AbstractController
        if ($person instanceof Person) {
            $this->denyAccessUnlessGranted(ActivityVoter::SEE, $person);
            $activities = $this->activityACLAwareRepository
-                ->findByPerson($person, ActivityVoter::SEE, 0, null);
+                ->findByPerson($person, ActivityVoter::SEE, 0, null, ['date' => 'DESC', 'id' => 'DESC']);

            $event = new PrivacyEvent($person, [
                'element_class' => Activity::class,
-                'action' => 'list'
+                'action' => 'list',
            ]);
            $this->eventDispatcher->dispatch(PrivacyEvent::PERSON_PRIVACY_EVENT, $event);

@@ -112,7 +269,7 @@ final class ActivityController extends AbstractController
            $this->denyAccessUnlessGranted(ActivityVoter::SEE, $accompanyingPeriod);

            $activities = $this->activityACLAwareRepository
-                ->findByAccompanyingPeriod($accompanyingPeriod, ActivityVoter::SEE);
+                ->findByAccompanyingPeriod($accompanyingPeriod, ActivityVoter::SEE, 0, null, ['date' => 'DESC', 'id' => 'DESC']);

            $view = 'ChillActivityBundle:Activity:listAccompanyingCourse.html.twig';
        }
@@ -127,6 +284,148 @@ final class ActivityController extends AbstractController
        );
    }

+    public function newAction(Request $request): Response
+    {
+        $view = null;
+
+        [$person, $accompanyingPeriod] = $this->getEntity($request);
+
+        if ($accompanyingPeriod instanceof AccompanyingPeriod) {
+            $view = 'ChillActivityBundle:Activity:newAccompanyingCourse.html.twig';
+        } elseif ($person instanceof Person) {
+            $view = 'ChillActivityBundle:Activity:newPerson.html.twig';
+        }
+
+        $activityType_id = $request->get('activityType_id', 0);
+        $activityType = $this->activityTypeRepository->find($activityType_id);
+
+        if (isset($activityType) && !$activityType->isActive()) {
+            throw new InvalidArgumentException('Activity type must be active');
+        }
+
+        $activityData = null;
+
+        if ($request->query->has('activityData')) {
+            $activityData = $request->query->get('activityData');
+        }
+
+        if (
+            !$activityType instanceof \Chill\ActivityBundle\Entity\ActivityType
+            || !$activityType->isActive()
+        ) {
+            $params = $this->buildParamsToUrl($person, $accompanyingPeriod);
+
+            if (null !== $activityData) {
+                $params['activityData'] = $activityData;
+            }
+
+            return $this->redirectToRoute('chill_activity_activity_select_type', $params);
+        }
+
+        $entity = new Activity();
+        $entity->setUser($this->getUser());
+
+        if ($person instanceof Person) {
+            $entity->setPerson($person);
+        }
+
+        if ($accompanyingPeriod instanceof AccompanyingPeriod) {
+            $entity->setAccompanyingPeriod($accompanyingPeriod);
+        }
+
+        $entity->setActivityType($activityType);
+        $entity->setDate(new DateTime('now'));
+
+        if ($request->query->has('activityData')) {
+            $activityData = $request->query->get('activityData');
+
+            if (array_key_exists('durationTime', $activityData)) {
+                $durationTimeInMinutes = $activityData['durationTime'];
+                $hours = floor($durationTimeInMinutes / 60);
+                $minutes = $durationTimeInMinutes % 60;
+                $duration = DateTime::createFromFormat('H:i', $hours . ':' . $minutes);
+
+                if ($duration) {
+                    $entity->setDurationTime($duration);
+                }
+            }
+
+            if (array_key_exists('date', $activityData)) {
+                $date = DateTime::createFromFormat('Y-m-d', $activityData['date']);
+
+                if ($date) {
+                    $entity->setDate($date);
+                }
+            }
+
+            if (array_key_exists('personsId', $activityData)) {
+                foreach ($activityData['personsId'] as $personId) {
+                    $concernedPerson = $this->personRepository->find($personId);
+                    $entity->addPerson($concernedPerson);
+                }
+            }
+
+            if (array_key_exists('professionalsId', $activityData)) {
+                foreach ($activityData['professionalsId'] as $professionalsId) {
+                    $professional = $this->thirdPartyRepository->find($professionalsId);
+                    $entity->addThirdParty($professional);
+                }
+            }
+
+            if (array_key_exists('location', $activityData)) {
+                $location = $this->locationRepository->find($activityData['location']);
+                $entity->setLocation($location);
+            }
+
+            if (array_key_exists('comment', $activityData)) {
+                $comment = new CommentEmbeddable();
+                $comment->setComment($activityData['comment']);
+                $comment->setUserId($this->getUser()->getid());
+                $comment->setDate(new DateTime('now'));
+                $entity->setComment($comment);
+            }
+        }
+
+        $this->denyAccessUnlessGranted(ActivityVoter::CREATE, $entity);
+
+        $form = $this->createForm(ActivityType::class, $entity, [
+            'center' => $entity->getCenter(),
+            'role' => new Role('CHILL_ACTIVITY_CREATE'),
+            'activityType' => $entity->getActivityType(),
+            'accompanyingPeriod' => $accompanyingPeriod,
+        ])->handleRequest($request);
+
+        if ($form->isSubmitted() && $form->isValid()) {
+            $this->entityManager->persist($entity);
+            $this->entityManager->flush();
+
+            $this->addFlash('success', $this->get('translator')->trans('Success : activity created!'));
+
+            $params = $this->buildParamsToUrl($person, $accompanyingPeriod);
+
+            $params['id'] = $entity->getId();
+
+            return $this->redirectToRoute('chill_activity_activity_show', $params);
+        }
+
+        if (null === $view) {
+            throw $this->createNotFoundException('Template not found');
+        }
+
+        $activity_array = $this->serializer->normalize($entity, 'json', ['groups' => 'read']);
+
+        $defaultLocation = $this->getUser()->getCurrentLocation();
+
+        return $this->render($view, [
+            'person' => $person,
+            'accompanyingCourse' => $accompanyingPeriod,
+            'entity' => $entity,
+            'form' => $form->createView(),
+            'activity_json' => $activity_array,
+            'default_location' => $defaultLocation,
+        ]);
+    }
+
    public function selectTypeAction(Request $request): Response
    {
        $view = null;
@@ -159,7 +458,7 @@ final class ActivityController extends AbstractController
            ];
        }

-        if ($view === null) {
+        if (null === $view) {
            throw $this->createNotFoundException('Template not found');
        }

@@ -171,158 +470,23 @@ final class ActivityController extends AbstractController
        ]);
    }

-    public function newAction(Request $request): Response
+    public function showAction(Request $request, int $id): Response
    {
-        $view = null;
+        $entity = $this->activityRepository->find($id);

-        [$person, $accompanyingPeriod] = $this->getEntity($request);
-
-        if ($accompanyingPeriod instanceof AccompanyingPeriod) {
-            $view = 'ChillActivityBundle:Activity:newAccompanyingCourse.html.twig';
-        } elseif ($person instanceof Person) {
-            $view = 'ChillActivityBundle:Activity:newPerson.html.twig';
+        if (null === $entity) {
+            throw $this->createNotFoundException('Unable to find Activity entity.');
        }

-        $activityType_id = $request->get('activityType_id', 0);
-        $activityType = $this->activityTypeRepository->find($activityType_id);
-
-        if (isset($activityType) && !$activityType->isActive()) {
-            throw new \InvalidArgumentException('Activity type must be active');
-        }
-
-        $activityData = null;
-        if ($request->query->has('activityData')) {
-            $activityData = $request->query->get('activityData');
-        }
-
-        if (!$activityType instanceof \Chill\ActivityBundle\Entity\ActivityType ||
-            !$activityType->isActive()) {
-
-            $params = $this->buildParamsToUrl($person, $accompanyingPeriod);
-
-            if (null !== $activityData) {
-                $params['activityData'] = $activityData;
-            }
-            return $this->redirectToRoute('chill_activity_activity_select_type', $params);
-        }
-
-        $entity = new Activity();
-        $entity->setUser($this->getUser());
-
-        if ($person instanceof Person) {
-            $entity->setPerson($person);
-        }
-
-        if ($accompanyingPeriod instanceof AccompanyingPeriod) {
-            $entity->setAccompanyingPeriod($accompanyingPeriod);
-        }
-
-        $entity->setType($activityType);
-        $entity->setDate(new \DateTime('now'));
-
-        if ($request->query->has('activityData')) {
-            $activityData = $request->query->get('activityData');
-
-            if (array_key_exists('durationTime', $activityData)) {
-                $durationTimeInMinutes = $activityData['durationTime'];
-                $hours = floor($durationTimeInMinutes / 60);
-                $minutes = $durationTimeInMinutes % 60;
-                $duration = \DateTime::createFromFormat("H:i", $hours.':'.$minutes);
-                if ($duration) {
-                    $entity->setDurationTime($duration);
-                }
-            }
-
-            if (array_key_exists('date', $activityData)) {
-                $date = \DateTime::createFromFormat('Y-m-d', $activityData['date']);
-                if ($date) {
-                    $entity->setDate($date);
-                }
-            }
-
-            if (array_key_exists('personsId', $activityData)) {
-                foreach($activityData['personsId'] as $personId){
-                    $concernedPerson = $this->personRepository->find($personId);
-                    $entity->addPerson($concernedPerson);
-                }
-            }
-
-            if (array_key_exists('professionalsId', $activityData)) {
-                foreach($activityData['professionalsId'] as $professionalsId){
-                    $professional = $this->thirdPartyRepository->find($professionalsId);
-                    $entity->addThirdParty($professional);
-                }
-            }
-
-            if (array_key_exists('location', $activityData)) {
-                $location = $this->locationRepository->find($activityData['location']);
-                $entity->setLocation($location);
-            }
-
-            if (array_key_exists('comment', $activityData)) {
-                $comment = new CommentEmbeddable();
-                $comment->setComment($activityData['comment']);
-                $comment->setUserId($this->getUser()->getid());
-                $comment->setDate(new \DateTime('now'));
-                $entity->setComment($comment);
-            }
-
-        }
-
-        // TODO revoir le Voter de Activity pour tenir compte qu'une activité peut appartenir a une période
-        // $this->denyAccessUnlessGranted('CHILL_ACTIVITY_CREATE', $entity);
-
-        $form = $this->createForm(ActivityType::class, $entity, [
-            'center' => $entity->getCenter(),
-            'role'   => new Role('CHILL_ACTIVITY_CREATE'),
-            'activityType' => $entity->getType(),
-            'accompanyingPeriod' => $accompanyingPeriod,
-        ])->handleRequest($request);
-
-        if ($form->isSubmitted() && $form->isValid()) {
-            $this->entityManager->persist($entity);
-            $this->entityManager->flush();
-
-            $this->addFlash('success', $this->get('translator')->trans('Success : activity created!'));
-
-            $params = $this->buildParamsToUrl($person, $accompanyingPeriod);
-
-            $params['id'] = $entity->getId();
-
-            return $this->redirectToRoute('chill_activity_activity_show', $params);
-        }
-
-        if ($view === null) {
-            throw $this->createNotFoundException('Template not found');
-        }
-
-        $activity_array = $this->serializer->normalize($entity, 'json', ['groups' => 'read']);
-
-        return $this->render($view, [
-            'person'   => $person,
-            'accompanyingCourse' => $accompanyingPeriod,
-            'entity' => $entity,
-            'form' => $form->createView(),
-            'activity_json' => $activity_array
-        ]);
-    }
-
-    public function showAction(Request $request, $id): Response
-    {
-        $view = null;
-
-        [$person, $accompanyingPeriod] = $this->getEntity($request);
+        $accompanyingPeriod = $entity->getAccompanyingPeriod();
+        $person = $entity->getPerson();

        if ($accompanyingPeriod instanceof AccompanyingPeriod) {
            $view = 'ChillActivityBundle:Activity:showAccompanyingCourse.html.twig';
        } elseif ($person instanceof Person) {
            $view = 'ChillActivityBundle:Activity:showPerson.html.twig';
-        }
-
-        $entity = $this->activityRepository->find($id);
-
-        if (null === $entity) {
-            throw $this->createNotFoundException('Unable to find Activity entity.');
+        } else {
+            throw new RuntimeException('the activity should be linked with a period or person');
        }

        if (null !== $accompanyingPeriod) {
@@ -331,8 +495,7 @@ final class ActivityController extends AbstractController
            $entity->personsNotAssociated = $entity->getPersonsNotAssociated();
        }

-        // TODO revoir le Voter de Activity pour tenir compte qu'une activité peut appartenir a une période
-        // $this->denyAccessUnlessGranted('CHILL_ACTIVITY_SEE', $entity);
+        $this->denyAccessUnlessGranted(ActivityVoter::SEE, $entity);

        $deleteForm = $this->createDeleteForm($entity->getId(), $person, $accompanyingPeriod);

@@ -346,7 +509,7 @@ final class ActivityController extends AbstractController
        $this->eventDispatcher->dispatch(PrivacyEvent::PERSON_PRIVACY_EVENT, $event);
         */

-        if ($view === null) {
+        if (null === $view) {
            throw $this->createNotFoundException('Template not found');
        }

@@ -358,146 +521,19 @@ final class ActivityController extends AbstractController
        ]);
    }

-    /**
-     * Displays a form to edit an existing Activity entity.
-     */
-    public function editAction($id, Request $request): Response
+    private function buildParamsToUrl(?Person $person, ?AccompanyingPeriod $accompanyingPeriod): array
    {
-        $view = null;
+        $params = [];

-        [$person, $accompanyingPeriod] = $this->getEntity($request);
-
-        if ($accompanyingPeriod instanceof AccompanyingPeriod) {
-            $view = 'ChillActivityBundle:Activity:editAccompanyingCourse.html.twig';
-        } elseif ($person instanceof Person) {
-            $view = 'ChillActivityBundle:Activity:editPerson.html.twig';
+        if (null !== $person) {
+            $params['person_id'] = $person->getId();
        }

-        $entity = $this->activityRepository->find($id);
-
-        if (null === $entity) {
-            throw $this->createNotFoundException('Unable to find Activity entity.');
+        if (null !== $accompanyingPeriod) {
+            $params['accompanying_period_id'] = $accompanyingPeriod->getId();
        }

-        // TODO
-        // $this->denyAccessUnlessGranted('CHILL_ACTIVITY_UPDATE', $entity);
-
-        $form = $this->createForm(ActivityType::class, $entity, [
-            'center' => $entity->getCenter(),
-            'role'   => new Role('CHILL_ACTIVITY_UPDATE'),
-            'activityType' => $entity->getType(),
-            'accompanyingPeriod' => $accompanyingPeriod,
-        ])->handleRequest($request);
-
-        if ($form->isSubmitted() && $form->isValid()) {
-            $this->entityManager->persist($entity);
-            $this->entityManager->flush();
-
-            $this->addFlash('success', $this->get('translator')->trans('Success : activity updated!'));
-
-            $params = $this->buildParamsToUrl($person, $accompanyingPeriod);
-            $params['id'] = $entity->getId();
-
-            return $this->redirectToRoute('chill_activity_activity_show', $params);
-        }
-
-        $deleteForm = $this->createDeleteForm($entity->getId(), $person, $accompanyingPeriod);
-
-        /*
-         * TODO
-        $event = new PrivacyEvent($person, array(
-            'element_class' => Activity::class,
-            'element_id' => $entity->getId(),
-            'action' => 'edit'
-        ));
-        $this->eventDispatcher->dispatch(PrivacyEvent::PERSON_PRIVACY_EVENT, $event);
-        */
-
-        if ($view === null) {
-            throw $this->createNotFoundException('Template not found');
-        }
-
-        $activity_array = $this->serializer->normalize($entity, 'json', ['groups' => 'read']);
-
-        return $this->render($view, [
-            'entity'      => $entity,
-            'edit_form'   => $form->createView(),
-            'delete_form' => $deleteForm->createView(),
-            'person' => $person,
-            'accompanyingCourse' => $accompanyingPeriod,
-            'activity_json' => $activity_array
-        ]);
-    }
-
-    /**
-     * Deletes a Activity entity.
-     */
-    public function deleteAction(Request $request, $id)
-    {
-        $view = null;
-
-        [$person, $accompanyingPeriod] = $this->getEntity($request);
-
-        if ($accompanyingPeriod instanceof AccompanyingPeriod) {
-            $view = 'ChillActivityBundle:Activity:confirm_deleteAccompanyingCourse.html.twig';
-        } elseif ($person instanceof Person) {
-            $view = 'ChillActivityBundle:Activity:confirm_deletePerson.html.twig';
-        }
-
-        $activity = $this->activityRepository->find($id);
-
-        if (!$activity) {
-            throw $this->createNotFoundException('Unable to find Activity entity.');
-        }
-
-        // TODO
-        // $this->denyAccessUnlessGranted('CHILL_ACTIVITY_DELETE', $activity);
-
-        $form = $this->createDeleteForm($activity->getId(), $person, $accompanyingPeriod);
-
-        if ($request->getMethod() === Request::METHOD_DELETE) {
-            $form->handleRequest($request);
-
-            if ($form->isValid()) {
-                $this->logger->notice("An activity has been removed", [
-                   'by_user' => $this->getUser()->getUsername(),
-                   'activity_id' => $activity->getId(),
-                   'person_id' => $activity->getPerson() ? $activity->getPerson()->getId() : null,
-                   'comment' => $activity->getComment()->getComment(),
-                   'scope_id' => $activity->getScope() ? $activity->getScope()->getId() : null,
-                   'reasons_ids' => $activity->getReasons()
-                      ->map(
-                          static fn (ActivityReason $ar): int => $ar->getId()
-                      )
-                      ->toArray(),
-                   'type_id' => $activity->getType()->getId(),
-                   'duration' => $activity->getDurationTime() ? $activity->getDurationTime()->format('U') : null,
-                   'date' => $activity->getDate()->format('Y-m-d'),
-                   'attendee' => $activity->getAttendee()
-                ]);
-
-                $this->entityManager->remove($activity);
-                $this->entityManager->flush();
-
-                $this->addFlash('success', $this->get('translator')
-                      ->trans("The activity has been successfully removed."));
-
-                $params = $this->buildParamsToUrl($person, $accompanyingPeriod);
-
-                return $this->redirectToRoute('chill_activity_activity_list', $params);
-            }
-        }
-
-        if ($view === null) {
-            throw $this->createNotFoundException('Template not found');
-        }
-
-        return $this->render($view, [
-           'activity' => $activity,
-           'delete_form' => $form->createView(),
-           'person' => $person,
-           'accompanyingCourse' => $accompanyingPeriod,
-        ]);
+        return $params;
    }

    /**
@@ -523,7 +559,7 @@ final class ActivityController extends AbstractController
            $person_id = $request->get('person_id');
            $person = $this->personRepository->find($person_id);

-            if ($person === null) {
+            if (null === $person) {
                throw $this->createNotFoundException('Person not found');
            }

@@ -532,34 +568,19 @@ final class ActivityController extends AbstractController
            $accompanying_period_id = $request->get('accompanying_period_id');
            $accompanyingPeriod = $this->accompanyingPeriodRepository->find($accompanying_period_id);

-            if ($accompanyingPeriod === null) {
+            if (null === $accompanyingPeriod) {
                throw $this->createNotFoundException('Accompanying Period not found');
            }

            // TODO Add permission
            // $this->denyAccessUnlessGranted('CHILL_PERSON_SEE', $person);
        } else {
-            throw $this->createNotFoundException("Person or Accompanying Period not found");
+            throw $this->createNotFoundException('Person or Accompanying Period not found');
        }

        return [
            $person,
-            $accompanyingPeriod
+            $accompanyingPeriod,
        ];
    }
-
-    private function buildParamsToUrl(?Person $person, ?AccompanyingPeriod $accompanyingPeriod): array
-    {
-        $params = [];
-
-        if (null !== $person) {
-            $params['person_id'] = $person->getId();
-        }
-
-        if (null !== $accompanyingPeriod) {
-            $params['accompanying_period_id'] = $accompanyingPeriod->getId();
-        }
-
-        return $params;
-    }
 }
--- a/src/Bundle/ChillActivityBundle/Controller/ActivityReasonCategoryController.php
+++ b/src/Bundle/ChillActivityBundle/Controller/ActivityReasonCategoryController.php
@@ -1,38 +1,29 @@
 <?php

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

-use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\Form\Extension\Core\Type\SubmitType;
-
 use Chill\ActivityBundle\Entity\ActivityReasonCategory;
 use Chill\ActivityBundle\Form\ActivityReasonCategoryType;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\Form\Extension\Core\Type\SubmitType;
+use Symfony\Component\HttpFoundation\Request;

 /**
 * ActivityReasonCategory controller.
- *
 */
 class ActivityReasonCategoryController extends AbstractController
 {
-
-    /**
-     * Lists all ActivityReasonCategory entities.
-     *
-     */
-    public function indexAction()
-    {
-        $em = $this->getDoctrine()->getManager();
-
-        $entities = $em->getRepository('ChillActivityBundle:ActivityReasonCategory')->findAll();
-
-        return $this->render('ChillActivityBundle:ActivityReasonCategory:index.html.twig', array(
-            'entities' => $entities,
-        ));
-    }
    /**
     * Creates a new ActivityReasonCategory entity.
-     *
     */
    public function createAction(Request $request)
    {
@@ -45,71 +36,19 @@ class ActivityReasonCategoryController extends AbstractController
            $em->persist($entity);
            $em->flush();

-            return $this->redirect($this->generateUrl('chill_activity_activityreasoncategory_show', array('id' => $entity->getId())));
+            return $this->redirect($this->generateUrl('chill_activity_activityreasoncategory_show', ['id' => $entity->getId()]));
        }

-        return $this->render('ChillActivityBundle:ActivityReasonCategory:new.html.twig', array(
+        return $this->render('ChillActivityBundle:ActivityReasonCategory:new.html.twig', [
            'entity' => $entity,
            'form' => $form->createView(),
-        ));
-    }
-
-    /**
-     * Creates a form to create a ActivityReasonCategory entity.
-     *
-     * @param ActivityReasonCategory $entity The entity
-     *
-     * @return \Symfony\Component\Form\Form The form
-     */
-    private function createCreateForm(ActivityReasonCategory $entity)
-    {
-        $form = $this->createForm(ActivityReasonCategoryType::class, $entity, array(
-            'action' => $this->generateUrl('chill_activity_activityreasoncategory_create'),
-            'method' => 'POST',
-        ));
-
-        $form->add('submit', SubmitType::class, array('label' => 'Create'));
-
-        return $form;
-    }
-
-    /**
-     * Displays a form to create a new ActivityReasonCategory entity.
-     *
-     */
-    public function newAction()
-    {
-        $entity = new ActivityReasonCategory();
-        $form   = $this->createCreateForm($entity);
-
-        return $this->render('ChillActivityBundle:ActivityReasonCategory:new.html.twig', array(
-            'entity' => $entity,
-            'form'   => $form->createView(),
-        ));
-    }
-
-    /**
-     * Finds and displays a ActivityReasonCategory entity.
-     *
-     */
-    public function showAction($id)
-    {
-        $em = $this->getDoctrine()->getManager();
-
-        $entity = $em->getRepository('ChillActivityBundle:ActivityReasonCategory')->find($id);
-
-        if (!$entity) {
-            throw $this->createNotFoundException('Unable to find ActivityReasonCategory entity.');
-        }
-
-        return $this->render('ChillActivityBundle:ActivityReasonCategory:show.html.twig', array(
-            'entity'      => $entity,
-        ));
+        ]);
    }

    /**
     * Displays a form to edit an existing ActivityReasonCategory entity.
     *
+     * @param mixed $id
     */
    public function editAction($id)
    {
@@ -123,33 +62,64 @@ class ActivityReasonCategoryController extends AbstractController

        $editForm = $this->createEditForm($entity);

-        return $this->render('ChillActivityBundle:ActivityReasonCategory:edit.html.twig', array(
+        return $this->render('ChillActivityBundle:ActivityReasonCategory:edit.html.twig', [
            'entity' => $entity,
            'edit_form' => $editForm->createView(),
-        ));
+        ]);
    }

    /**
-    * Creates a form to edit a ActivityReasonCategory entity.
-    *
-    * @param ActivityReasonCategory $entity The entity
-    *
-    * @return \Symfony\Component\Form\Form The form
+     * Lists all ActivityReasonCategory entities.
     */
-    private function createEditForm(ActivityReasonCategory $entity)
+    public function indexAction()
    {
-        $form = $this->createForm(ActivityReasonCategoryType::class, $entity, array(
-            'action' => $this->generateUrl('chill_activity_activityreasoncategory_update', array('id' => $entity->getId())),
-            'method' => 'PUT',
-        ));
+        $em = $this->getDoctrine()->getManager();

-        $form->add('submit', SubmitType::class, array('label' => 'Update'));
+        $entities = $em->getRepository('ChillActivityBundle:ActivityReasonCategory')->findAll();

-        return $form;
+        return $this->render('ChillActivityBundle:ActivityReasonCategory:index.html.twig', [
+            'entities' => $entities,
+        ]);
    }
+
+    /**
+     * Displays a form to create a new ActivityReasonCategory entity.
+     */
+    public function newAction()
+    {
+        $entity = new ActivityReasonCategory();
+        $form = $this->createCreateForm($entity);
+
+        return $this->render('ChillActivityBundle:ActivityReasonCategory:new.html.twig', [
+            'entity' => $entity,
+            'form' => $form->createView(),
+        ]);
+    }
+
+    /**
+     * Finds and displays a ActivityReasonCategory entity.
+     *
+     * @param mixed $id
+     */
+    public function showAction($id)
+    {
+        $em = $this->getDoctrine()->getManager();
+
+        $entity = $em->getRepository('ChillActivityBundle:ActivityReasonCategory')->find($id);
+
+        if (!$entity) {
+            throw $this->createNotFoundException('Unable to find ActivityReasonCategory entity.');
+        }
+
+        return $this->render('ChillActivityBundle:ActivityReasonCategory:show.html.twig', [
+            'entity' => $entity,
+        ]);
+    }
+
    /**
     * Edits an existing ActivityReasonCategory entity.
     *
+     * @param mixed $id
     */
    public function updateAction(Request $request, $id)
    {
@@ -167,12 +137,50 @@ class ActivityReasonCategoryController extends AbstractController
        if ($editForm->isValid()) {
            $em->flush();

-            return $this->redirect($this->generateUrl('chill_activity_activityreasoncategory_edit', array('id' => $id)));
+            return $this->redirect($this->generateUrl('chill_activity_activityreasoncategory_edit', ['id' => $id]));
        }

-        return $this->render('ChillActivityBundle:ActivityReasonCategory:edit.html.twig', array(
+        return $this->render('ChillActivityBundle:ActivityReasonCategory:edit.html.twig', [
            'entity' => $entity,
            'edit_form' => $editForm->createView(),
-        ));
+        ]);
+    }
+
+    /**
+     * Creates a form to create a ActivityReasonCategory entity.
+     *
+     * @param ActivityReasonCategory $entity The entity
+     *
+     * @return \Symfony\Component\Form\Form The form
+     */
+    private function createCreateForm(ActivityReasonCategory $entity)
+    {
+        $form = $this->createForm(ActivityReasonCategoryType::class, $entity, [
+            'action' => $this->generateUrl('chill_activity_activityreasoncategory_create'),
+            'method' => 'POST',
+        ]);
+
+        $form->add('submit', SubmitType::class, ['label' => 'Create']);
+
+        return $form;
+    }
+
+    /**
+     * Creates a form to edit a ActivityReasonCategory entity.
+     *
+     * @param ActivityReasonCategory $entity The entity
+     *
+     * @return \Symfony\Component\Form\Form The form
+     */
+    private function createEditForm(ActivityReasonCategory $entity)
+    {
+        $form = $this->createForm(ActivityReasonCategoryType::class, $entity, [
+            'action' => $this->generateUrl('chill_activity_activityreasoncategory_update', ['id' => $entity->getId()]),
+            'method' => 'PUT',
+        ]);
+
+        $form->add('submit', SubmitType::class, ['label' => 'Update']);
+
+        return $form;
    }
 }
--- a/src/Bundle/ChillActivityBundle/Controller/ActivityReasonController.php
+++ b/src/Bundle/ChillActivityBundle/Controller/ActivityReasonController.php
@@ -1,38 +1,29 @@
 <?php

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

-use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\Form\Extension\Core\Type\SubmitType;
-
 use Chill\ActivityBundle\Entity\ActivityReason;
 use Chill\ActivityBundle\Form\ActivityReasonType;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\Form\Extension\Core\Type\SubmitType;
+use Symfony\Component\HttpFoundation\Request;

 /**
 * ActivityReason controller.
- *
 */
 class ActivityReasonController extends AbstractController
 {
-
-    /**
-     * Lists all ActivityReason entities.
-     *
-     */
-    public function indexAction()
-    {
-        $em = $this->getDoctrine()->getManager();
-
-        $entities = $em->getRepository('ChillActivityBundle:ActivityReason')->findAll();
-
-        return $this->render('ChillActivityBundle:ActivityReason:index.html.twig', array(
-            'entities' => $entities,
-        ));
-    }
    /**
     * Creates a new ActivityReason entity.
-     *
     */
    public function createAction(Request $request)
    {
@@ -45,71 +36,19 @@ class ActivityReasonController extends AbstractController
            $em->persist($entity);
            $em->flush();

-            return $this->redirect($this->generateUrl('chill_activity_activityreason', array('id' => $entity->getId())));
+            return $this->redirect($this->generateUrl('chill_activity_activityreason', ['id' => $entity->getId()]));
        }

-        return $this->render('ChillActivityBundle:ActivityReason:new.html.twig', array(
+        return $this->render('ChillActivityBundle:ActivityReason:new.html.twig', [
            'entity' => $entity,
            'form' => $form->createView(),
-        ));
-    }
-
-    /**
-     * Creates a form to create a ActivityReason entity.
-     *
-     * @param ActivityReason $entity The entity
-     *
-     * @return \Symfony\Component\Form\Form The form
-     */
-    private function createCreateForm(ActivityReason $entity)
-    {
-        $form = $this->createForm(ActivityReasonType::class, $entity, array(
-            'action' => $this->generateUrl('chill_activity_activityreason_create'),
-            'method' => 'POST',
-        ));
-
-        $form->add('submit', SubmitType::class, array('label' => 'Create'));
-
-        return $form;
-    }
-
-    /**
-     * Displays a form to create a new ActivityReason entity.
-     *
-     */
-    public function newAction()
-    {
-        $entity = new ActivityReason();
-        $form   = $this->createCreateForm($entity);
-
-        return $this->render('ChillActivityBundle:ActivityReason:new.html.twig', array(
-            'entity' => $entity,
-            'form'   => $form->createView(),
-        ));
-    }
-
-    /**
-     * Finds and displays a ActivityReason entity.
-     *
-     */
-    public function showAction($id)
-    {
-        $em = $this->getDoctrine()->getManager();
-
-        $entity = $em->getRepository('ChillActivityBundle:ActivityReason')->find($id);
-
-        if (!$entity) {
-            throw $this->createNotFoundException('Unable to find ActivityReason entity.');
-        }
-
-        return $this->render('ChillActivityBundle:ActivityReason:show.html.twig', array(
-            'entity'      => $entity,
-        ));
+        ]);
    }

    /**
     * Displays a form to edit an existing ActivityReason entity.
     *
+     * @param mixed $id
     */
    public function editAction($id)
    {
@@ -123,33 +62,64 @@ class ActivityReasonController extends AbstractController

        $editForm = $this->createEditForm($entity);

-        return $this->render('ChillActivityBundle:ActivityReason:edit.html.twig', array(
+        return $this->render('ChillActivityBundle:ActivityReason:edit.html.twig', [
            'entity' => $entity,
-            'edit_form'   => $editForm->createView()
-        ));
+            'edit_form' => $editForm->createView(),
+        ]);
    }

    /**
-    * Creates a form to edit a ActivityReason entity.
-    *
-    * @param ActivityReason $entity The entity
-    *
-    * @return \Symfony\Component\Form\Form The form
+     * Lists all ActivityReason entities.
     */
-    private function createEditForm(ActivityReason $entity)
+    public function indexAction()
    {
-        $form = $this->createForm(ActivityReasonType::class, $entity, array(
-            'action' => $this->generateUrl('chill_activity_activityreason_update', array('id' => $entity->getId())),
-            'method' => 'PUT',
-        ));
+        $em = $this->getDoctrine()->getManager();

-        $form->add('submit', SubmitType::class, array('label' => 'Update'));
+        $entities = $em->getRepository('ChillActivityBundle:ActivityReason')->findAll();

-        return $form;
+        return $this->render('ChillActivityBundle:ActivityReason:index.html.twig', [
+            'entities' => $entities,
+        ]);
    }
+
+    /**
+     * Displays a form to create a new ActivityReason entity.
+     */
+    public function newAction()
+    {
+        $entity = new ActivityReason();
+        $form = $this->createCreateForm($entity);
+
+        return $this->render('ChillActivityBundle:ActivityReason:new.html.twig', [
+            'entity' => $entity,
+            'form' => $form->createView(),
+        ]);
+    }
+
+    /**
+     * Finds and displays a ActivityReason entity.
+     *
+     * @param mixed $id
+     */
+    public function showAction($id)
+    {
+        $em = $this->getDoctrine()->getManager();
+
+        $entity = $em->getRepository('ChillActivityBundle:ActivityReason')->find($id);
+
+        if (!$entity) {
+            throw $this->createNotFoundException('Unable to find ActivityReason entity.');
+        }
+
+        return $this->render('ChillActivityBundle:ActivityReason:show.html.twig', [
+            'entity' => $entity,
+        ]);
+    }
+
    /**
     * Edits an existing ActivityReason entity.
     *
+     * @param mixed $id
     */
    public function updateAction(Request $request, $id)
    {
@@ -167,12 +137,50 @@ class ActivityReasonController extends AbstractController
        if ($editForm->isValid()) {
            $em->flush();

-            return $this->redirect($this->generateUrl('chill_activity_activityreason', array('id' => $id)));
+            return $this->redirect($this->generateUrl('chill_activity_activityreason', ['id' => $id]));
        }

-        return $this->render('ChillActivityBundle:ActivityReason:edit.html.twig', array(
+        return $this->render('ChillActivityBundle:ActivityReason:edit.html.twig', [
            'entity' => $entity,
-            'edit_form'   => $editForm->createView()
-        ));
+            'edit_form' => $editForm->createView(),
+        ]);
+    }
+
+    /**
+     * Creates a form to create a ActivityReason entity.
+     *
+     * @param ActivityReason $entity The entity
+     *
+     * @return \Symfony\Component\Form\Form The form
+     */
+    private function createCreateForm(ActivityReason $entity)
+    {
+        $form = $this->createForm(ActivityReasonType::class, $entity, [
+            'action' => $this->generateUrl('chill_activity_activityreason_create'),
+            'method' => 'POST',
+        ]);
+
+        $form->add('submit', SubmitType::class, ['label' => 'Create']);
+
+        return $form;
+    }
+
+    /**
+     * Creates a form to edit a ActivityReason entity.
+     *
+     * @param ActivityReason $entity The entity
+     *
+     * @return \Symfony\Component\Form\Form The form
+     */
+    private function createEditForm(ActivityReason $entity)
+    {
+        $form = $this->createForm(ActivityReasonType::class, $entity, [
+            'action' => $this->generateUrl('chill_activity_activityreason_update', ['id' => $entity->getId()]),
+            'method' => 'PUT',
+        ]);
+
+        $form->add('submit', SubmitType::class, ['label' => 'Update']);
+
+        return $form;
    }
 }
--- a/src/Bundle/ChillActivityBundle/Controller/AdminActivityPresenceController.php
+++ b/src/Bundle/ChillActivityBundle/Controller/AdminActivityPresenceController.php
@@ -1,5 +1,14 @@
 <?php

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

 use Chill\MainBundle\CRUD\Controller\CRUDController;
@@ -9,10 +18,8 @@ use Symfony\Component\HttpFoundation\Request;
 class AdminActivityPresenceController extends CRUDController
 {
    /**
-     * @param string $action
     * @param \Doctrine\ORM\QueryBuilder|mixed $query
-     * @param Request $request
-     * @param PaginatorInterface $paginator
+     *
     * @return \Doctrine\ORM\QueryBuilder|mixed
     */
    protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator)
--- a/src/Bundle/ChillActivityBundle/Controller/AdminActivityTypeCategoryController.php
+++ b/src/Bundle/ChillActivityBundle/Controller/AdminActivityTypeCategoryController.php
@@ -1,5 +1,14 @@
 <?php

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

 use Chill\MainBundle\CRUD\Controller\CRUDController;
@@ -9,10 +18,8 @@ use Symfony\Component\HttpFoundation\Request;
 class AdminActivityTypeCategoryController extends CRUDController
 {
    /**
-     * @param string $action
     * @param \Doctrine\ORM\QueryBuilder|mixed $query
-     * @param Request $request
-     * @param PaginatorInterface $paginator
+     *
     * @return \Doctrine\ORM\QueryBuilder|mixed
     */
    protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator)
--- a/src/Bundle/ChillActivityBundle/Controller/AdminActivityTypeController.php
+++ b/src/Bundle/ChillActivityBundle/Controller/AdminActivityTypeController.php
@@ -1,5 +1,14 @@
 <?php

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

 use Chill\MainBundle\CRUD\Controller\CRUDController;
@@ -9,15 +18,14 @@ use Symfony\Component\HttpFoundation\Request;
 class AdminActivityTypeController extends CRUDController
 {
    /**
-     * @param string $action
     * @param \Doctrine\ORM\QueryBuilder|mixed $query
-     * @param Request $request
-     * @param PaginatorInterface $paginator
+     *
     * @return \Doctrine\ORM\QueryBuilder|mixed
     */
    protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator)
    {
        /** @var \Doctrine\ORM\QueryBuilder $query */
-        return $query->orderBy('e.ordering', 'ASC');
+        return $query->orderBy('e.ordering', 'ASC')
+            ->addOrderBy('e.id', 'ASC');
    }
 }
--- a/src/Bundle/ChillActivityBundle/Controller/AdminController.php
+++ b/src/Bundle/ChillActivityBundle/Controller/AdminController.php
@@ -1,33 +1,20 @@
 <?php

-/*
+/**
 * Chill is a software for social workers
- * Copyright (C) 2015 Champs Libres <info@champs-libres.coop>
 *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
 */

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

-use Symfony\Component\HttpFoundation\Request;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;

 /**
- * Controller for activity configuration
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- * @author Champs Libres <info@champs-libres.coop>
+ * Controller for activity configuration.
 */
 class AdminController extends AbstractController
 {
--- a/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivity.php
+++ b/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivity.php
@@ -1,48 +1,36 @@
 <?php

-/*
+/**
 * Chill is a software for social workers
 *
- * Copyright (C) 2014-2015, Champs Libres Cooperative SCRLFS,
- * <http://www.champs-libres.coop>, <info@champs-libres.coop>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
 */

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

+use Chill\ActivityBundle\Entity\Activity;
+use Chill\MainBundle\DataFixtures\ORM\LoadScopes;
+use Chill\MainBundle\DataFixtures\ORM\LoadUsers;
 use Chill\PersonBundle\Entity\Person;
 use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\Persistence\ObjectManager;
 use Faker\Factory as FakerFactory;
-use Chill\ActivityBundle\Entity\Activity;
-use Chill\MainBundle\DataFixtures\ORM\LoadUsers;
-use Chill\ActivityBundle\DataFixtures\ORM\LoadActivityReason;
-use Chill\ActivityBundle\DataFixtures\ORM\LoadActivityType;
-use Chill\MainBundle\DataFixtures\ORM\LoadScopes;

 class LoadActivity extends AbstractFixture implements OrderedFixtureInterface
 {
    use \Symfony\Component\DependencyInjection\ContainerAwareTrait;

+    private EntityManagerInterface $em;
+
    /**
     * @var \Faker\Generator
     */
    private $faker;
-    private EntityManagerInterface $em;

    public function __construct(EntityManagerInterface $em)
    {
@@ -55,30 +43,53 @@ class LoadActivity extends AbstractFixture implements OrderedFixtureInterface
        return 16400;
    }

-    /**
-     * Return a random scope
-     *
-     * @return \Chill\MainBundle\Entity\Scope
-     */
-    private function getRandomScope()
+    public function load(ObjectManager $manager)
    {
-        $scopeRef = LoadScopes::$references[array_rand(LoadScopes::$references)];
-        return $this->getReference($scopeRef);
+        $persons = $this->em
+            ->getRepository(Person::class)
+            ->findAll();
+
+        foreach ($persons as $person) {
+            $activityNbr = mt_rand(0, 3);
+
+            for ($i = 0; $i < $activityNbr; ++$i) {
+                $activity = $this->newRandomActivity($person);
+
+                if (null !== $activity) {
+                    $manager->persist($activity);
+                }
+            }
+        }
+        $manager->flush();
+    }
+
+    public function newRandomActivity($person): ?Activity
+    {
+        $activity = (new Activity())
+            ->setUser($this->getRandomUser())
+            ->setPerson($person)
+            ->setDate($this->faker->dateTimeThisYear())
+            ->setDurationTime($this->faker->dateTime(36000))
+            ->setType($this->getRandomActivityType())
+            ->setScope($this->getRandomScope());
+
+        //      ->setAttendee($this->faker->boolean())
+
+        for ($i = 0; mt_rand(0, 4) > $i; ++$i) {
+            $reason = $this->getRandomActivityReason();
+
+            if (null !== $reason) {
+                $activity->addReason($reason);
+            } else {
+                return null;
+            }
+        }
+
+        return $activity;
    }

    /**
-     * Return a random activityType
-     *
-     * @return \Chill\ActivityBundle\Entity\ActivityType
-     */
-    private function getRandomActivityType()
-    {
-        $typeRef = LoadActivityType::$references[array_rand(LoadActivityType::$references)];
-        return $this->getReference($typeRef);
-    }
-
-    /**
-     * Return a random activityReason
+     * Return a random activityReason.
     *
     * @return \Chill\ActivityBundle\Entity\ActivityReason
     */
@@ -90,57 +101,38 @@ class LoadActivity extends AbstractFixture implements OrderedFixtureInterface
    }

    /**
-     * Return a random user
+     * Return a random activityType.
+     *
+     * @return \Chill\ActivityBundle\Entity\ActivityType
+     */
+    private function getRandomActivityType()
+    {
+        $typeRef = LoadActivityType::$references[array_rand(LoadActivityType::$references)];
+
+        return $this->getReference($typeRef);
+    }
+
+    /**
+     * Return a random scope.
+     *
+     * @return \Chill\MainBundle\Entity\Scope
+     */
+    private function getRandomScope()
+    {
+        $scopeRef = LoadScopes::$references[array_rand(LoadScopes::$references)];
+
+        return $this->getReference($scopeRef);
+    }
+
+    /**
+     * Return a random user.
     *
     * @return \Chill\MainBundle\Entity\User
     */
    private function getRandomUser()
    {
        $userRef = array_rand(LoadUsers::$refs);
+
        return $this->getReference($userRef);
    }
-
-    public function newRandomActivity($person): ?Activity
-    {
-        $activity = (new Activity())
-            ->setUser($this->getRandomUser())
-            ->setPerson($person)
-            ->setDate($this->faker->dateTimeThisYear())
-            ->setDurationTime($this->faker->dateTime(36000))
-            ->setType($this->getRandomActivityType())
-            ->setScope($this->getRandomScope())
-            ;
-
-        //      ->setAttendee($this->faker->boolean())
-
-        for ($i = 0; $i < rand(0, 4); $i++) {
-            $reason = $this->getRandomActivityReason();
-            if (null !== $reason) {
-                $activity->addReason($reason);
-            } else {
-                return null;
-            }
-        }
-
-        return $activity;
-    }
-
-    public function load(ObjectManager $manager)
-    {
-        $persons = $this->em
-            ->getRepository(Person::class)
-            ->findAll();
-
-        foreach ($persons as $person) {
-            $activityNbr = rand(0,3);
-
-            for ($i = 0; $i < $activityNbr; $i ++) {
-                $activity = $this->newRandomActivity($person);
-                if (null !== $activity) {
-                    $manager->persist($activity);
-                }
-            }
-        }
-        $manager->flush();
-    }
 }
--- a/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityNotifications.php
+++ b/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityNotifications.php
@@ -1,15 +1,23 @@
 <?php

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

-use Doctrine\Common\DataFixtures\AbstractFixture;
-use Doctrine\Common\DataFixtures\DependentFixtureInterface;
 use Chill\ActivityBundle\Entity\Activity;
 use Chill\MainBundle\DataFixtures\ORM\LoadAbstractNotificationsTrait;
-use Chill\ActivityBundle\DataFixtures\ORM\LoadActivity;
+use Doctrine\Common\DataFixtures\AbstractFixture;
+use Doctrine\Common\DataFixtures\DependentFixtureInterface;

 /**
- * Load notififications into database
+ * Load notififications into database.
 */
 class LoadActivityNotifications extends AbstractFixture implements DependentFixtureInterface
 {
@@ -25,9 +33,9 @@ class LoadActivityNotifications extends AbstractFixture implements DependentFixt
                'center a_social',
                'center a_administrative',
                'center a_direction',
-                'multi_center'
+                'multi_center',
+            ],
        ],
-        ]
    ];

    public function getDependencies()
--- a/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityReason.php
+++ b/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityReason.php
@@ -1,77 +1,64 @@
 <?php

-/*
+/**
 * Chill is a software for social workers
 *
- * Copyright (C) 2014-2015, Champs Libres Cooperative SCRLFS, 
- * <http://www.champs-libres.coop>, <info@champs-libres.coop>
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- * 
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
 */

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

+use Chill\ActivityBundle\Entity\ActivityReason;
 use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
 use Doctrine\Persistence\ObjectManager;
-use Chill\ActivityBundle\Entity\ActivityReason;

 /**
- * Description of LoadActivityReason
- *
- * @author Champs-Libres Coop
+ * Description of LoadActivityReason.
 */
 class LoadActivityReason extends AbstractFixture implements OrderedFixtureInterface
 {
+    public static $references = [];
+
    public function getOrder()
    {
        return 16300;
    }

-    public static $references = array();
-    
    public function load(ObjectManager $manager)
    {
        $reasons = [
            [
                'name' => ['fr' => 'Recherche logement', 'en' => 'Housing research', 'nl' => 'Woning zoektoch'],
-                'category' => 'cat_Housing'],
+                'category' => 'cat_Housing', ],
            [
                'name' => ['fr' => 'Problème avec propriétaire', 'en' => 'Landlord problems', 'nl' => 'Huisbaas problemen'],
-                'category' => 'cat_Housing'],
+                'category' => 'cat_Housing', ],
            [
                'name' => ['fr' => 'Retard de payement', 'en' => 'Payement problems', 'nl' => 'Betalings vertragingen'],
-                'category' => 'cat_Housing'],
+                'category' => 'cat_Housing', ],
            [
                'name' => ['fr' => 'Explication législation', 'en' => 'Legislation explanation', 'nl' => 'Legislative uitleg'],
-                'category' => 'cat_Unemployment procedure'],
+                'category' => 'cat_Unemployment procedure', ],
            [
                'name' => ['fr' => 'Coaching entretien d\'activation', 'en' => 'Interview coaching', 'nl' => 'Interview coaching'],
-                'category' => 'cat_Unemployment procedure'],
+                'category' => 'cat_Unemployment procedure', ],
            [
                'name' => ['fr' => 'Récupération des allocations', 'en' => 'Allowance recovery', 'nl' => 'Terugwinning van de uitkeringen'],
-                'category' => 'cat_Unemployment procedure']
+                'category' => 'cat_Unemployment procedure', ],
        ];

        foreach ($reasons as $r) {
-            print "Creating activity reason : " . $r['name']['en'] . "\n";
+            echo 'Creating activity reason : ' . $r['name']['en'] . "\n";
            $activityReason = (new ActivityReason())
                ->setName(($r['name']))
                ->setActive(true)
                ->setCategory($this->getReference($r['category']));
            $manager->persist($activityReason);
-            $reference = 'activity_reason_'.$r['name']['en'];
+            $reference = 'activity_reason_' . $r['name']['en'];
            $this->addReference($reference, $activityReason);
            static::$references[] = $reference;
        }
--- a/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityReasonCategory.php
+++ b/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityReasonCategory.php
@@ -1,35 +1,23 @@
 <?php

-/*
+/**
 * Chill is a software for social workers
 *
- * Copyright (C) 2014-2015, Champs Libres Cooperative SCRLFS, 
- * <http://www.champs-libres.coop>, <info@champs-libres.coop>
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- * 
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
 */

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

+use Chill\ActivityBundle\Entity\ActivityReasonCategory;
 use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
 use Doctrine\Persistence\ObjectManager;
-use Chill\ActivityBundle\Entity\ActivityReasonCategory;
+
 /**
- * Description of LoadActivityReasonCategory
- *
- * @author Champs-Libres Coop
+ * Description of LoadActivityReasonCategory.
 */
 class LoadActivityReasonCategory extends AbstractFixture implements OrderedFixtureInterface
 {
@@ -41,21 +29,20 @@ class LoadActivityReasonCategory extends AbstractFixture implements OrderedFixtu
    public function load(ObjectManager $manager)
    {
        $categs = [
-            ['name' =>
-                ['fr' => 'Logement', 'en' => 'Housing', 'nl' => 'Woning']],
-            ['name' =>
-                ['fr' => 'Démarches chômage', 'en' => 'Unemployment procedure', 'nl' => 'Werkloosheid werkwijze']],
+            ['name' => ['fr' => 'Logement', 'en' => 'Housing', 'nl' => 'Woning']],
+            ['name' => ['fr' => 'Démarches chômage', 'en' => 'Unemployment procedure', 'nl' => 'Werkloosheid werkwijze']],
        ];

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

        $manager->flush();
--- a/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityType.php
+++ b/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityType.php
@@ -1,86 +1,67 @@
 <?php

-/*
+/**
 * Chill is a software for social workers
 *
- * Copyright (C) 2014-2015, Champs Libres Cooperative SCRLFS,
- * <http://www.champs-libres.coop>, <info@champs-libres.coop>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
 */

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

+use Chill\ActivityBundle\Entity\ActivityType;
 use Doctrine\Bundle\FixturesBundle\Fixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
 use Doctrine\Persistence\ObjectManager;
-use Chill\ActivityBundle\Entity\ActivityType;

 /**
- * Description of LoadActivityType
- *
- * @author Champs-Libres Coop
+ * Description of LoadActivityType.
 */
 class LoadActivityType extends Fixture implements OrderedFixtureInterface
 {
+    public static $references = [];
+
    public function getOrder()
    {
        return 16100;
    }

-    public static $references = array();
-
    public function load(ObjectManager $manager)
    {
        $types = [
-            # Exange
+            // Exange
            [
-                'name' =>
-                    ['fr' => 'Entretien physique avec l\'usager'],
-                'category' => 'exchange' ],
+                'name' => ['fr' => 'Entretien physique avec l\'usager'],
+                'category' => 'exchange', ],
            [
-                'name' =>
-                    ['fr' => 'Appel téléphonique', 'en' => 'Telephone call', 'nl' => 'Telefoon appel'],
-                'category' => 'exchange' ],
+                'name' => ['fr' => 'Appel téléphonique', 'en' => 'Telephone call', 'nl' => 'Telefoon appel'],
+                'category' => 'exchange', ],
            [
-                'name' =>
-                    ['fr' => 'Courriel', 'en' => 'Email', 'nl' => 'Email'],
-                'category' => 'exchange' ],
-            # Meeting
+                'name' => ['fr' => 'Courriel', 'en' => 'Email', 'nl' => 'Email'],
+                'category' => 'exchange', ],
+            // Meeting
            [
-                'name' =>
-                    ['fr' => 'Point technique encadrant'],
-                'category' => 'meeting' ],
+                'name' => ['fr' => 'Point technique encadrant'],
+                'category' => 'meeting', ],
            [
-                'name' =>
-                    ['fr' => 'Réunion avec des partenaires'],
-                'category' => 'meeting' ],
+                'name' => ['fr' => 'Réunion avec des partenaires'],
+                'category' => 'meeting', ],
            [
-                'name' =>
-                    ['fr' => 'Commission pluridisciplinaire et pluri-institutionnelle'],
-                'category' => 'meeting' ],
+                'name' => ['fr' => 'Commission pluridisciplinaire et pluri-institutionnelle'],
+                'category' => 'meeting', ],
        ];

        foreach ($types as $t) {
-            print "Creating activity type : " . $t['name']['fr'] . " (cat:". $t['category']  . " \n";
+            echo 'Creating activity type : ' . $t['name']['fr'] . ' (cat:' . $t['category'] . " \n";
            $activityType = (new ActivityType())
                ->setName(($t['name']))
-                ->setCategory($this->getReference('activity_type_cat_'.$t['category']))
+                ->setCategory($this->getReference('activity_type_cat_' . $t['category']))
                ->setSocialIssuesVisible(1)
                ->setSocialActionsVisible(1);
            $manager->persist($activityType);
-            $reference = 'activity_type_'.$t['name']['fr'];
+            $reference = 'activity_type_' . $t['name']['fr'];
            $this->addReference($reference, $activityType);
            static::$references[] = $reference;
        }
--- a/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityTypeCategory.php
+++ b/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityTypeCategory.php
@@ -1,40 +1,27 @@
 <?php

-/*
+/**
 * Chill is a software for social workers
 *
- * Copyright (C) 2014-2021, Champs Libres Cooperative SCRLFS,
- * <http://www.champs-libres.coop>, <info@champs-libres.coop>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
 */

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

+use Chill\ActivityBundle\Entity\ActivityTypeCategory;
 use Doctrine\Bundle\FixturesBundle\Fixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
 use Doctrine\Persistence\ObjectManager;
-use Chill\ActivityBundle\Entity\ActivityTypeCategory;

 /**
- * Fixtures for ActivityTypeCategory
- *
- * @author Champs-Libres Coop
+ * Fixtures for ActivityTypeCategory.
 */
 class LoadActivityTypeCategory extends Fixture implements OrderedFixtureInterface
 {
-    public static $references = array();
+    public static $references = [];

    public function getOrder()
    {
@@ -55,13 +42,13 @@ class LoadActivityTypeCategory extends Fixture implements OrderedFixtureInterfac
        ];

        foreach ($categories as $cat) {
-            print "Creating activity type category : " . $cat['ref'] . "\n";
+            echo 'Creating activity type category : ' . $cat['ref'] . "\n";

            $newCat = (new ActivityTypeCategory())
                ->setName(($cat['name']));

            $manager->persist($newCat);
-            $reference = 'activity_type_cat_'.$cat['ref'];
+            $reference = 'activity_type_cat_' . $cat['ref'];

            $this->addReference($reference, $newCat);
            static::$references[] = $reference;
--- a/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivitytACL.php
+++ b/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivitytACL.php
@@ -1,37 +1,30 @@
 <?php

-/*
- * Copyright (C) 2015 Julien Fastré <julien.fastre@champs-libres.coop>
+/**
+ * Chill is a software for social workers
 *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
 */

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

+use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
+use Chill\ActivityBundle\Security\Authorization\ActivityVoter;
+use Chill\MainBundle\DataFixtures\ORM\LoadPermissionsGroup;
+use Chill\MainBundle\DataFixtures\ORM\LoadScopes;
+use Chill\MainBundle\Entity\RoleScope;
 use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
 use Doctrine\Persistence\ObjectManager;
-use Chill\MainBundle\DataFixtures\ORM\LoadPermissionsGroup;
-use Chill\MainBundle\Entity\RoleScope;
-use Chill\MainBundle\DataFixtures\ORM\LoadScopes;
-use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
+
+use function in_array;

 /**
 * Add a role CHILL_ACTIVITY_UPDATE & CHILL_ACTIVITY_CREATE for all groups except administrative,
- * and a role CHILL_ACTIVITY_SEE for administrative
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * and a role CHILL_ACTIVITY_SEE for administrative.
 */
 class LoadActivitytACL extends AbstractFixture implements OrderedFixtureInterface
 {
@@ -40,12 +33,12 @@ class LoadActivitytACL extends AbstractFixture implements OrderedFixtureInterfac
        return 16000;
    }

-    
    public function load(ObjectManager $manager)
    {
        foreach (LoadPermissionsGroup::$refs as $permissionsGroupRef) {
            $permissionsGroup = $this->getReference($permissionsGroupRef);
-            foreach (LoadScopes::$references as $scopeRef){
+
+            foreach (LoadScopes::$references as $scopeRef) {
                $scope = $this->getReference($scopeRef);
                //create permission group
                switch ($permissionsGroup->getName()) {
@@ -53,24 +46,33 @@ class LoadActivitytACL extends AbstractFixture implements OrderedFixtureInterfac
                        if ($scope->getName()['en'] === 'administrative') {
                            break 2; // we do not want any power on administrative
                        }
+
                        break;
+
                    case 'administrative':
                    case 'direction':
-                        if (in_array($scope->getName()['en'], array('administrative', 'social'))) {
+                        if (in_array($scope->getName()['en'], ['administrative', 'social'], true)) {
                            break 2; // we do not want any power on social or administrative
                        }
+
                        break;
                }

-                printf("Adding CHILL_ACTIVITY_UPDATE & CHILL_ACTIVITY_CREATE & CHILL_ACTIVITY_DELETE, and stats and list permissions to %s "
+                printf(
+                    'Adding CHILL_ACTIVITY_UPDATE & CHILL_ACTIVITY_CREATE & CHILL_ACTIVITY_DELETE, and stats and list permissions to %s '
                        . "permission group, scope '%s' \n",
-                        $permissionsGroup->getName(), $scope->getName()['en']);
+                    $permissionsGroup->getName(),
+                    $scope->getName()['en']
+                );
                $roleScopeUpdate = (new RoleScope())
                    ->setRole('CHILL_ACTIVITY_UPDATE')
                    ->setScope($scope);
                $permissionsGroup->addRoleScope($roleScopeUpdate);
                $roleScopeCreate = (new RoleScope())
-                            ->setRole('CHILL_ACTIVITY_CREATE')
+                    ->setRole(ActivityVoter::CREATE_ACCOMPANYING_COURSE)
+                    ->setScope($scope);
+                $roleScopeCreate = (new RoleScope())
+                    ->setRole(ActivityVoter::CREATE_PERSON)
                    ->setScope($scope);
                $permissionsGroup->addRoleScope($roleScopeCreate);
                $roleScopeDelete = (new RoleScope())
@@ -78,22 +80,18 @@ class LoadActivitytACL extends AbstractFixture implements OrderedFixtureInterfac
                    ->setScope($scope);
                $permissionsGroup->addRoleScope($roleScopeDelete);
                $roleScopeList = (new RoleScope())
-                            ->setRole(ActivityStatsVoter::LISTS)
-                            ;
+                    ->setRole(ActivityStatsVoter::LISTS);
                $permissionsGroup->addRoleScope($roleScopeList);
                $roleScopeStat = (new RoleScope())
-                            ->setRole(ActivityStatsVoter::STATS)
-                            ;
+                    ->setRole(ActivityStatsVoter::STATS);
                $permissionsGroup->addRoleScope($roleScopeStat);

                $manager->persist($roleScopeUpdate);
                $manager->persist($roleScopeCreate);
                $manager->persist($roleScopeDelete);
            }
-            
        }

        $manager->flush();
    }
-
 }
--- a/src/Bundle/ChillActivityBundle/DependencyInjection/ChillActivityExtension.php
+++ b/src/Bundle/ChillActivityBundle/DependencyInjection/ChillActivityExtension.php
@@ -1,45 +1,30 @@
 <?php

-/*
+/**
 * Chill is a software for social workers
 *
- * Copyright (C) 2014-2015, Champs Libres Cooperative SCRLFS,
- * <http://www.champs-libres.coop>, <info@champs-libres.coop>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
 */

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

-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\Config\FileLocator;
-use Symfony\Component\HttpKernel\DependencyInjection\Extension;
-use Symfony\Component\DependencyInjection\Loader;
-use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
-use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
 use Chill\ActivityBundle\Security\Authorization\ActivityVoter;
+use Symfony\Component\Config\FileLocator;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
+use Symfony\Component\DependencyInjection\Loader;
+use Symfony\Component\HttpKernel\DependencyInjection\Extension;

 /**
- * This is the class that loads and manages your bundle configuration
+ * This is the class that loads and manages your bundle configuration.
 *
 * To learn more see {@link http://symfony.com/doc/current/cookbook/bundles/extension.html}
 */
 class ChillActivityExtension extends Extension implements PrependExtensionInterface
 {
-    /**
-     * {@inheritdoc}
-     */
    public function load(array $configs, ContainerBuilder $container)
    {
        $configuration = new Configuration();
@@ -47,7 +32,7 @@ class ChillActivityExtension extends Extension implements PrependExtensionInterf

        $container->setParameter('chill_activity.form.time_duration', $config['form']['time_duration']);

-        $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../config'));
+        $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__ . '/../config'));
        $loader->load('services.yaml');
        $loader->load('services/export.yaml');
        $loader->load('services/repositories.yaml');
@@ -56,6 +41,7 @@ class ChillActivityExtension extends Extension implements PrependExtensionInterf
        $loader->load('services/form.yaml');
        $loader->load('services/templating.yaml');
        $loader->load('services/accompanyingPeriodConsistency.yaml');
+        $loader->load('services/doctrine.entitylistener.yaml');
    }

    public function prepend(ContainerBuilder $container)
@@ -65,33 +51,38 @@ class ChillActivityExtension extends Extension implements PrependExtensionInterf
        $this->prependCruds($container);
    }

-    /* (non-PHPdoc)
+    public function prependAuthorization(ContainerBuilder $container)
+    {
+        $container->prependExtensionConfig('security', [
+            'role_hierarchy' => [
+                ActivityVoter::UPDATE => [ActivityVoter::SEE_DETAILS],
+                ActivityVoter::CREATE_PERSON => [ActivityVoter::SEE_DETAILS],
+                ActivityVoter::CREATE_ACCOMPANYING_COURSE => [ActivityVoter::SEE_DETAILS],
+                ActivityVoter::DELETE => [ActivityVoter::SEE_DETAILS],
+                ActivityVoter::SEE_DETAILS => [ActivityVoter::SEE],
+                ActivityVoter::FULL => [
+                    ActivityVoter::CREATE_PERSON,
+                    ActivityVoter::CREATE_ACCOMPANYING_COURSE,
+                    ActivityVoter::DELETE,
+                    ActivityVoter::UPDATE,
+                ],
+            ],
+        ]);
+    }
+
+    /** (non-PHPdoc).
     * @see \Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface::prepend()
     */
    public function prependRoutes(ContainerBuilder $container)
    {
        //add routes for custom bundle
-         $container->prependExtensionConfig('chill_main', array(
-           'routing' => array(
-              'resources' => array(
-                 '@ChillActivityBundle/config/routes.yaml'
-              )
-           )
-        ));
-    }
-
-    public function prependAuthorization(ContainerBuilder $container)
-    {
-        $container->prependExtensionConfig('security', array(
-           'role_hierarchy' => array(
-              ActivityVoter::UPDATE => array(ActivityVoter::SEE_DETAILS),
-              ActivityVoter::CREATE => array(ActivityVoter::SEE_DETAILS),
-              ActivityVoter::DELETE => array(ActivityVoter::SEE_DETAILS),
-              ActivityVoter::SEE_DETAILS => array(ActivityVoter::SEE),
-              ActivityVoter::FULL => [ActivityVoter::CREATE, ActivityVoter::DELETE,
-                   ActivityVoter::UPDATE],
-           )
-        ));
+        $container->prependExtensionConfig('chill_main', [
+            'routing' => [
+                'resources' => [
+                    '@ChillActivityBundle/config/routes.yaml',
+                ],
+            ],
+        ]);
    }

    protected function prependCruds(ContainerBuilder $container)
@@ -107,7 +98,7 @@ class ChillActivityExtension extends Extension implements PrependExtensionInterf
                    'actions' => [
                        'index' => [
                            'template' => '@ChillActivity/ActivityType/index.html.twig',
-                            'role' => 'ROLE_ADMIN'
+                            'role' => 'ROLE_ADMIN',
                        ],
                        'new' => [
                            'role' => 'ROLE_ADMIN',
@@ -116,8 +107,8 @@ class ChillActivityExtension extends Extension implements PrependExtensionInterf
                        'edit' => [
                            'role' => 'ROLE_ADMIN',
                            'template' => '@ChillActivity/ActivityType/edit.html.twig',
-                        ]
-                    ]
+                        ],
+                    ],
                ],
                [
                    'class' => \Chill\ActivityBundle\Entity\ActivityTypeCategory::class,
@@ -128,7 +119,7 @@ class ChillActivityExtension extends Extension implements PrependExtensionInterf
                    'actions' => [
                        'index' => [
                            'template' => '@ChillActivity/ActivityTypeCategory/index.html.twig',
-                            'role' => 'ROLE_ADMIN'
+                            'role' => 'ROLE_ADMIN',
                        ],
                        'new' => [
                            'role' => 'ROLE_ADMIN',
@@ -137,8 +128,8 @@ class ChillActivityExtension extends Extension implements PrependExtensionInterf
                        'edit' => [
                            'role' => 'ROLE_ADMIN',
                            'template' => '@ChillActivity/ActivityTypeCategory/edit.html.twig',
-                        ]
-                    ]
+                        ],
+                    ],
                ],
                [
                    'class' => \Chill\ActivityBundle\Entity\ActivityPresence::class,
@@ -149,7 +140,7 @@ class ChillActivityExtension extends Extension implements PrependExtensionInterf
                    'actions' => [
                        'index' => [
                            'template' => '@ChillActivity/ActivityPresence/index.html.twig',
-                            'role' => 'ROLE_ADMIN'
+                            'role' => 'ROLE_ADMIN',
                        ],
                        'new' => [
                            'role' => 'ROLE_ADMIN',
@@ -158,10 +149,10 @@ class ChillActivityExtension extends Extension implements PrependExtensionInterf
                        'edit' => [
                            'role' => 'ROLE_ADMIN',
                            'template' => '@ChillActivity/ActivityPresence/edit.html.twig',
-                        ]
-                    ]
                        ],
-            ]
+                    ],
+                ],
+            ],
        ]);
    }
 }
--- a/src/Bundle/ChillActivityBundle/DependencyInjection/Configuration.php
+++ b/src/Bundle/ChillActivityBundle/DependencyInjection/Configuration.php
@@ -1,20 +1,28 @@
 <?php

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

 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\ConfigurationInterface;

+use function is_int;
+
 /**
- * This is the class that validates and merges configuration from your app/config files
+ * This is the class that validates and merges configuration from your app/config files.
 *
 * To learn more see {@link http://symfony.com/doc/current/cookbook/bundles/extension.html#cookbook-bundles-extension-config-class}
 */
 class Configuration implements ConfigurationInterface
 {
-    /**
-     * {@inheritdoc}
-     */
    public function getConfigTreeBuilder()
    {
        $treeBuilder = new TreeBuilder('chill_activity');
@@ -29,40 +37,38 @@ class Configuration implements ConfigurationInterface
            ->isRequired()
            ->requiresAtLeastOneElement()
            ->defaultValue(
-                                    array(
-                                        [ 'label' => '5 minutes',  'seconds' => 300], 
-                                        [ 'label' => '10 minutes', 'seconds' => 600],
-                                        [ 'label' => '15 minutes', 'seconds' => 900],
-                                        [ 'label' => '20 minutes', 'seconds' => 1200],
-                                        [ 'label' => '25 minutes', 'seconds' => 1500],
-                                        [ 'label' => '30 minutes', 'seconds' => 1800],
-                                        [ 'label' => '45 minutes', 'seconds' => 2700],
-                                        [ 'label' => '1 hour',     'seconds' => 3600],
-                                        [ 'label' => '1 hour 15',  'seconds' => 4500],
-                                        [ 'label' => '1 hour 30',  'seconds' => 5400],
-                                        [ 'label' => '1 hour 45',  'seconds' => 6300],
-                                        [ 'label' => '2 hours',    'seconds' => 7200],
-                                        )
+                [
+                    ['label' => '5 minutes',  'seconds' => 300],
+                    ['label' => '10 minutes', 'seconds' => 600],
+                    ['label' => '15 minutes', 'seconds' => 900],
+                    ['label' => '20 minutes', 'seconds' => 1200],
+                    ['label' => '25 minutes', 'seconds' => 1500],
+                    ['label' => '30 minutes', 'seconds' => 1800],
+                    ['label' => '45 minutes', 'seconds' => 2700],
+                    ['label' => '1 hour',     'seconds' => 3600],
+                    ['label' => '1 hour 15',  'seconds' => 4500],
+                    ['label' => '1 hour 30',  'seconds' => 5400],
+                    ['label' => '1 hour 45',  'seconds' => 6300],
+                    ['label' => '2 hours',    'seconds' => 7200],
+                ]
            )
            ->info('The intervals of time to show in activity form')
-
            ->prototype('array')
            ->children()
            ->scalarNode('seconds')
-                                        ->info("The number of seconds of this duration. Must be an integer.")
+            ->info('The number of seconds of this duration. Must be an integer.')
            ->cannotBeEmpty()
            ->validate()
-                                            ->ifTrue(function($data) {
+            ->ifTrue(static function ($data) {
                return !is_int($data);
-                                            })->thenInvalid("The value %s is not a valid integer")
+            })->thenInvalid('The value %s is not a valid integer')
            ->end()
            ->end()
            ->scalarNode('label')
            ->cannotBeEmpty()
-                                        ->info("The label to show into fields")
+            ->info('The label to show into fields')
            ->end()
            ->end()
-
            ->end()
 //                            ->validate()
 //
@@ -86,7 +92,6 @@ class Configuration implements ConfigurationInterface
 //                            ->end()
            ->end()
            ->end()
-                
            ->end()
            ->end();

--- a/src/Bundle/ChillActivityBundle/Entity/Activity.php
+++ b/src/Bundle/ChillActivityBundle/Entity/Activity.php
@@ -1,119 +1,63 @@
 <?php

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

-use Chill\DocStoreBundle\Entity\Document;
+use Chill\ActivityBundle\Validator\Constraints as ActivityValidator;
+use Chill\DocStoreBundle\Entity\StoredObject;
+use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable;
+use Chill\MainBundle\Entity\HasCenterInterface;
+use Chill\MainBundle\Entity\HasScopeInterface;
 use Chill\MainBundle\Entity\Location;
+use Chill\MainBundle\Entity\Scope;
+use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Validator\Constraints\Entity\UserCircleConsistency;
 use Chill\PersonBundle\AccompanyingPeriod\SocialIssueConsistency\AccompanyingPeriodLinkedWithSocialIssuesEntityInterface;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Entity\SocialWork\SocialAction;
 use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
 use Chill\ThirdPartyBundle\Entity\ThirdParty;
-use Doctrine\ORM\Mapping as ORM;
-use Chill\MainBundle\Entity\Scope;
-use Chill\MainBundle\Entity\User;
-use Chill\MainBundle\Entity\Center;
-use Chill\PersonBundle\Entity\Person;
-use Chill\MainBundle\Entity\HasCenterInterface;
-use Chill\MainBundle\Entity\HasScopeInterface;
-use Doctrine\Common\Collections\Collection;
+use DateTime;
 use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\Common\Collections\Collection;
+use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Security\Core\User\UserInterface;
-use Symfony\Component\Serializer\Annotation\Groups;
 use Symfony\Component\Serializer\Annotation\DiscriminatorMap;
+use Symfony\Component\Serializer\Annotation\Groups;
+use Symfony\Component\Serializer\Annotation\SerializedName;

 /**
- * Class Activity
+ * Class Activity.
 *
- * @package Chill\ActivityBundle\Entity
 * @ORM\Entity(repositoryClass="Chill\ActivityBundle\Repository\ActivityRepository")
 * @ORM\Table(name="activity")
- * @ORM\HasLifecycleCallbacks()
+ * @ORM\HasLifecycleCallbacks
 * @DiscriminatorMap(typeProperty="type", mapping={
- *  "activity"=Activity::class
+ *     "activity": Activity::class
 * })
- */
-
-/*
- * TODO : revoir
- * @UserCircleConsistency(
+ * @ActivityValidator\ActivityValidity
+ *
+ * TODO see if necessary
+ * UserCircleConsistency(
 *     "CHILL_ACTIVITY_SEE_DETAILS",
 *     getUserFunction="getUser",
 * path="scope")
 */
-
-class Activity implements HasCenterInterface, HasScopeInterface, AccompanyingPeriodLinkedWithSocialIssuesEntityInterface
+class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterface, HasCenterInterface, HasScopeInterface
 {
-    const SENTRECEIVED_SENT = 'sent';
-    const SENTRECEIVED_RECEIVED = 'received';
+    public const SENTRECEIVED_RECEIVED = 'received';

-    /**
-     * @ORM\Id
-     * @ORM\Column(name="id", type="integer")
-     * @ORM\GeneratedValue(strategy="AUTO")
-     * @Groups({"read"})
-     */
-    private ?int $id = null;
-
-    /**
-     * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\User")
-     */
-    private User $user;
-
-    /**
-     * @ORM\Column(type="datetime")
-     */
-    private \DateTime $date;
-
-    /**
-     * @ORM\Column(type="time", nullable=true)
-     */
-    private ?\DateTime $durationTime = null;
-
-    /**
-     * @ORM\Column(type="time", nullable=true)
-     */
-    private ?\DateTime $travelTime = null;
-
-    /**
-     * @ORM\ManyToOne(targetEntity="Chill\ActivityBundle\Entity\ActivityPresence")
-     */
-    private ?ActivityPresence $attendee = null;
-
-    /**
-     * @ORM\ManyToMany(targetEntity="Chill\ActivityBundle\Entity\ActivityReason")
-     */
-    private Collection $reasons;
-
-    /**
-     * @ORM\ManyToMany(targetEntity="Chill\PersonBundle\Entity\SocialWork\SocialIssue")
-     * @ORM\JoinTable(name="chill_activity_activity_chill_person_socialissue")
-     * @Groups({"read"})
-     */
-    private Collection $socialIssues;
-
-    /**
-     * @ORM\ManyToMany(targetEntity="Chill\PersonBundle\Entity\SocialWork\SocialAction")
-     * @ORM\JoinTable(name="chill_activity_activity_chill_person_socialaction")
-     * @Groups({"read"})
-     */
-    private Collection $socialActions;
-
-    /**
-     * @ORM\ManyToOne(targetEntity="Chill\ActivityBundle\Entity\ActivityType")
-     */
-    private ActivityType $type;
-
-    /**
-     * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\Scope")
-     */
-    private ?Scope $scope = null;
-
-    /**
-     * @ORM\ManyToOne(targetEntity="Chill\PersonBundle\Entity\Person")
-     */
-    private ?Person $person = null;
+    public const SENTRECEIVED_SENT = 'sent';

    /**
     * @ORM\ManyToOne(targetEntity="Chill\PersonBundle\Entity\AccompanyingPeriod")
@@ -121,22 +65,31 @@ class Activity implements HasCenterInterface, HasScopeInterface, AccompanyingPer
     */
    private ?AccompanyingPeriod $accompanyingPeriod = null;

+    /**
+     * @ORM\ManyToOne(targetEntity="Chill\ActivityBundle\Entity\ActivityType")
+     * @Groups({"read", "docgen:read"})
+     * @SerializedName("activityType")
+     * @ORM\JoinColumn(name="type_id")
+     */
+    private ActivityType $activityType;
+
+    /**
+     * @ORM\ManyToOne(targetEntity="Chill\ActivityBundle\Entity\ActivityPresence")
+     * @Groups({"docgen:read"})
+     */
+    private ?ActivityPresence $attendee = null;
+
    /**
     * @ORM\Embedded(class="Chill\MainBundle\Entity\Embeddable\CommentEmbeddable", columnPrefix="comment_")
+     * @Groups({"docgen:read"})
     */
    private CommentEmbeddable $comment;

    /**
-     * @ORM\ManyToMany(targetEntity="Chill\PersonBundle\Entity\Person")
-     * @Groups({"read"})
+     * @ORM\Column(type="datetime")
+     * @Groups({"docgen:read"})
     */
-    private ?Collection $persons = null;
-
-    /**
-     * @ORM\ManyToMany(targetEntity="Chill\ThirdPartyBundle\Entity\ThirdParty")
-     * @Groups({"read"})
-     */
-    private ?Collection $thirdParties = null;
+    private DateTime $date;

    /**
     * @ORM\ManyToMany(targetEntity="Chill\DocStoreBundle\Entity\StoredObject", cascade={"persist"})
@@ -144,27 +97,95 @@ class Activity implements HasCenterInterface, HasScopeInterface, AccompanyingPer
    private Collection $documents;

    /**
-     * @ORM\ManyToMany(targetEntity="Chill\MainBundle\Entity\User")
-     * @Groups({"read"})
+     * @ORM\Column(type="time", nullable=true)
     */
-    private ?Collection $users = null;
+    private ?DateTime $durationTime = null;

    /**
-     * @ORM\Column(type="boolean", options={"default"=false})
+     * @ORM\Column(type="boolean", options={"default": false})
+     * @Groups({"docgen:read"})
     */
    private bool $emergency = false;

    /**
-     * @ORM\Column(type="string", options={"default"=""})
+     * @ORM\Id
+     * @ORM\Column(name="id", type="integer")
+     * @ORM\GeneratedValue(strategy="AUTO")
+     * @Groups({"read", "docgen:read"})
+     */
+    private ?int $id = null;
+
+    /**
+     * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\Location")
+     * @groups({"read", "docgen:read"})
+     */
+    private ?Location $location = null;
+
+    /**
+     * @ORM\ManyToOne(targetEntity="Chill\PersonBundle\Entity\Person")
+     */
+    private ?Person $person = null;
+
+    /**
+     * @ORM\ManyToMany(targetEntity="Chill\PersonBundle\Entity\Person")
+     * @Groups({"read", "docgen:read"})
+     */
+    private ?Collection $persons = null;
+
+    /**
+     * @ORM\ManyToMany(targetEntity="Chill\ActivityBundle\Entity\ActivityReason")
+     * @Groups({"docgen:read"})
+     */
+    private Collection $reasons;
+
+    /**
+     * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\Scope")
+     * @Groups({"docgen:read"})
+     */
+    private ?Scope $scope = null;
+
+    /**
+     * @ORM\Column(type="string", options={"default": ""})
+     * @Groups({"docgen:read"})
     */
    private string $sentReceived = '';

    /**
-     * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\Location")
-     * @groups({"read"})
+     * @ORM\ManyToMany(targetEntity="Chill\PersonBundle\Entity\SocialWork\SocialAction")
+     * @ORM\JoinTable(name="chill_activity_activity_chill_person_socialaction")
+     * @Groups({"read", "docgen:read"})
     */
-    private ?Location $location = null;
+    private Collection $socialActions;

+    /**
+     * @ORM\ManyToMany(targetEntity="Chill\PersonBundle\Entity\SocialWork\SocialIssue")
+     * @ORM\JoinTable(name="chill_activity_activity_chill_person_socialissue")
+     * @Groups({"read", "docgen:read"})
+     */
+    private Collection $socialIssues;
+
+    /**
+     * @ORM\ManyToMany(targetEntity="Chill\ThirdPartyBundle\Entity\ThirdParty")
+     * @Groups({"read", "docgen:read"})
+     */
+    private ?Collection $thirdParties = null;
+
+    /**
+     * @ORM\Column(type="time", nullable=true)
+     */
+    private ?DateTime $travelTime = null;
+
+    /**
+     * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\User")
+     * @Groups({"docgen:read"})
+     */
+    private User $user;
+
+    /**
+     * @ORM\ManyToMany(targetEntity="Chill\MainBundle\Entity\User")
+     * @Groups({"read", "docgen:read"})
+     */
+    private ?Collection $users = null;

    public function __construct()
    {
@@ -178,71 +199,27 @@ class Activity implements HasCenterInterface, HasScopeInterface, AccompanyingPer
        $this->socialActions = new ArrayCollection();
    }

-    public function getId(): ?int
+    public function addDocument(StoredObject $document): self
    {
-        return $this->id;
-    }
-
-    public function setUser(UserInterface $user): self
-    {
-        $this->user = $user;
+        $this->documents[] = $document;

        return $this;
    }

-    public function getUser(): User
+    /**
+     * Add a person to the person list.
+     */
+    public function addPerson(?Person $person): self
    {
-        return $this->user;
+        if (null !== $person) {
+            if (!$this->persons->contains($person)) {
+                $this->persons[] = $person;
+            }
        }
-
-    public function setDate(\DateTime $date): self
-    {
-        $this->date = $date;

        return $this;
    }

-    public function getDate(): \DateTime
-    {
-        return $this->date;
-    }
-
-    public function setDurationTime(?\DateTime $durationTime): self
-    {
-        $this->durationTime = $durationTime;
-
-        return $this;
-    }
-
-    public function getDurationTime(): ?\DateTime
-    {
-        return $this->durationTime;
-    }
-
-    public function setTravelTime(\DateTime $travelTime): self
-    {
-        $this->travelTime = $travelTime;
-
-        return $this;
-    }
-
-    public function getTravelTime(): ?\DateTime
-    {
-        return $this->travelTime;
-    }
-
-    public function setAttendee(ActivityPresence $attendee): self
-    {
-        $this->attendee = $attendee;
-
-        return $this;
-    }
-
-    public function getAttendee(): ?ActivityPresence
-    {
-        return $this->attendee;
-    }
-
    public function addReason(ActivityReason $reason): self
    {
        $this->reasons->add($reason);
@@ -250,49 +227,6 @@ class Activity implements HasCenterInterface, HasScopeInterface, AccompanyingPer
        return $this;
    }

-    public function removeReason(ActivityReason $reason): void
-    {
-        $this->reasons->removeElement($reason);
-    }
-
-    public function getReasons(): Collection
-    {
-        return $this->reasons;
-    }
-
-    public function setReasons(?ArrayCollection $reasons): self
-    {
-        $this->reasons = $reasons;
-
-        return $this;
-    }
-
-    public function getSocialIssues(): Collection
-    {
-        return $this->socialIssues;
-    }
-
-    public function addSocialIssue(SocialIssue $socialIssue): self
-    {
-        if (!$this->socialIssues->contains($socialIssue)) {
-            $this->socialIssues[] = $socialIssue;
-        }
-
-        return $this;
-    }
-
-    public function removeSocialIssue(SocialIssue $socialIssue): self
-    {
-        $this->socialIssues->removeElement($socialIssue);
-
-        return $this;
-    }
-
-    public function getSocialActions(): Collection
-    {
-        return $this->socialActions;
-    }
-
    public function addSocialAction(SocialAction $socialAction): self
    {
        if (!$this->socialActions->contains($socialAction)) {
@@ -302,67 +236,55 @@ class Activity implements HasCenterInterface, HasScopeInterface, AccompanyingPer
        return $this;
    }

-    public function removeSocialAction(SocialAction $socialAction): self
+    public function addSocialIssue(SocialIssue $socialIssue): self
    {
-        $this->socialActions->removeElement($socialAction);
+        if (!$this->socialIssues->contains($socialIssue)) {
+            $this->socialIssues[] = $socialIssue;
+        }

        return $this;
    }

-
-
-
-    public function setType(ActivityType $type): self
+    public function addThirdParty(?ThirdParty $thirdParty): self
    {
-        $this->type = $type;
+        if (null !== $thirdParty) {
+            if (!$this->thirdParties->contains($thirdParty)) {
+                $this->thirdParties[] = $thirdParty;
+            }
+        }

        return $this;
    }

-    public function getType(): ActivityType
+    public function addUser(?User $user): self
    {
-        return $this->type;
+        if (null !== $user) {
+            if (!$this->users->contains($user)) {
+                $this->users[] = $user;
+            }
        }
-
-    public function setScope(Scope $scope): self
-    {
-        $this->scope = $scope;

        return $this;
    }

-    public function getScope(): ?Scope
-    {
-        return $this->scope;
-    }
-
-    public function setPerson(?Person $person): self
-    {
-        $this->person = $person;
-
-        return $this;
-    }
-
-    public function getPerson(): ?Person
-    {
-        return $this->person;
-    }
-
    public function getAccompanyingPeriod(): ?AccompanyingPeriod
    {
        return $this->accompanyingPeriod;
    }

-    public function setAccompanyingPeriod(?AccompanyingPeriod $accompanyingPeriod): self
+    public function getActivityType(): ActivityType
    {
-        $this->accompanyingPeriod = $accompanyingPeriod;
+        return $this->activityType;
+    }

-        return $this;
+    public function getAttendee(): ?ActivityPresence
+    {
+        return $this->attendee;
    }

    /**
     * get the center
-     * center is extracted from person
+     * center is extracted from person.
     */
    public function getCenter(): ?Center
    {
@@ -378,28 +300,51 @@ class Activity implements HasCenterInterface, HasScopeInterface, AccompanyingPer
        return $this->comment;
    }

-    public function setComment(CommentEmbeddable $comment): self
+    public function getDate(): DateTime
    {
-        $this->comment = $comment;
+        return $this->date;
+    }

-        return $this;
+    public function getDocuments(): Collection
+    {
+        return $this->documents;
    }

    /**
-     * Add a person to the person list
+     * @Groups({"docgen:read"})
     */
-    public function addPerson(?Person $person): self
+    public function getDurationMinute(): int
    {
-        if (null !== $person) {
-            $this->persons[] = $person;
+        if (null === $this->durationTime) {
+            return 0;
        }

-        return $this;
+        return (int) round(($this->durationTime->getTimestamp() + $this->durationTime->getOffset()) / 60.0, 0);
    }

-    public function removePerson(Person $person): void
+    public function getDurationTime(): ?DateTime
    {
-        $this->persons->removeElement($person);
+        return $this->durationTime;
+    }
+
+    public function getEmergency(): bool
+    {
+        return $this->emergency;
+    }
+
+    public function getId(): ?int
+    {
+        return $this->id;
+    }
+
+    public function getLocation(): ?Location
+    {
+        return $this->location;
+    }
+
+    public function getPerson(): ?Person
+    {
+        return $this->person;
    }

    public function getPersons(): Collection
@@ -411,13 +356,16 @@ class Activity implements HasCenterInterface, HasScopeInterface, AccompanyingPer
    {
        if (null !== $this->accompanyingPeriod) {
            $personsAssociated = [];
+
            foreach ($this->accompanyingPeriod->getParticipations() as $participation) {
                if ($this->persons->contains($participation->getPerson())) {
                    $personsAssociated[] = $participation->getPerson();
                }
            }
+
            return $personsAssociated;
        }
+
        return [];
    }

@@ -425,28 +373,116 @@ class Activity implements HasCenterInterface, HasScopeInterface, AccompanyingPer
    {
        if (null !== $this->accompanyingPeriod) {
            $personsNotAssociated = [];
+
+            // TODO better semantic with:  return $this->persons->filter(...);
            foreach ($this->persons as $person) {
-                if (!in_array($person, $this->getPersonsAssociated())) {
+                if ($this->accompanyingPeriod->getOpenParticipationContainsPerson($person) === null) {
                    $personsNotAssociated[] = $person;
                }
            }
+
            return $personsNotAssociated;
        }
+
        return [];
    }

-    public function setPersons(?Collection $persons): self
+    public function getReasons(): Collection
    {
-        $this->persons = $persons;
+        return $this->reasons;
+    }
+
+    public function getScope(): ?Scope
+    {
+        return $this->scope;
+    }
+
+    public function getSentReceived(): string
+    {
+        return $this->sentReceived;
+    }
+
+    public function getSocialActions(): Collection
+    {
+        return $this->socialActions;
+    }
+
+    public function getSocialIssues(): Collection
+    {
+        return $this->socialIssues;
+    }
+
+    public function getThirdParties(): Collection
+    {
+        return $this->thirdParties;
+    }
+
+    public function getTravelTime(): ?DateTime
+    {
+        return $this->travelTime;
+    }
+
+    /**
+     * @Groups({"docgen:read"})
+     */
+    public function getTravelTimeMinute(): int
+    {
+        if (null === $this->travelTime) {
+            return 0;
+        }
+
+        return (int) round(($this->travelTime->getTimestamp() + $this->travelTime->getOffset()) / 60.0, 0);
+    }
+
+    /**
+     * @deprecated
+     */
+    public function getType(): ActivityType
+    {
+        return $this->activityType;
+    }
+
+    public function getUser(): User
+    {
+        return $this->user;
+    }
+
+    public function getUsers(): Collection
+    {
+        return $this->users;
+    }
+
+    public function isEmergency(): bool
+    {
+        return $this->getEmergency();
+    }
+
+    public function removeDocument(StoredObject $document): void
+    {
+        $this->documents->removeElement($document);
+    }
+
+    public function removePerson(Person $person): void
+    {
+        $this->persons->removeElement($person);
+    }
+
+    public function removeReason(ActivityReason $reason): void
+    {
+        $this->reasons->removeElement($reason);
+    }
+
+    public function removeSocialAction(SocialAction $socialAction): self
+    {
+        $this->socialActions->removeElement($socialAction);

        return $this;
    }

-    public function addThirdParty(?ThirdParty $thirdParty): self
+    public function removeSocialIssue(SocialIssue $socialIssue): self
    {
-        if (null !== $thirdParty) {
-           $this->thirdParties[] = $thirdParty;
-        }
+        $this->socialIssues->removeElement($socialIssue);
+
        return $this;
    }

@@ -455,33 +491,44 @@ class Activity implements HasCenterInterface, HasScopeInterface, AccompanyingPer
        $this->thirdParties->removeElement($thirdParty);
    }

-    public function getThirdParties(): Collection
+    public function removeUser(User $user): void
    {
-        return $this->thirdParties;
+        $this->users->removeElement($user);
    }

-    public function setThirdParties(?Collection $thirdParties): self
+    public function setAccompanyingPeriod(?AccompanyingPeriod $accompanyingPeriod): self
    {
-        $this->thirdParties = $thirdParties;
+        $this->accompanyingPeriod = $accompanyingPeriod;

        return $this;
    }

-    public function addDocument(Document $document): self
+    public function setActivityType(ActivityType $activityType): self
    {
-        $this->documents[] = $document;
+        $this->activityType = $activityType;

        return $this;
    }

-    public function removeDocument(Document $document): void
+    public function setAttendee(ActivityPresence $attendee): self
    {
-        $this->documents->removeElement($document);
+        $this->attendee = $attendee;
+
+        return $this;
    }

-    public function getDocuments(): Collection
+    public function setComment(CommentEmbeddable $comment): self
    {
-        return $this->documents;
+        $this->comment = $comment;
+
+        return $this;
+    }
+
+    public function setDate(DateTime $date): self
+    {
+        $this->date = $date;
+
+        return $this;
    }

    public function setDocuments(Collection $documents): self
@@ -491,41 +538,13 @@ class Activity implements HasCenterInterface, HasScopeInterface, AccompanyingPer
        return $this;
    }

-    public function addUser(?User $user): self
+    public function setDurationTime(?DateTime $durationTime): self
    {
-        if (null !== $user) {
-            $this->users[] = $user;
-        }
-        return $this;
-    }
-
-    public function removeUser(User $user): void
-    {
-        $this->users->removeElement($user);
-    }
-
-    public function getUsers(): Collection
-    {
-        return $this->users;
-    }
-
-    public function setUsers(?Collection $users): self
-    {
-        $this->users = $users;
+        $this->durationTime = $durationTime;

        return $this;
    }

-    public function isEmergency(): bool
-    {
-        return $this->getEmergency();
-    }
-
-    public function getEmergency(): bool
-    {
-        return $this->emergency;
-    }
-
    public function setEmergency(bool $emergency): self
    {
        $this->emergency = $emergency;
@@ -533,9 +552,39 @@ class Activity implements HasCenterInterface, HasScopeInterface, AccompanyingPer
        return $this;
    }

-    public function getSentReceived(): string
+    public function setLocation(?Location $location): Activity
    {
-        return $this->sentReceived;
+        $this->location = $location;
+
+        return $this;
+    }
+
+    public function setPerson(?Person $person): self
+    {
+        $this->person = $person;
+
+        return $this;
+    }
+
+    public function setPersons(?Collection $persons): self
+    {
+        $this->persons = $persons;
+
+        return $this;
+    }
+
+    public function setReasons(?ArrayCollection $reasons): self
+    {
+        $this->reasons = $reasons;
+
+        return $this;
+    }
+
+    public function setScope(Scope $scope): self
+    {
+        $this->scope = $scope;
+
+        return $this;
    }

    public function setSentReceived(?string $sentReceived): self
@@ -545,21 +594,41 @@ class Activity implements HasCenterInterface, HasScopeInterface, AccompanyingPer
        return $this;
    }

-    /**
-     * @return Location|null
-     */
-    public function getLocation(): ?Location
+    public function setThirdParties(?Collection $thirdParties): self
    {
-        return $this->location;
+        $this->thirdParties = $thirdParties;
+
+        return $this;
+    }
+
+    public function setTravelTime(DateTime $travelTime): self
+    {
+        $this->travelTime = $travelTime;
+
+        return $this;
    }

    /**
-     * @param Location|null $location
-     * @return Activity
+     * @deprecated
     */
-    public function setLocation(?Location $location): Activity
+    public function setType(ActivityType $activityType): self
    {
-        $this->location = $location;
+        $this->activityType = $activityType;
+
+        return $this;
+    }
+
+    public function setUser(UserInterface $user): self
+    {
+        $this->user = $user;
+
+        return $this;
+    }
+
+    public function setUsers(?Collection $users): self
+    {
+        $this->users = $users;
+
        return $this;
    }
 }
--- a/src/Bundle/ChillActivityBundle/Entity/ActivityPresence.php
+++ b/src/Bundle/ChillActivityBundle/Entity/ActivityPresence.php
@@ -1,70 +1,47 @@
 <?php

-/*
+/**
+ * Chill is a software for social workers
 *
- * Copyright (C) 2015, Champs Libres Cooperative SCRLFS, <http://www.champs-libres.coop>
- *
- * This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- *  License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
 */

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

 use Doctrine\ORM\Mapping as ORM;
+use Symfony\Component\Serializer\Annotation as Serializer;

 /**
- * Class ActivityPresence
+ * Class ActivityPresence.
 *
- * @package Chill\ActivityBundle\Entity
- * @ORM\Entity()
+ * @ORM\Entity
 * @ORM\Table(name="activitytpresence")
- * @ORM\HasLifecycleCallbacks()
+ * @ORM\HasLifecycleCallbacks
 */
 class ActivityPresence
 {
-    /**
-     * @ORM\Id
-     * @ORM\Column(name="id", type="integer")
-     * @ORM\GeneratedValue(strategy="AUTO")
-     */
-    private ?int $id;
-
-    /**
-     * @ORM\Column(type="json")
-     */
-    private array $name = [];
-
    /**
     * @ORM\Column(type="boolean")
     */
    private bool $active = true;

-    public function getId(): int
-    {
-        return $this->id;
-    }
+    /**
+     * @ORM\Id
+     * @ORM\Column(name="id", type="integer")
+     * @ORM\GeneratedValue(strategy="AUTO")
+     * @Serializer\Groups({"docgen:read"})
+     */
+    private ?int $id;

-    public function setName(array $name): self
-    {
-        $this->name = $name;
-
-        return $this;
-    }
-
-    public function getName(): array
-    {
-        return $this->name;
-    }
+    /**
+     * @ORM\Column(type="json")
+     * @Serializer\Groups({"docgen:read"})
+     * @Serializer\Context({"is-translatable": true}, groups={"docgen:read"})
+     */
+    private array $name = [];

    /**
     * Get active
@@ -75,9 +52,19 @@ class ActivityPresence
        return $this->active;
    }

+    public function getId(): int
+    {
+        return $this->id;
+    }
+
+    public function getName(): array
+    {
+        return $this->name;
+    }
+
    /**
     * Is active
-     * return true if the category type is active
+     * return true if the category type is active.
     */
    public function isActive(): bool
    {
@@ -86,7 +73,7 @@ class ActivityPresence

    /**
     * Set active
-     * set to true if the category type is active
+     * set to true if the category type is active.
     */
    public function setActive(bool $active): self
    {
@@ -94,4 +81,11 @@ class ActivityPresence

        return $this;
    }
+
+    public function setName(array $name): self
+    {
+        $this->name = $name;
+
+        return $this;
+    }
 }
--- a/src/Bundle/ChillActivityBundle/Entity/ActivityReason.php
+++ b/src/Bundle/ChillActivityBundle/Entity/ActivityReason.php
@@ -1,40 +1,43 @@
 <?php

-/*
+/**
+ * Chill is a software for social workers
 *
- * Copyright (C) 2015, Champs Libres Cooperative SCRLFS, <http://www.champs-libres.coop>
- *
- * This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- *  License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
 */

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

 use Doctrine\ORM\Mapping as ORM;
-use Chill\ActivityBundle\Entity\ActivityReasonCategory;

 /**
- * Class ActivityReason
+ * Class ActivityReason.
 *
- * @package Chill\ActivityBundle\Entity
- * @ORM\Entity()
+ * @ORM\Entity
 * @ORM\Table(name="activityreason")
- * @ORM\HasLifecycleCallbacks()
+ * @ORM\HasLifecycleCallbacks
 */
 class ActivityReason
 {
    /**
-     * @var integer
+     * @var bool
+     * @ORM\Column(type="boolean")
+     */
+    private $active = true;
+
+    /**
+     * @var ActivityReasonCategory
+     * @ORM\ManyToOne(
+     *     targetEntity="Chill\ActivityBundle\Entity\ActivityReasonCategory",
+     * inversedBy="reasons")
+     */
+    private $category;
+
+    /**
+     * @var int
     *
     * @ORM\Id
     * @ORM\Column(name="id", type="integer")
@@ -49,86 +52,17 @@ class ActivityReason
    private $name;

    /**
-     * @var ActivityReasonCategory
-     * @ORM\ManyToOne(
-     *     targetEntity="Chill\ActivityBundle\Entity\ActivityReasonCategory",
-     *     inversedBy="reasons")
-     */
-    private $category;
-
-    /**
-     * @var boolean
-     * @ORM\Column(type="boolean")
-     */
-    private $active = true;
-
-
-    /**
-     * Get id
+     * Get active.
     *
-     * @return integer
+     * @return bool
     */
-    public function getId()
+    public function getActive()
    {
-        return $this->id;
+        return $this->active;
    }

    /**
-     * Set name
-     *
-     * @param array $name
-     * @return ActivityReason
-     */
-    public function setName($name)
-    {
-        $this->name = $name;
-
-        return $this;
-    }
-
-    /**
-     * Get name
-     *
-     * @return array | string
-     */
-    public function getName($locale = null)
-    {
-        if ($locale) {
-            if (isset($this->name[$locale])) {
-                return $this->name[$locale];
-            } else {
-                foreach ($this->name as $name) {
-                    if (!empty($name)) {
-                        return $name;
-                    }
-                }
-            }
-            return '';
-        } else {
-            return $this->name;
-        }
-    }
-
-    /**
-     * Set category of the reason. If you set to the reason an inactive
-     * category, the reason will become inactive
-     *
-     * @param ActivityReasonCategory $category
-     * @return ActivityReason
-     */
-    public function setCategory(ActivityReasonCategory $category)
-    {
-        if($this->category !== $category && ! $category->getActive()) {
-            $this->setActive(False);
-        }
-
-        $this->category = $category;
-
-        return $this;
-    }
-
-    /**
-     * Get category
+     * Get category.
     *
     * @return ActivityReasonCategory
     */
@@ -138,9 +72,46 @@ class ActivityReason
    }

    /**
-     * Set active
+     * Get id.
+     *
+     * @return int
+     */
+    public function getId()
+    {
+        return $this->id;
+    }
+
+    /**
+     * Get name.
+     *
+     * @param mixed|null $locale
+     *
+     * @return array | string
+     */
+    public function getName($locale = null)
+    {
+        if ($locale) {
+            if (isset($this->name[$locale])) {
+                return $this->name[$locale];
+            }
+
+            foreach ($this->name as $name) {
+                if (!empty($name)) {
+                    return $name;
+                }
+            }
+
+            return '';
+        }
+
+        return $this->name;
+    }
+
+    /**
+     * Set active.
+     *
+     * @param bool $active
     *
-     * @param boolean $active
     * @return ActivityReason
     */
    public function setActive($active)
@@ -151,13 +122,33 @@ class ActivityReason
    }

    /**
-     * Get active
+     * Set category of the reason. If you set to the reason an inactive
+     * category, the reason will become inactive.
     *
-     * @return boolean
+     * @return ActivityReason
     */
-    public function getActive()
+    public function setCategory(ActivityReasonCategory $category)
    {
-        return $this->active;
+        if ($this->category !== $category && !$category->getActive()) {
+            $this->setActive(false);
+        }
+
+        $this->category = $category;
+
+        return $this;
+    }
+
+    /**
+     * Set name.
+     *
+     * @param array $name
+     *
+     * @return ActivityReason
+     */
+    public function setName($name)
+    {
+        $this->name = $name;
+
+        return $this;
    }
 }
-
--- a/src/Bundle/ChillActivityBundle/Entity/ActivityReasonCategory.php
+++ b/src/Bundle/ChillActivityBundle/Entity/ActivityReasonCategory.php
@@ -1,39 +1,36 @@
 <?php

-/*
- * Copyright (C) 2015, Champs Libres Cooperative SCRLFS, <http://www.champs-libres.coop>
+/**
+ * Chill is a software for social workers
 *
- * This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- *  License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
 */

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

-use Doctrine\ORM\Mapping as ORM;
 use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\ORM\Mapping as ORM;

 /**
- * Class ActivityReasonCategory
+ * Class ActivityReasonCategory.
 *
- * @package Chill\ActivityBundle\Entity
- * @ORM\Entity()
+ * @ORM\Entity
 * @ORM\Table(name="activityreasoncategory")
- * @ORM\HasLifecycleCallbacks()
+ * @ORM\HasLifecycleCallbacks
 */
 class ActivityReasonCategory
 {
    /**
-     * @var integer
+     * @var bool
+     * @ORM\Column(type="boolean")
+     */
+    private $active = true;
+
+    /**
+     * @var int
     *
     * @ORM\Id
     * @ORM\Column(name="id", type="integer")
@@ -48,13 +45,8 @@ class ActivityReasonCategory
    private $name;

    /**
-     * @var boolean
-     * @ORM\Column(type="boolean")
-     */
-    private $active = true;
-
-    /**
-     * Array of ActivityReason
+     * Array of ActivityReason.
+     *
     * @var ArrayCollection
     * @ORM\OneToMany(
     *     targetEntity="Chill\ActivityBundle\Entity\ActivityReason",
@@ -75,13 +67,23 @@ class ActivityReasonCategory
     */
    public function __toString()
    {
-        return 'ActivityReasonCategory('.$this->getName('x').')';
+        return 'ActivityReasonCategory(' . $this->getName('x') . ')';
    }

    /**
-     * Get id
+     * Get active.
     *
-     * @return integer
+     * @return bool
+     */
+    public function getActive()
+    {
+        return $this->active;
+    }
+
+    /**
+     * Get id.
+     *
+     * @return int
     */
    public function getId()
    {
@@ -89,20 +91,9 @@ class ActivityReasonCategory
    }

    /**
-     * Set name
+     * Get name.
     *
-     * @param array $name
-     * @return ActivityReasonCategory
-     */
-    public function setName($name)
-    {
-        $this->name = $name;
-
-        return $this;
-    }
-
-    /**
-     * Get name
+     * @param mixed|null $locale
     *
     * @return array
     */
@@ -111,30 +102,32 @@ class ActivityReasonCategory
        if ($locale) {
            if (isset($this->name[$locale])) {
                return $this->name[$locale];
-            } else {
+            }
+
            foreach ($this->name as $name) {
                if (!empty($name)) {
                    return $name;
                }
            }
-            }
+
            return '';
-        } else {
-            return $this->name;
        }
+
+        return $this->name;
    }

    /**
     * Declare a category as active (or not). When a category is set
     * as unactive, all the reason have this entity as category is also
-     * set as unactive
+     * set as unactive.
+     *
+     * @param bool $active
     *
-     * @param boolean $active
     * @return ActivityReasonCategory
     */
    public function setActive($active)
    {
-        if($this->active !== $active && !$active) {
+        if ($this->active !== $active && !$active) {
            foreach ($this->reasons as $reason) {
                $reason->setActive($active);
            }
@@ -146,13 +139,16 @@ class ActivityReasonCategory
    }

    /**
-     * Get active
+     * Set name.
     *
-     * @return boolean
+     * @param array $name
+     *
+     * @return ActivityReasonCategory
     */
-    public function getActive()
+    public function setName($name)
    {
-        return $this->active;
+        $this->name = $name;
+
+        return $this;
    }
 }
-
--- a/src/Bundle/ChillActivityBundle/Entity/ActivityType.php
+++ b/src/Bundle/ChillActivityBundle/Entity/ActivityType.php
--- a/src/Bundle/ChillActivityBundle/Entity/ActivityTypeCategory.php
+++ b/src/Bundle/ChillActivityBundle/Entity/ActivityTypeCategory.php
@@ -1,5 +1,12 @@
 <?php

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

 namespace Chill\ActivityBundle\Entity;
@@ -7,12 +14,17 @@ namespace Chill\ActivityBundle\Entity;
 use Doctrine\ORM\Mapping as ORM;

 /**
- * @ORM\Entity()
+ * @ORM\Entity
 * @ORM\Table(name="activitytypecategory")
- * @ORM\HasLifecycleCallbacks()
+ * @ORM\HasLifecycleCallbacks
 */
 class ActivityTypeCategory
 {
+    /**
+     * @ORM\Column(type="boolean")
+     */
+    private bool $active = true;
+
    /**
     * @ORM\Id
     * @ORM\Column(name="id", type="integer")
@@ -26,38 +38,10 @@ class ActivityTypeCategory
    private array $name = [];

    /**
-     * @ORM\Column(type="boolean")
-     */
-    private bool $active = true;
-
-    /**
-     * @ORM\Column(type="float", options={"default"="0.0"})
+     * @ORM\Column(type="float", options={"default": "0.0"})
     */
    private float $ordering = 0.0;

-    public function getId(): ?int
-    {
-        return $this->id;
-    }
-
-    /**
-     * Set name
-     */
-    public function setName(array $name): self
-    {
-        $this->name = $name;
-
-        return $this;
-    }
-
-    /**
-     * Get name
-     */
-    public function getName(): array
-    {
-        return $this->name;
-    }
-
    /**
     * Get active
     * return true if the category type is active.
@@ -67,9 +51,27 @@ class ActivityTypeCategory
        return $this->active;
    }

+    public function getId(): ?int
+    {
+        return $this->id;
+    }
+
+    /**
+     * Get name.
+     */
+    public function getName(): array
+    {
+        return $this->name;
+    }
+
+    public function getOrdering(): float
+    {
+        return $this->ordering;
+    }
+
    /**
     * Is active
-     * return true if the category type is active
+     * return true if the category type is active.
     */
    public function isActive(): bool
    {
@@ -78,7 +80,7 @@ class ActivityTypeCategory

    /**
     * Set active
-     * set to true if the category type is active
+     * set to true if the category type is active.
     */
    public function setActive(bool $active): self
    {
@@ -87,9 +89,14 @@ class ActivityTypeCategory
        return $this;
    }

-    public function getOrdering(): float
+    /**
+     * Set name.
+     */
+    public function setName(array $name): self
    {
-        return $this->ordering;
+        $this->name = $name;
+
+        return $this;
    }

    public function setOrdering(float $ordering): self
--- a/src/Bundle/ChillActivityBundle/EntityListener/ActivityEntityListener.php
+++ b/src/Bundle/ChillActivityBundle/EntityListener/ActivityEntityListener.php
@@ -0,0 +1,77 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\ActivityBundle\EntityListener;
+
+use Chill\ActivityBundle\Entity\Activity;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork;
+use Chill\PersonBundle\Repository\AccompanyingPeriod\AccompanyingPeriodWorkRepository;
+use DateTimeImmutable;
+use Doctrine\ORM\EntityManagerInterface;
+
+use function in_array;
+
+class ActivityEntityListener
+{
+    private EntityManagerInterface $em;
+
+    private AccompanyingPeriodWorkRepository $workRepository;
+
+    public function __construct(EntityManagerInterface $em, AccompanyingPeriodWorkRepository $workRepository)
+    {
+        $this->em = $em;
+        $this->workRepository = $workRepository;
+    }
+
+    public function persistActionToCourse(Activity $activity)
+    {
+        if ($activity->getAccompanyingPeriod() instanceof AccompanyingPeriod) {
+            $period = $activity->getAccompanyingPeriod();
+
+            $accompanyingCourseWorks = $this->workRepository->findByAccompanyingPeriod($period);
+            $periodActions = [];
+            $now = new DateTimeImmutable();
+
+            foreach ($accompanyingCourseWorks as $key => $work) {
+                // take only the actions which are still opened
+                if ($work->getEndDate() === null || $work->getEndDate() > ($activity->getDate() ?? $now)) {
+                    $periodActions[$key] = spl_object_hash($work->getSocialAction());
+                }
+            }
+
+            $associatedPersons = $activity->getPersonsAssociated();
+            $associatedThirdparties = $activity->getThirdParties();
+
+            foreach ($activity->getSocialActions() as $action) {
+                if (in_array(spl_object_hash($action), $periodActions, true)) {
+                    continue;
+                }
+                $newAction = new AccompanyingPeriodWork();
+                $newAction->setSocialAction($action);
+                $period->addWork($newAction);
+
+                $date = DateTimeImmutable::createFromMutable($activity->getDate());
+                $newAction->setStartDate($date);
+
+                foreach ($associatedPersons as $person) {
+                    $newAction->addPerson($person);
+                }
+
+                foreach ($associatedThirdparties as $thirdparty) {
+                    $newAction->setHandlingThierparty($thirdparty);
+                }
+                $this->em->persist($newAction);
+                $this->em->flush();
+            }
+        }
+    }
+}
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityReasonAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityReasonAggregator.php
@@ -1,22 +1,33 @@
 <?php

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

 namespace Chill\ActivityBundle\Export\Aggregator;

 use Chill\ActivityBundle\Repository\ActivityReasonCategoryRepository;
 use Chill\ActivityBundle\Repository\ActivityReasonRepository;
-use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
-use Symfony\Component\Form\FormBuilderInterface;
-use Doctrine\ORM\QueryBuilder;
-use Chill\MainBundle\Export\AggregatorInterface;
-use Symfony\Component\Security\Core\Role\Role;
 use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
-use Chill\MainBundle\Templating\TranslatableStringHelper;
-use Doctrine\ORM\Query\Expr\Join;
+use Chill\MainBundle\Export\AggregatorInterface;
 use Chill\MainBundle\Export\ExportElementValidatedInterface;
-use Symfony\Component\Validator\Context\ExecutionContextInterface;
+use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
+use Doctrine\ORM\Query\Expr\Join;
+use Doctrine\ORM\QueryBuilder;
+use RuntimeException;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\Security\Core\Role\Role;
+use Symfony\Component\Validator\Context\ExecutionContextInterface;
+
+use function array_key_exists;
+use function count;

 class ActivityReasonAggregator implements AggregatorInterface, ExportElementValidatedInterface
 {
@@ -36,42 +47,47 @@ class ActivityReasonAggregator implements AggregatorInterface, ExportElementVali
        $this->translatableStringHelper = $translatableStringHelper;
    }

+    public function addRole()
+    {
+        return new Role(ActivityStatsVoter::STATS);
+    }
+
    public function alterQuery(QueryBuilder $qb, $data)
    {
        // add select element
-        if ($data['level'] === 'reasons') {
+        if ('reasons' === $data['level']) {
            $elem = 'reasons.id';
            $alias = 'activity_reasons_id';
-        } elseif ($data['level'] === 'categories') {
+        } elseif ('categories' === $data['level']) {
            $elem = 'category.id';
            $alias = 'activity_categories_id';
        } else {
-            throw new \RuntimeException('The data provided are not recognized.');
+            throw new RuntimeException('The data provided are not recognized.');
        }

-        $qb->addSelect($elem.' as '.$alias);
+        $qb->addSelect($elem . ' as ' . $alias);

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

        // join category if necessary
-        if ($alias === 'activity_categories_id') {
+        if ('activity_categories_id' === $alias) {
            // add join only if needed
            if (!$this->checkJoinAlreadyDefined($qb->getDQLPart('join')['activity'], 'category')) {
                $qb->join('reasons.category', 'category');
@@ -88,24 +104,6 @@ class ActivityReasonAggregator implements AggregatorInterface, ExportElementVali
        }
    }

-    /**
-     * Check if a join between Activity and another alias
-     *
-     * @param Join[] $joins
-     * @param string $alias the alias to search for
-     * @return boolean
-     */
-    private function checkJoinAlreadyDefined(array $joins, $alias)
-    {
-        foreach ($joins as $join) {
-            if ($join->getAlias() === $alias) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
    public function applyOn()
    {
        return 'activity';
@@ -119,51 +117,36 @@ class ActivityReasonAggregator implements AggregatorInterface, ExportElementVali
            [
                'choices' => [
                    'By reason' => 'reasons',
-                    'By category of reason' => 'categories'
+                    'By category of reason' => 'categories',
                ],
                'multiple' => false,
                'expanded' => true,
-                'label' => "Reason's level"
+                'label' => "Reason's level",
            ]
        );
    }

-    public function validateForm($data, ExecutionContextInterface $context)
-    {
-        if ($data['level'] === null) {
-            $context
-                ->buildViolation("The reasons's level should not be empty.")
-                ->addViolation();
-        }
-    }
-
-    public function getTitle()
-    {
-        return 'Aggregate by activity reason';
-    }
-
-    public function addRole()
-    {
-        return new Role(ActivityStatsVoter::STATS);
-    }
-
    public function getLabels($key, array $values, $data)
    {
        // for performance reason, we load data from db only once
        switch ($data['level']) {
            case 'reasons':
                $this->activityReasonRepository->findBy(['id' => $values]);
+
                break;
+
            case 'categories':
                $this->activityReasonCategoryRepository->findBy(['id' => $values]);
+
                break;
+
            default:
-                throw new \RuntimeException(sprintf("The level data '%s' is invalid.", $data['level']));
+                throw new RuntimeException(sprintf("The level data '%s' is invalid.", $data['level']));
        }

-        return function($value) use ($data) {
-            if ($value === '_header') {
-                return $data['level'] === 'reasons' ? 'Group by reasons' : 'Group by categories of reason';
+        return function ($value) use ($data) {
+            if ('_header' === $value) {
+                return 'reasons' === $data['level'] ? 'Group by reasons' : 'Group by categories of reason';
            }

            switch ($data['level']) {
@@ -171,32 +154,63 @@ class ActivityReasonAggregator implements AggregatorInterface, ExportElementVali
                    $r = $this->activityReasonRepository->find($value);

                    return sprintf(
-                        "%s > %s",
+                        '%s > %s',
                        $this->translatableStringHelper->localize($r->getCategory()->getName()),
                        $this->translatableStringHelper->localize($r->getName())
                    );
+
                case 'categories':
                    $c = $this->activityReasonCategoryRepository->find($value);

                    return $this->translatableStringHelper->localize($c->getName());
            }
        };
-
    }

    public function getQueryKeys($data)
    {
        // add select element
-        if ($data['level'] === 'reasons') {
-            return array('activity_reasons_id');
+        if ('reasons' === $data['level']) {
+            return ['activity_reasons_id'];
        }

-        if ($data['level'] === 'categories') {
-            return array ('activity_categories_id');
+        if ('categories' === $data['level']) {
+            return ['activity_categories_id'];
        }

-        throw new \RuntimeException('The data provided are not recognised.');
-
+        throw new RuntimeException('The data provided are not recognised.');
    }

+    public function getTitle()
+    {
+        return 'Aggregate by activity reason';
+    }
+
+    public function validateForm($data, ExecutionContextInterface $context)
+    {
+        if (null === $data['level']) {
+            $context
+                ->buildViolation("The reasons's level should not be empty.")
+                ->addViolation();
+        }
+    }
+
+    /**
+     * Check if a join between Activity and another alias.
+     *
+     * @param Join[] $joins
+     * @param string $alias the alias to search for
+     *
+     * @return bool
+     */
+    private function checkJoinAlreadyDefined(array $joins, $alias)
+    {
+        foreach ($joins as $join) {
+            if ($join->getAlias() === $alias) {
+                return true;
+            }
+        }
+
+        return false;
+    }
 }
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityTypeAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityTypeAggregator.php
@@ -1,26 +1,34 @@
 <?php

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

 namespace Chill\ActivityBundle\Export\Aggregator;

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

 class ActivityTypeAggregator implements AggregatorInterface
 {
+    public const KEY = 'activity_type_aggregator';
+
    protected ActivityTypeRepository $activityTypeRepository;

    protected TranslatableStringHelperInterface $translatableStringHelper;

-    public const KEY = 'activity_type_aggregator';
-
    public function __construct(
        ActivityTypeRepository $activityTypeRepository,
        TranslatableStringHelperInterface $translatableStringHelper
@@ -29,6 +37,11 @@ class ActivityTypeAggregator implements AggregatorInterface
        $this->translatableStringHelper = $translatableStringHelper;
    }

+    public function addRole()
+    {
+        return new Role(ActivityStatsVoter::STATS);
+    }
+
    public function alterQuery(QueryBuilder $qb, $data)
    {
        // add select element
@@ -38,24 +51,6 @@ class ActivityTypeAggregator implements AggregatorInterface
        $qb->addGroupBy(self::KEY);
    }

-    /**
-     * Check if a join between Activity and another alias
-     *
-     * @param Join[] $joins
-     * @param string $alias the alias to search for
-     * @return boolean
-     */
-    private function checkJoinAlreadyDefined(array $joins, $alias)
-    {
-        foreach ($joins as $join) {
-            if ($join->getAlias() === $alias) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
    public function applyOn()
    {
        return 'activity';
@@ -66,23 +61,13 @@ class ActivityTypeAggregator implements AggregatorInterface
        // no form required for this aggregator
    }

-    public function getTitle()
-    {
-        return 'Aggregate by activity type';
-    }
-
-    public function addRole()
-    {
-        return new Role(ActivityStatsVoter::STATS);
-    }
-
-    public function getLabels($key, array $values, $data): \Closure
+    public function getLabels($key, array $values, $data): Closure
    {
        // for performance reason, we load data from db only once
        $this->activityTypeRepository->findBy(['id' => $values]);

-        return function($value): string {
-            if ($value === '_header') {
+        return function ($value): string {
+            if ('_header' === $value) {
                return 'Activity type';
            }

@@ -97,4 +82,27 @@ class ActivityTypeAggregator implements AggregatorInterface
        return [self::KEY];
    }

+    public function getTitle()
+    {
+        return 'Aggregate by activity type';
+    }
+
+    /**
+     * Check if a join between Activity and another alias.
+     *
+     * @param Join[] $joins
+     * @param string $alias the alias to search for
+     *
+     * @return bool
+     */
+    private function checkJoinAlreadyDefined(array $joins, $alias)
+    {
+        foreach ($joins as $join) {
+            if ($join->getAlias() === $alias) {
+                return true;
+            }
+        }
+
+        return false;
+    }
 }
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityUserAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityUserAggregator.php
@@ -1,13 +1,23 @@
 <?php

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

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

 class ActivityUserAggregator implements AggregatorInterface
 {
@@ -45,13 +55,13 @@ class ActivityUserAggregator implements AggregatorInterface
        // nothing to add
    }

-    public function getLabels($key, $values, $data): \Closure
+    public function getLabels($key, $values, $data): Closure
    {
        // preload users at once
        $this->userRepository->findBy(['id' => $values]);

-        return function($value) {
-            if ($value === '_header') {
+        return function ($value) {
+            if ('_header' === $value) {
                return 'activity user';
            }

@@ -61,7 +71,7 @@ class ActivityUserAggregator implements AggregatorInterface

    public function getQueryKeys($data)
    {
-        return [ self::KEY ];
+        return [self::KEY];
    }

    public function getTitle(): string
--- a/src/Bundle/ChillActivityBundle/Export/Export/CountActivity.php
+++ b/src/Bundle/ChillActivityBundle/Export/Export/CountActivity.php
@@ -1,16 +1,24 @@
 <?php

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

 namespace Chill\ActivityBundle\Export\Export;

 use Chill\ActivityBundle\Repository\ActivityRepository;
+use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
 use Chill\MainBundle\Export\ExportInterface;
 use Chill\MainBundle\Export\FormatterInterface;
+use Doctrine\ORM\Query;
+use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Security\Core\Role\Role;
-use Doctrine\ORM\Query;
-use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;

 class CountActivity implements ExportInterface
 {
@@ -24,7 +32,11 @@ class CountActivity implements ExportInterface

    public function buildForm(FormBuilderInterface $builder)
    {
+    }

+    public function getAllowedFormattersTypes()
+    {
+        return [FormatterInterface::TYPE_TABULAR];
    }

    public function getDescription()
@@ -32,6 +44,25 @@ class CountActivity implements ExportInterface
        return 'Count activities by various parameters.';
    }

+    public function getLabels($key, array $values, $data)
+    {
+        if ('export_count_activity' !== $key) {
+            throw new LogicException("the key {$key} is not used by this export");
+        }
+
+        return static fn ($value) => '_header' === $value ? 'Number of activities' : $value;
+    }
+
+    public function getQueryKeys($data)
+    {
+        return ['export_count_activity'];
+    }
+
+    public function getResult($qb, $data)
+    {
+        return $qb->getQuery()->getResult(Query::HYDRATE_SCALAR);
+    }
+
    public function getTitle()
    {
        return 'Count activities';
@@ -42,9 +73,9 @@ class CountActivity implements ExportInterface
        return 'activity';
    }

-    public function initiateQuery(array $requiredModifiers,  array $acl, array $data = array())
+    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
    {
-        $centers = array_map(static fn($el) => $el['center'], $acl);
+        $centers = array_map(static fn ($el) => $el['center'], $acl);

        $qb = $this
            ->activityRepository
@@ -59,38 +90,13 @@ class CountActivity implements ExportInterface
        return $qb;
    }

-    public function supportsModifiers()
-    {
-        return ['person', 'activity'];
-    }
-
    public function requiredRole()
    {
        return new Role(ActivityStatsVoter::STATS);
    }

-    public function getAllowedFormattersTypes()
+    public function supportsModifiers()
    {
-        return [FormatterInterface::TYPE_TABULAR];
+        return ['person', 'activity'];
    }
-
-    public function getLabels($key, array $values, $data)
-    {
-        if ($key !== 'export_count_activity') {
-            throw new \LogicException("the key $key is not used by this export");
-        }
-
-        return static fn($value) => $value === '_header' ? 'Number of activities' : $value;
-    }
-
-    public function getQueryKeys($data)
-    {
-        return ['export_count_activity'];
-    }
-
-    public function getResult($qb, $data)
-    {
-        return $qb->getQuery()->getResult(Query::HYDRATE_SCALAR);
-    }
-
 }
--- a/src/Bundle/ChillActivityBundle/Export/Export/ListActivity.php
+++ b/src/Bundle/ChillActivityBundle/Export/Export/ListActivity.php
@@ -1,35 +1,41 @@
 <?php

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

 namespace Chill\ActivityBundle\Export\Export;

-use Chill\ActivityBundle\Repository\ActivityRepository;
-use Chill\MainBundle\Export\ListInterface;
 use Chill\ActivityBundle\Entity\ActivityReason;
-use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
-use Doctrine\DBAL\Exception\InvalidArgumentException;
-use Symfony\Component\Security\Core\Role\Role;
+use Chill\ActivityBundle\Repository\ActivityRepository;
 use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
-use Symfony\Component\Form\FormBuilderInterface;
+use Chill\MainBundle\Export\FormatterInterface;
+use Chill\MainBundle\Export\ListInterface;
+use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
+use DateTime;
+use Doctrine\DBAL\Exception\InvalidArgumentException;
 use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\Query;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\Security\Core\Role\Role;
 use Symfony\Component\Translation\TranslatorInterface;
 use Symfony\Component\Validator\Constraints\Callback;
-use Doctrine\ORM\Query;
-use Chill\MainBundle\Export\FormatterInterface;
-use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;

+use function array_key_exists;
+use function count;
+use function in_array;
+
 class ListActivity implements ListInterface
 {
-    private ActivityRepository $activityRepository;
-
    protected EntityManagerInterface $entityManager;

-    protected TranslatorInterface $translator;
-
-    protected TranslatableStringHelperInterface $translatableStringHelper;
-
    protected array $fields = [
        'id',
        'date',
@@ -41,9 +47,15 @@ class ListActivity implements ListInterface
        'type_name',
        'person_firstname',
        'person_lastname',
-        'person_id'
+        'person_id',
    ];

+    protected TranslatableStringHelperInterface $translatableStringHelper;
+
+    protected TranslatorInterface $translator;
+
+    private ActivityRepository $activityRepository;
+
    public function __construct(
        EntityManagerInterface $em,
        TranslatorInterface $translator,
@@ -64,16 +76,15 @@ class ListActivity implements ListInterface
            'choices' => array_combine($this->fields, $this->fields),
            'label' => 'Fields to include in export',
            'constraints' => [new Callback([
-                'callback' => function($selected, ExecutionContextInterface $context) {
+                'callback' => static function ($selected, ExecutionContextInterface $context) {
                    if (count($selected) === 0) {
                        $context->buildViolation('You must select at least one element')
                            ->atPath('fields')
                            ->addViolation();
                    }
-                }
-            ])]
+                },
+            ])],
        ]);
-
    }

    public function getAllowedFormattersTypes()
@@ -83,69 +94,72 @@ class ListActivity implements ListInterface

    public function getDescription()
    {
-        return "List activities";
+        return 'List activities';
    }

    public function getLabels($key, array $values, $data)
    {
-        switch ($key)
-        {
-            case 'date' :
-                return static function($value) {
-                    if ($value === '_header') {
+        switch ($key) {
+            case 'date':
+                return static function ($value) {
+                    if ('_header' === $value) {
                        return 'date';
                    }

-                    $date = \DateTime::createFromFormat('Y-m-d H:i:s', $value);
+                    $date = DateTime::createFromFormat('Y-m-d H:i:s', $value);

                    return $date->format('d-m-Y');
                };
+
            case 'attendee':
-                return static function($value) {
-                    if ($value === '_header') {
+                return static function ($value) {
+                    if ('_header' === $value) {
                        return 'attendee';
                    }

                    return $value ? 1 : 0;
                };
-            case 'list_reasons' :
+
+            case 'list_reasons':
                $activityRepository = $this->activityRepository;

-                return function($value) use ($activityRepository): string {
-                    if ($value === '_header') {
+                return function ($value) use ($activityRepository): string {
+                    if ('_header' === $value) {
                        return 'activity reasons';
                    }

                    $activity = $activityRepository->find($value);

-                    return implode(", ", array_map(function(ActivityReason $r) {
-
-                        return '"'.
+                    return implode(', ', array_map(function (ActivityReason $r) {
+                        return '"' .
                                $this->translatableStringHelper->localize($r->getCategory()->getName())
-                                .' > '.
+                                . ' > ' .
                                $this->translatableStringHelper->localize($r->getName())
-                                .'"';
+                                . '"';
                    }, $activity->getReasons()->toArray()));
                };
-            case 'circle_name' :
-                return function($value) {
-                    if ($value === '_header') {
+
+            case 'circle_name':
+                return function ($value) {
+                    if ('_header' === $value) {
                        return 'circle';
                    }

                    return $this->translatableStringHelper->localize(json_decode($value, true));
                };
-            case 'type_name' :
-                return function($value) {
-                    if ($value === '_header') {
+
+            case 'type_name':
+                return function ($value) {
+                    if ('_header' === $value) {
                        return 'activity type';
                    }

                    return $this->translatableStringHelper->localize(json_decode($value, true));
                };
+
            default:
-                return static function($value) use ($key) {
-                    if ($value === '_header') {
+                return static function ($value) use ($key) {
+                    if ('_header' === $value) {
                        return $key;
                    }

@@ -176,10 +190,12 @@ class ListActivity implements ListInterface

    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
    {
-        $centers = array_map(function($el) { return $el['center']; }, $acl);
+        $centers = array_map(static function ($el) {
+            return $el['center'];
+        }, $acl);

        // throw an error if any fields are present
-        if (!\array_key_exists('fields', $data)) {
+        if (!array_key_exists('fields', $data)) {
            throw new InvalidArgumentException('Any fields have been checked.');
        }

@@ -193,42 +209,58 @@ class ListActivity implements ListInterface
            ->setParameter('authorized_centers', $centers);

        foreach ($this->fields as $f) {
-            if (in_array($f, $data['fields'])) {
+            if (in_array($f, $data['fields'], true)) {
                switch ($f) {
                    case 'id':
                        $qb->addSelect('activity.id AS id');
+
                        break;
+
                    case 'person_firstname':
                        $qb->addSelect('person.firstName AS person_firstname');
+
                        break;
+
                    case 'person_lastname':
                        $qb->addSelect('person.lastName AS person_lastname');
+
                        break;
+
                    case 'person_id':
                        $qb->addSelect('person.id AS person_id');
+
                        break;
+
                    case 'user_username':
                        $qb->join('activity.user', 'user');
                        $qb->addSelect('user.username AS user_username');
+
                        break;
+
                    case 'circle_name':
                        $qb->join('activity.scope', 'circle');
                        $qb->addSelect('circle.name AS circle_name');
+
                        break;
+
                    case 'type_name':
                        $qb->join('activity.type', 'type');
                        $qb->addSelect('type.name AS type_name');
+
                        break;
+
                    case 'list_reasons':
                        // this is a trick... The reasons is filled with the
                        // activity id which will be used to load reasons
                        $qb->addSelect('activity.id AS list_reasons');
+
                        break;
+
                    default:
                        $qb->addSelect(sprintf('activity.%s as %s', $f, $f));
+
                        break;
                }
-
            }
        }

@@ -244,5 +276,4 @@ class ListActivity implements ListInterface
    {
        return ['activity', 'person'];
    }
-
 }
--- a/src/Bundle/ChillActivityBundle/Export/Export/StatActivityDuration.php
+++ b/src/Bundle/ChillActivityBundle/Export/Export/StatActivityDuration.php
@@ -1,16 +1,24 @@
 <?php

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

 namespace Chill\ActivityBundle\Export\Export;

 use Chill\ActivityBundle\Repository\ActivityRepository;
+use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
 use Chill\MainBundle\Export\ExportInterface;
 use Chill\MainBundle\Export\FormatterInterface;
+use Doctrine\ORM\Query;
+use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Security\Core\Role\Role;
-use Doctrine\ORM\Query;
-use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;

 /**
 * This export allow to compute stats on activity duration.
@@ -19,8 +27,6 @@ use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
 */
 class StatActivityDuration implements ExportInterface
 {
-    private ActivityRepository $activityRepository;
-
    public const SUM = 'sum';

    /**
@@ -28,6 +34,8 @@ class StatActivityDuration implements ExportInterface
     */
    protected string $action;

+    private ActivityRepository $activityRepository;
+
    /**
     * @param string $action the stat to perform
     */
@@ -41,59 +49,6 @@ class StatActivityDuration implements ExportInterface

    public function buildForm(FormBuilderInterface $builder)
    {
-
-    }
-
-    public function getDescription()
-    {
-        if ($this->action === self::SUM) {
-            return 'Sum activities duration by various parameters.';
-        }
-    }
-
-    public function getTitle()
-    {
-        if ($this->action === self::SUM) {
-            return 'Sum activity duration';
-        }
-
-    }
-
-    public function getType()
-    {
-        return 'activity';
-    }
-
-    public function initiateQuery(array $requiredModifiers,  array $acl, array $data = [])
-    {
-        $centers = array_map(
-            static fn(array $el): string => $el['center'],
-            $acl
-        );
-
-        $qb = $this->activityRepository->createQueryBuilder('activity');
-
-        $select = null;
-
-        if ($this->action === self::SUM) {
-            $select = 'SUM(activity.durationTime) AS export_stat_activity';
-        }
-
-        return $qb->select($select)
-            ->join('activity.person',  'person')
-            ->join('person.center', 'center')
-            ->where($qb->expr()->in('center', ':centers'))
-            ->setParameter(':centers', $centers);
-    }
-
-    public function supportsModifiers()
-    {
-        return ['person', 'activity'];
-    }
-
-    public function requiredRole()
-    {
-        return new Role(ActivityStatsVoter::STATS);
    }

    public function getAllowedFormattersTypes()
@@ -101,15 +56,22 @@ class StatActivityDuration implements ExportInterface
        return [FormatterInterface::TYPE_TABULAR];
    }

-    public function getLabels($key, array $values, $data)
+    public function getDescription()
    {
-        if ($key !== 'export_stat_activity') {
-            throw new \LogicException(sprintf('The key %s is not used by this export', $key));
+        if (self::SUM === $this->action) {
+            return 'Sum activities duration by various parameters.';
+        }
    }

-        $header = $this->action === self::SUM ? 'Sum of activities duration' : false;
+    public function getLabels($key, array $values, $data)
+    {
+        if ('export_stat_activity' !== $key) {
+            throw new LogicException(sprintf('The key %s is not used by this export', $key));
+        }

-        return static fn(string $value) => $value === '_header' ?  $header : $value;
+        $header = self::SUM === $this->action ? 'Sum of activities duration' : false;
+
+        return static fn (string $value) => '_header' === $value ? $header : $value;
    }

    public function getQueryKeys($data)
@@ -122,4 +84,47 @@ class StatActivityDuration implements ExportInterface
        return $qb->getQuery()->getResult(Query::HYDRATE_SCALAR);
    }

+    public function getTitle()
+    {
+        if (self::SUM === $this->action) {
+            return 'Sum activity duration';
+        }
+    }
+
+    public function getType()
+    {
+        return 'activity';
+    }
+
+    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
+    {
+        $centers = array_map(
+            static fn (array $el): string => $el['center'],
+            $acl
+        );
+
+        $qb = $this->activityRepository->createQueryBuilder('activity');
+
+        $select = null;
+
+        if (self::SUM === $this->action) {
+            $select = 'SUM(activity.durationTime) AS export_stat_activity';
+        }
+
+        return $qb->select($select)
+            ->join('activity.person', 'person')
+            ->join('person.center', 'center')
+            ->where($qb->expr()->in('center', ':centers'))
+            ->setParameter(':centers', $centers);
+    }
+
+    public function requiredRole()
+    {
+        return new Role(ActivityStatsVoter::STATS);
+    }
+
+    public function supportsModifiers()
+    {
+        return ['person', 'activity'];
+    }
 }
--- a/src/Bundle/ChillActivityBundle/Export/Filter/ActivityDateFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/ActivityDateFilter.php
@@ -1,25 +1,33 @@
 <?php

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

 namespace Chill\ActivityBundle\Export\Filter;

 use Chill\MainBundle\Export\FilterInterface;
+use Chill\MainBundle\Form\Type\Export\FilterType;
+use DateTime;
+use Doctrine\ORM\Query\Expr;
 use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\Extension\Core\Type\DateType;
 use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\Form\FormError;
 use Symfony\Component\Form\FormEvent;
 use Symfony\Component\Form\FormEvents;
-use Symfony\Component\Form\Extension\Core\Type\DateType;
-use Symfony\Component\Form\FormError;
-use Chill\MainBundle\Form\Type\Export\FilterType;
-use Doctrine\ORM\Query\Expr;
 use Symfony\Component\Translation\TranslatorInterface;

 class ActivityDateFilter implements FilterInterface
 {
    protected TranslatorInterface $translator;

-    function __construct(TranslatorInterface $translator)
+    public function __construct(TranslatorInterface $translator)
    {
        $this->translator = $translator;
    }
@@ -32,8 +40,11 @@ class ActivityDateFilter implements FilterInterface
    public function alterQuery(QueryBuilder $qb, $data)
    {
        $where = $qb->getDQLPart('where');
-        $clause = $qb->expr()->between('activity.date', ':date_from',
-            ':date_to');
+        $clause = $qb->expr()->between(
+            'activity.date',
+            ':date_from',
+            ':date_to'
+        );

        if ($where instanceof Expr\Andx) {
            $where->add($clause);
@@ -58,9 +69,9 @@ class ActivityDateFilter implements FilterInterface
            DateType::class,
            [
                'label' => 'Activities after this date',
-                'data'  => new \DateTime(),
+                'data' => new DateTime(),
                'attr' => ['class' => 'datepicker'],
-                'widget'=> 'single_text',
+                'widget' => 'single_text',
                'format' => 'dd-MM-yyyy',
            ]
        );
@@ -70,46 +81,49 @@ class ActivityDateFilter implements FilterInterface
            DateType::class,
            [
                'label' => 'Activities before this date',
-                'data'  => new \DateTime(),
+                'data' => new DateTime(),
                'attr' => ['class' => 'datepicker'],
-                'widget'=> 'single_text',
+                'widget' => 'single_text',
                'format' => 'dd-MM-yyyy',
            ]
        );

-        $builder->addEventListener(FormEvents::POST_SUBMIT, function(FormEvent $event) {
-            /* @var $filterForm \Symfony\Component\Form\FormInterface */
+        $builder->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) {
+            /** @var \Symfony\Component\Form\FormInterface $filterForm */
            $filterForm = $event->getForm()->getParent();
            $enabled = $filterForm->get(FilterType::ENABLED_FIELD)->getData();

-            if ($enabled === true) {
+            if (true === $enabled) {
                // if the filter is enabled, add some validation
                $form = $event->getForm();
                $date_from = $form->get('date_from')->getData();
                $date_to = $form->get('date_to')->getData();

                // check that fields are not empty
-                if ($date_from === null) {
+                if (null === $date_from) {
                    $form->get('date_from')->addError(new FormError(
                        $this->translator->trans('This field '
-                        . 'should not be empty')));
+                        . 'should not be empty')
+                    ));
                }
-                if ($date_to   === null) {
+
+                if (null === $date_to) {
                    $form->get('date_to')->addError(new FormError(
                        $this->translator->trans('This field '
-                        . 'should not be empty')));
+                        . 'should not be empty')
+                    ));
                }

                // check that date_from is before date_to
                if (
-                    ($date_from !== null && $date_to !== null)
-                    &&
-                    $date_from >= $date_to
+                    (null !== $date_from && null !== $date_to)
+                    && $date_from >= $date_to
                ) {
                    $form->get('date_to')->addError(new FormError(
                        $this->translator->trans('This date should be after '
                            . 'the date given in "Implied in an activity after '
-                            . 'this date" field')));
+                            . 'this date" field')
+                    ));
                }
            }
        });
@@ -121,8 +135,8 @@ class ActivityDateFilter implements FilterInterface
            'Filtered by date of activity: only between %date_from% and %date_to%',
            [
                '%date_from%' => $data['date_from']->format('d-m-Y'),
-                '%date_to%' => $data['date_to']->format('d-m-Y')
-            ]
+                '%date_to%' => $data['date_to']->format('d-m-Y'),
+            ],
        ];
    }

@@ -130,5 +144,4 @@ class ActivityDateFilter implements FilterInterface
    {
        return 'Filtered by date activity';
    }
-
 }
--- a/src/Bundle/ChillActivityBundle/Export/Filter/ActivityReasonFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/ActivityReasonFilter.php
@@ -1,30 +1,40 @@
 <?php

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

 namespace Chill\ActivityBundle\Export\Filter;

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

-class ActivityReasonFilter implements FilterInterface, ExportElementValidatedInterface
+use function array_key_exists;
+use function count;
+
+class ActivityReasonFilter implements ExportElementValidatedInterface, FilterInterface
 {
-    protected TranslatableStringHelperInterface $translatableStringHelper;
-
    protected ActivityReasonRepository $activityReasonRepository;

+    protected TranslatableStringHelperInterface $translatableStringHelper;
+
    public function __construct(
        TranslatableStringHelper $helper,
        ActivityReasonRepository $activityReasonRepository
@@ -33,6 +43,11 @@ class ActivityReasonFilter implements FilterInterface, ExportElementValidatedInt
        $this->activityReasonRepository = $activityReasonRepository;
    }

+    public function addRole()
+    {
+        return new Role(ActivityStatsVoter::STATS);
+    }
+
    public function alterQuery(QueryBuilder $qb, $data)
    {
        $where = $qb->getDQLPart('where');
@@ -41,16 +56,15 @@ class ActivityReasonFilter implements FilterInterface, ExportElementValidatedInt
        //dump($join);
        // add a join to reasons only if needed
        if (
-            (array_key_exists('activity', $join)
-            &&
-            !$this->checkJoinAlreadyDefined($join['activity'], 'reasons')
+            (
+                array_key_exists('activity', $join)
+            && !$this->checkJoinAlreadyDefined($join['activity'], 'reasons')
            )
-            ||
-            (! array_key_exists('activity', $join))
+            || (!array_key_exists('activity', $join))
        ) {
            $qb->add(
                'join',
-                    array('activity' => new Join(Join::INNER_JOIN, 'activity.reasons', 'reasons')),
+                ['activity' => new Join(Join::INNER_JOIN, 'activity.reasons', 'reasons')],
                true
            );
        }
@@ -65,11 +79,57 @@ class ActivityReasonFilter implements FilterInterface, ExportElementValidatedInt
        $qb->setParameter('selected_activity_reasons', $data['reasons']);
    }

+    public function applyOn()
+    {
+        return 'activity';
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        $builder->add('reasons', EntityType::class, [
+            'class' => ActivityReason::class,
+            'choice_label' => fn (ActivityReason $reason) => $this->translatableStringHelper->localize($reason->getName()),
+            'group_by' => fn (ActivityReason $reason) => $this->translatableStringHelper->localize($reason->getCategory()->getName()),
+            'multiple' => true,
+            'expanded' => false,
+        ]);
+    }
+
+    public function describeAction($data, $format = 'string')
+    {
+        // collect all the reasons'name used in this filter in one array
+        $reasonsNames = array_map(
+            fn (ActivityReason $r): string => '"' . $this->translatableStringHelper->localize($r->getName()) . '"',
+            $this->activityReasonRepository->findBy(['id' => $data['reasons']->toArray()])
+        );
+
+        return [
+            'Filtered by reasons: only %list%',
+            [
+                '%list%' => implode(', ', $reasonsNames),
+            ],
+        ];
+    }
+
+    public function getTitle()
+    {
+        return 'Filter by reason';
+    }
+
+    public function validateForm($data, ExecutionContextInterface $context)
+    {
+        if (null === $data['reasons'] || count($data['reasons']) === 0) {
+            $context
+                ->buildViolation('At least one reason must be chosen')
+                ->addViolation();
+        }
+    }
+
    /**
-     * Check if a join between Activity and Reason is already defined
+     * Check if a join between Activity and Reason is already defined.
     *
     * @param Join[] $joins
-     * @return boolean
+     * @param mixed $alias
     */
    private function checkJoinAlreadyDefined(array $joins, $alias): bool
    {
@@ -81,55 +141,4 @@ class ActivityReasonFilter implements FilterInterface, ExportElementValidatedInt

        return false;
    }
-
-    public function applyOn()
-    {
-        return 'activity';
-    }
-
-    public function buildForm(FormBuilderInterface $builder)
-    {
-        $builder->add('reasons', EntityType::class, [
-            'class' => ActivityReason::class,
-            'choice_label' => fn(ActivityReason $reason) => $this->translatableStringHelper->localize($reason->getName()),
-            'group_by' => fn(ActivityReason $reason) => $this->translatableStringHelper->localize($reason->getCategory()->getName()),
-            'multiple' => true,
-            'expanded' => false
-        ]);
-    }
-
-    public function validateForm($data, ExecutionContextInterface $context)
-    {
-        if ($data['reasons'] === null || count($data['reasons']) === 0) {
-            $context
-                ->buildViolation('At least one reason must be chosen')
-                ->addViolation();
-        }
-    }
-
-    public function getTitle()
-    {
-        return 'Filter by reason';
-    }
-
-    public function addRole()
-    {
-        return new Role(ActivityStatsVoter::STATS);
-    }
-
-    public function describeAction($data, $format = 'string')
-    {
-        // collect all the reasons'name used in this filter in one array
-        $reasonsNames = array_map(
-            fn(ActivityReason $r): string => '"' . $this->translatableStringHelper->localize($r->getName()) . '"',
-            $this->activityReasonRepository->findBy(array('id' => $data['reasons']->toArray()))
-        );
-
-        return [
-            'Filtered by reasons: only %list%',
-            [
-                '%list%' => implode(", ", $reasonsNames),
-            ]
-        ];
-    }
 }
--- a/src/Bundle/ChillActivityBundle/Export/Filter/ActivityTypeFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/ActivityTypeFilter.php
@@ -1,29 +1,38 @@
 <?php

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

 namespace Chill\ActivityBundle\Export\Filter;

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

-class ActivityTypeFilter implements FilterInterface, ExportElementValidatedInterface
+use function count;
+
+class ActivityTypeFilter implements ExportElementValidatedInterface, FilterInterface
 {
-    protected TranslatableStringHelperInterface $translatableStringHelper;
-
    protected ActivityTypeRepository $activityTypeRepository;

+    protected TranslatableStringHelperInterface $translatableStringHelper;
+
    public function __construct(
        TranslatableStringHelperInterface $translatableStringHelper,
        ActivityTypeRepository $activityTypeRepository
@@ -32,6 +41,11 @@ class ActivityTypeFilter implements FilterInterface, ExportElementValidatedInter
        $this->activityTypeRepository = $activityTypeRepository;
    }

+    public function addRole()
+    {
+        return new Role(ActivityStatsVoter::STATS);
+    }
+
    public function alterQuery(QueryBuilder $qb, $data)
    {
        $where = $qb->getDQLPart('where');
@@ -47,23 +61,6 @@ class ActivityTypeFilter implements FilterInterface, ExportElementValidatedInter
        $qb->setParameter('selected_activity_types', $data['types']);
    }

-    /**
-     * Check if a join between Activity and Reason is already defined
-     *
-     * @param Join[] $joins
-     * @return boolean
-     */
-    private function checkJoinAlreadyDefined(array $joins, $alias)
-    {
-        foreach ($joins as $join) {
-            if ($join->getAlias() === $alias) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
    public function applyOn()
    {
        return 'activity';
@@ -76,20 +73,27 @@ class ActivityTypeFilter implements FilterInterface, ExportElementValidatedInter
            EntityType::class,
            [
                'class' => ActivityType::class,
-                'choice_label' => fn(ActivityType $type) => $this->translatableStringHelper->localize($type->getName()),
+                'choice_label' => fn (ActivityType $type) => $this->translatableStringHelper->localize($type->getName()),
                'multiple' => true,
-                'expanded' => false
+                'expanded' => false,
            ]
        );
    }

-    public function validateForm($data, ExecutionContextInterface $context)
+    public function describeAction($data, $format = 'string')
    {
-        if ($data['types'] === null || count($data['types']) === 0) {
-            $context
-                ->buildViolation('At least one type must be chosen')
-                ->addViolation();
-        }
+        // collect all the reasons'name used in this filter in one array
+        $reasonsNames = array_map(
+            fn (ActivityType $t): string => '"' . $this->translatableStringHelper->localize($t->getName()) . '"',
+            $this->activityTypeRepository->findBy(['id' => $data['types']->toArray()])
+        );
+
+        return [
+            'Filtered by activity type: only %list%',
+            [
+                '%list%' => implode(', ', $reasonsNames),
+            ],
+        ];
    }

    public function getTitle()
@@ -97,24 +101,31 @@ class ActivityTypeFilter implements FilterInterface, ExportElementValidatedInter
        return 'Filter by activity type';
    }

-    public function addRole()
+    public function validateForm($data, ExecutionContextInterface $context)
    {
-        return new Role(ActivityStatsVoter::STATS);
+        if (null === $data['types'] || count($data['types']) === 0) {
+            $context
+                ->buildViolation('At least one type must be chosen')
+                ->addViolation();
+        }
    }

-    public function describeAction($data, $format = 'string')
+    /**
+     * Check if a join between Activity and Reason is already defined.
+     *
+     * @param Join[] $joins
+     * @param mixed $alias
+     *
+     * @return bool
+     */
+    private function checkJoinAlreadyDefined(array $joins, $alias)
    {
-        // collect all the reasons'name used in this filter in one array
-        $reasonsNames = array_map(
-            fn(ActivityType $t): string => '"' . $this->translatableStringHelper->localize($t->getName()) . '"',
-            $this->activityTypeRepository->findBy(['id' => $data['types']->toArray()])
-        );
+        foreach ($joins as $join) {
+            if ($join->getAlias() === $alias) {
+                return true;
+            }
+        }

-        return [
-            'Filtered by activity type: only %list%',
-            [
-                '%list%' => implode(", ", $reasonsNames),
-            ]
-        ];
+        return false;
    }
 }
--- a/src/Bundle/ChillActivityBundle/Export/Filter/PersonHavingActivityBetweenDateFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/PersonHavingActivityBetweenDateFilter.php
@@ -1,35 +1,45 @@
 <?php

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

 namespace Chill\ActivityBundle\Export\Filter;

+use Chill\ActivityBundle\Entity\ActivityReason;
 use Chill\ActivityBundle\Repository\ActivityReasonRepository;
+use Chill\MainBundle\Export\ExportElementValidatedInterface;
 use Chill\MainBundle\Export\FilterInterface;
+use Chill\MainBundle\Form\Type\Export\FilterType;
+use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
+use Chill\PersonBundle\Export\Declarations;
+use DateTime;
+use Doctrine\ORM\Query\Expr;
 use Doctrine\ORM\QueryBuilder;
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
+use Symfony\Component\Form\Extension\Core\Type\DateType;
 use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\Form\FormError;
 use Symfony\Component\Form\FormEvent;
 use Symfony\Component\Form\FormEvents;
-use Symfony\Component\Form\Extension\Core\Type\DateType;
-use Symfony\Component\Form\FormError;
-use Chill\MainBundle\Form\Type\Export\FilterType;
-use Doctrine\ORM\Query\Expr;
-use Chill\MainBundle\Templating\TranslatableStringHelper;
-use Symfony\Bridge\Doctrine\Form\Type\EntityType;
-use Chill\ActivityBundle\Entity\ActivityReason;
-use Chill\PersonBundle\Export\Declarations;
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Translation\TranslatorInterface;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
-use Chill\MainBundle\Export\ExportElementValidatedInterface;

-class PersonHavingActivityBetweenDateFilter implements FilterInterface, ExportElementValidatedInterface
+use function count;
+
+class PersonHavingActivityBetweenDateFilter implements ExportElementValidatedInterface, FilterInterface
 {
-    protected TranslatableStringHelperInterface $translatableStringHelper;
-
    protected ActivityReasonRepository $activityReasonRepository;

+    protected TranslatableStringHelperInterface $translatableStringHelper;
+
    protected TranslatorInterface $translator;

    public function __construct(
@@ -66,7 +76,8 @@ class PersonHavingActivityBetweenDateFilter implements FilterInterface, ExportEl

        $sqb->andWhere(
            $sqb->expr()->in(
-                'reasons_person_having_activity', ':person_having_activity_reasons'
+                'reasons_person_having_activity',
+                ':person_having_activity_reasons'
            )
        );

@@ -80,10 +91,14 @@ class PersonHavingActivityBetweenDateFilter implements FilterInterface, ExportEl
        }

        $qb->add('where', $where);
-        $qb->setParameter('person_having_activity_between_date_from',
-                $data['date_from']);
-        $qb->setParameter('person_having_activity_between_date_to',
-                $data['date_to']);
+        $qb->setParameter(
+            'person_having_activity_between_date_from',
+            $data['date_from']
+        );
+        $qb->setParameter(
+            'person_having_activity_between_date_to',
+            $data['date_to']
+        );
        $qb->setParameter('person_having_activity_reasons', $data['reasons']);
    }

@@ -96,76 +111,71 @@ class PersonHavingActivityBetweenDateFilter implements FilterInterface, ExportEl
    {
        $builder->add('date_from', DateType::class, [
            'label' => 'Implied in an activity after this date',
-            'data'  => new \DateTime(),
+            'data' => new DateTime(),
            'attr' => ['class' => 'datepicker'],
-            'widget'=> 'single_text',
+            'widget' => 'single_text',
            'format' => 'dd-MM-yyyy',
        ]);

        $builder->add('date_to', DateType::class, [
            'label' => 'Implied in an activity before this date',
-            'data'  => new \DateTime(),
+            'data' => new DateTime(),
            'attr' => ['class' => 'datepicker'],
-            'widget'=> 'single_text',
+            'widget' => 'single_text',
            'format' => 'dd-MM-yyyy',
        ]);

        $builder->add('reasons', EntityType::class, [
            'class' => ActivityReason::class,
            'choice_label' => fn (ActivityReason $reason): ?string => $this->translatableStringHelper->localize($reason->getName()),
-            'group_by' => fn(ActivityReason $reason): ?string => $this->translatableStringHelper->localize($reason->getCategory()->getName()),
+            'group_by' => fn (ActivityReason $reason): ?string => $this->translatableStringHelper->localize($reason->getCategory()->getName()),
            'data' => $this->activityReasonRepository->findAll(),
            'multiple' => true,
            'expanded' => false,
-            'label'    => 'Activity reasons for those activities'
+            'label' => 'Activity reasons for those activities',
        ]);

-        $builder->addEventListener(FormEvents::POST_SUBMIT, function(FormEvent $event) {
-            /* @var FormInterface $filterForm  */
+        $builder->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) {
+            /** @var FormInterface $filterForm */
            $filterForm = $event->getForm()->getParent();
            $enabled = $filterForm->get(FilterType::ENABLED_FIELD)->getData();

-            if ($enabled === true) {
+            if (true === $enabled) {
                // if the filter is enabled, add some validation
                $form = $event->getForm();
                $date_from = $form->get('date_from')->getData();
                $date_to = $form->get('date_to')->getData();

                // check that fields are not empty
-                if ($date_from === null) {
+                if (null === $date_from) {
                    $form->get('date_from')->addError(new FormError(
                        $this->translator->trans('This field '
-                        . 'should not be empty')));
+                        . 'should not be empty')
+                    ));
                }
-                if ($date_to   === null) {
+
+                if (null === $date_to) {
                    $form->get('date_to')->addError(new FormError(
                        $this->translator->trans('This field '
-                        . 'should not be empty')));
+                        . 'should not be empty')
+                    ));
                }

                // check that date_from is before date_to
                if (
-                    ($date_from !== null && $date_to !== null)
-                    &&
-                    $date_from >= $date_to
+                    (null !== $date_from && null !== $date_to)
+                    && $date_from >= $date_to
                ) {
                    $form->get('date_to')->addError(new FormError(
                        $this->translator->trans('This date '
                        . 'should be after the date given in "Implied in an '
-                        . 'activity after this date" field')));
+                        . 'activity after this date" field')
+                    ));
                }
            }
        });
    }

-    public function validateForm($data, ExecutionContextInterface $context)
-    {
-        if ($data['reasons'] === null || count($data['reasons']) === 0) {
-            $context->buildViolation('At least one reason must be chosen')
-                ->addViolation();
-        }
-    }
-
    public function describeAction($data, $format = 'string')
    {
        return [
@@ -175,13 +185,13 @@ class PersonHavingActivityBetweenDateFilter implements FilterInterface, ExportEl
                '%date_from%' => $data['date_from']->format('d-m-Y'),
                '%date_to%' => $data['date_to']->format('d-m-Y'),
                '%reasons_name%' => implode(
-                    ", ",
+                    ', ',
                    array_map(
-                        fn(ActivityReason $r): string => '"' . $this->translatableStringHelper->localize($r->getName()) . '"',
+                        fn (ActivityReason $r): string => '"' . $this->translatableStringHelper->localize($r->getName()) . '"',
                        $data['reasons']
                    )
-                )
-            ]
+                ),
+            ],
        ];
    }

@@ -190,4 +200,11 @@ class PersonHavingActivityBetweenDateFilter implements FilterInterface, ExportEl
        return 'Filtered by person having an activity in a period';
    }

+    public function validateForm($data, ExecutionContextInterface $context)
+    {
+        if (null === $data['reasons'] || count($data['reasons']) === 0) {
+            $context->buildViolation('At least one reason must be chosen')
+                ->addViolation();
+        }
+    }
 }
--- a/src/Bundle/ChillActivityBundle/Form/ActivityPresenceType.php
+++ b/src/Bundle/ChillActivityBundle/Form/ActivityPresenceType.php
@@ -1,13 +1,22 @@
 <?php

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

 use Chill\ActivityBundle\Entity\ActivityPresence;
+use Chill\MainBundle\Form\Type\TranslatableStringFormType;
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
-use Chill\MainBundle\Form\Type\TranslatableStringFormType;

 class ActivityPresenceType extends AbstractType
 {
@@ -15,19 +24,19 @@ class ActivityPresenceType extends AbstractType
    {
        $builder
            ->add('name', TranslatableStringFormType::class)
-            ->add('active', ChoiceType::class, array(
-                'choices' => array(
+            ->add('active', ChoiceType::class, [
+                'choices' => [
                    'Yes' => true,
-                    'No'  => false
-                ),
-                'expanded' => true
-            ));
+                    'No' => false,
+                ],
+                'expanded' => true,
+            ]);
    }

    public function configureOptions(OptionsResolver $resolver): void
    {
-        $resolver->setDefaults(array(
-            'data_class' => ActivityPresence::class
-        ));
+        $resolver->setDefaults([
+            'data_class' => ActivityPresence::class,
+        ]);
    }
 }
--- a/src/Bundle/ChillActivityBundle/Form/ActivityReasonCategoryType.php
+++ b/src/Bundle/ChillActivityBundle/Form/ActivityReasonCategoryType.php
@@ -1,25 +1,29 @@
 <?php

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

+use Chill\MainBundle\Form\Type\TranslatableStringFormType;
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
-use Chill\MainBundle\Form\Type\TranslatableStringFormType;

 class ActivityReasonCategoryType extends AbstractType
 {
-    /**
-     * @param FormBuilderInterface $builder
-     * @param array $options
-     */
    public function buildForm(FormBuilderInterface $builder, array $options)
    {
        $builder
            ->add('name', TranslatableStringFormType::class)
-            ->add('active', CheckboxType::class, array('required' => false))
-        ;
+            ->add('active', CheckboxType::class, ['required' => false]);
    }

    /**
@@ -27,9 +31,9 @@ class ActivityReasonCategoryType extends AbstractType
     */
    public function configureOptions(OptionsResolver $resolver)
    {
-        $resolver->setDefaults(array(
-            'data_class' => 'Chill\ActivityBundle\Entity\ActivityReasonCategory'
-        ));
+        $resolver->setDefaults([
+            'data_class' => 'Chill\ActivityBundle\Entity\ActivityReasonCategory',
+        ]);
    }

    /**
--- a/src/Bundle/ChillActivityBundle/Form/ActivityReasonType.php
+++ b/src/Bundle/ChillActivityBundle/Form/ActivityReasonType.php
@@ -1,37 +1,38 @@
 <?php

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

+use Chill\ActivityBundle\Form\Type\TranslatableActivityReasonCategory;
+use Chill\MainBundle\Form\Type\TranslatableStringFormType;
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
-use Chill\MainBundle\Form\Type\TranslatableStringFormType;
-use Chill\ActivityBundle\Form\Type\TranslatableActivityReasonCategory;

 class ActivityReasonType extends AbstractType
 {
-    /**
-     * @param FormBuilderInterface $builder
-     * @param array $options
-     */
    public function buildForm(FormBuilderInterface $builder, array $options)
    {
        $builder
            ->add('name', TranslatableStringFormType::class)
-            ->add('active', CheckboxType::class, array('required' => false))
-            ->add('category', TranslatableActivityReasonCategory::class)
-        ;
+            ->add('active', CheckboxType::class, ['required' => false])
+            ->add('category', TranslatableActivityReasonCategory::class);
    }

-    /**
-     * @param OptionsResolver $resolver
-     */
    public function configureOptions(OptionsResolver $resolver)
    {
-        $resolver->setDefaults(array(
-            'data_class' => 'Chill\ActivityBundle\Entity\ActivityReason'
-        ));
+        $resolver->setDefaults([
+            'data_class' => 'Chill\ActivityBundle\Entity\ActivityReason',
+        ]);
    }

    /**
--- a/src/Bundle/ChillActivityBundle/Form/ActivityType.php
+++ b/src/Bundle/ChillActivityBundle/Form/ActivityType.php
@@ -1,5 +1,14 @@
 <?php

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

 use Chill\ActivityBundle\Entity\Activity;
@@ -7,54 +16,58 @@ use Chill\ActivityBundle\Entity\ActivityPresence;
 use Chill\ActivityBundle\Entity\ActivityReason;
 use Chill\DocStoreBundle\Form\StoredObjectType;
 use Chill\MainBundle\Entity\Location;
+use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Form\Type\ChillCollectionType;
+use Chill\MainBundle\Form\Type\ChillDateType;
 use Chill\MainBundle\Form\Type\CommentType;
+use Chill\MainBundle\Form\Type\ScopePickerType;
+use Chill\MainBundle\Form\Type\UserPickerType;
+use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
+use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Chill\PersonBundle\Entity\Person;
-use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
 use Chill\PersonBundle\Entity\SocialWork\SocialAction;
+use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
+use Chill\PersonBundle\Templating\Entity\SocialActionRender;
+use Chill\PersonBundle\Templating\Entity\SocialIssueRender;
 use Chill\ThirdPartyBundle\Entity\ThirdParty;
+use DateInterval;
+use DateTime;
+use DateTimeZone;
 use Doctrine\ORM\EntityRepository;
+use Doctrine\Persistence\ObjectManager;
+use RuntimeException;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
-use Symfony\Component\Form\Extension\Core\Type\CollectionType;
-use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\OptionsResolver\OptionsResolver;
-use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
-use Doctrine\Persistence\ObjectManager;
-use Chill\MainBundle\Templating\TranslatableStringHelper;
-use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
-use Chill\MainBundle\Entity\User;
+use Symfony\Component\Form\CallbackTransformer;
 use Symfony\Component\Form\Extension\Core\DataTransformer\DateTimeToTimestampTransformer;
+use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\Form\Extension\Core\Type\HiddenType;
+use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\FormEvent;
 use Symfony\Component\Form\FormEvents;
-use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
-use Chill\MainBundle\Form\Type\UserPickerType;
-use Chill\MainBundle\Form\Type\ScopePickerType;
-use Chill\MainBundle\Form\Type\ChillDateType;
-use Symfony\Component\Form\Extension\Core\Type\HiddenType;
-use Symfony\Component\Form\CallbackTransformer;
-use Chill\PersonBundle\Form\DataTransformer\PersonToIdTransformer;
-use Chill\PersonBundle\Templating\Entity\SocialIssueRender;
-use Chill\PersonBundle\Templating\Entity\SocialActionRender;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
+
+use function in_array;

 class ActivityType extends AbstractType
 {
-    protected User $user;
-
    protected AuthorizationHelper $authorizationHelper;

    protected ObjectManager $om;

-    protected TranslatableStringHelper $translatableStringHelper;
+    protected SocialActionRender $socialActionRender;

    protected SocialIssueRender $socialIssueRender;

-    protected SocialActionRender $socialActionRender;
-
    protected array $timeChoices;

-    public function __construct (
+    protected TranslatableStringHelper $translatableStringHelper;
+
+    protected User $user;
+
+    public function __construct(
        TokenStorageInterface $tokenStorage,
        AuthorizationHelper $authorizationHelper,
        ObjectManager $om,
@@ -64,7 +77,7 @@ class ActivityType extends AbstractType
        SocialActionRender $socialActionRender
    ) {
        if (!$tokenStorage->getToken()->getUser() instanceof User) {
-            throw new \RuntimeException("you should have a valid user");
+            throw new RuntimeException('you should have a valid user');
        }

        $this->user = $tokenStorage->getToken()->getUser();
@@ -100,12 +113,13 @@ class ActivityType extends AbstractType
                'center' => $options['center'],
                'role' => $options['role'],
                // TODO make required again once scope and rights are fixed
-                'required' => false
+                'required' => false,
            ]);
        }

        /** @var ? \Chill\PersonBundle\Entity\AccompanyingPeriod  $accompanyingPeriod */
-        $accompanyingPeriod = NULL;
+        $accompanyingPeriod = null;
+
        if ($options['accompanyingPeriod']) {
            $accompanyingPeriod = $options['accompanyingPeriod'];
        }
@@ -114,48 +128,52 @@ class ActivityType extends AbstractType
            $builder->add('socialIssues', HiddenType::class);
            $builder->get('socialIssues')
                ->addModelTransformer(new CallbackTransformer(
-                   function (iterable $socialIssuesAsIterable): string {
+                    static function (iterable $socialIssuesAsIterable): string {
                        $socialIssueIds = [];
+
                        foreach ($socialIssuesAsIterable as $value) {
                            $socialIssueIds[] = $value->getId();
                        }
+
                        return implode(',', $socialIssueIds);
                    },
                    function (?string $socialIssuesAsString): array {
                        if (null === $socialIssuesAsString) {
                            return [];
                        }
+
                        return array_map(
-                          fn(string $id): ?SocialIssue => $this->om->getRepository(SocialIssue::class)->findOneBy(['id' => (int) $id]),
+                            fn (string $id): ?SocialIssue => $this->om->getRepository(SocialIssue::class)->findOneBy(['id' => (int) $id]),
                            explode(',', $socialIssuesAsString)
                        );
                    }
-               ))
-            ;
+                ));
        }

        if ($activityType->isVisible('socialActions') && $accompanyingPeriod) {
            $builder->add('socialActions', HiddenType::class);
            $builder->get('socialActions')
                ->addModelTransformer(new CallbackTransformer(
-                   function (iterable $socialActionsAsIterable): string {
+                    static function (iterable $socialActionsAsIterable): string {
                        $socialActionIds = [];
+
                        foreach ($socialActionsAsIterable as $value) {
                            $socialActionIds[] = $value->getId();
                        }
+
                        return implode(',', $socialActionIds);
                    },
                    function (?string $socialActionsAsString): array {
                        if (null === $socialActionsAsString) {
                            return [];
                        }
+
                        return array_map(
-                          fn(string $id): ?SocialAction => $this->om->getRepository(SocialAction::class)->findOneBy(['id' => (int) $id]),
+                            fn (string $id): ?SocialAction => $this->om->getRepository(SocialAction::class)->findOneBy(['id' => (int) $id]),
                            explode(',', $socialActionsAsString)
                        );
                    }
-               ))
-            ;
+                ));
        }

        if ($activityType->isVisible('date')) {
@@ -188,7 +206,7 @@ class ActivityType extends AbstractType
                'choice_label' => function (ActivityPresence $activityPresence) {
                    return $this->translatableStringHelper->localize($activityPresence->getName());
                },
-                'query_builder' => function (EntityRepository $er) {
+                'query_builder' => static function (EntityRepository $er) {
                    return $er->createQueryBuilder('a')
                        ->where('a.active = true');
                },
@@ -200,7 +218,7 @@ class ActivityType extends AbstractType
                'label' => $activityType->getLabel('user'),
                'required' => $activityType->isRequired('user'),
                'center' => $options['center'],
-                'role'   => $options['role']
+                'role' => $options['role'],
            ]);
        }

@@ -213,8 +231,8 @@ class ActivityType extends AbstractType
                'choice_label' => function (ActivityReason $activityReason) {
                    return $this->translatableStringHelper->localize($activityReason->getName());
                },
-                'attr' => array('class' => 'select2 '),
-                'query_builder' => function (EntityRepository $er) {
+                'attr' => ['class' => 'select2 '],
+                'query_builder' => static function (EntityRepository $er) {
                    return $er->createQueryBuilder('a')
                        ->where('a.active = true');
                },
@@ -233,42 +251,52 @@ class ActivityType extends AbstractType
            $builder->add('persons', HiddenType::class);
            $builder->get('persons')
                ->addModelTransformer(new CallbackTransformer(
-                   function (iterable $personsAsIterable): string {
+                    static function (iterable $personsAsIterable): string {
                        $personIds = [];
+
                        foreach ($personsAsIterable as $value) {
                            $personIds[] = $value->getId();
                        }
+
                        return implode(',', $personIds);
                    },
                    function (?string $personsAsString): array {
+                        if (null === $personsAsString) {
+                            return [];
+                        }
+
                        return array_map(
-                          fn(string $id): ?Person => $this->om->getRepository(Person::class)->findOneBy(['id' => (int) $id]),
+                            fn (string $id): ?Person => $this->om->getRepository(Person::class)->findOneBy(['id' => (int) $id]),
                            explode(',', $personsAsString)
                        );
                    }
-               ))
-           ;
+                ));
        }

        if ($activityType->isVisible('thirdParties')) {
            $builder->add('thirdParties', HiddenType::class);
            $builder->get('thirdParties')
                ->addModelTransformer(new CallbackTransformer(
-                   function (iterable $thirdpartyAsIterable): string {
+                    static function (iterable $thirdpartyAsIterable): string {
                        $thirdpartyIds = [];
+
                        foreach ($thirdpartyAsIterable as $value) {
                            $thirdpartyIds[] = $value->getId();
                        }
+
                        return implode(',', $thirdpartyIds);
                    },
                    function (?string $thirdpartyAsString): array {
+                        if (null === $thirdpartyAsString) {
+                            return [];
+                        }
+
                        return array_map(
-                           fn(string $id): ?ThirdParty => $this->om->getRepository(ThirdParty::class)->findOneBy(['id' => (int) $id]),
+                            fn (string $id): ?ThirdParty => $this->om->getRepository(ThirdParty::class)->findOneBy(['id' => (int) $id]),
                            explode(',', $thirdpartyAsString)
                        );
                    }
-               ))
-           ;
+                ));
        }

        if ($activityType->isVisible('documents')) {
@@ -278,7 +306,8 @@ class ActivityType extends AbstractType
                'required' => $activityType->isRequired('documents'),
                'allow_add' => true,
                'button_add_label' => 'activity.Insert a document',
-                'button_remove_label' => 'activity.Remove a document'
+                'button_remove_label' => 'activity.Remove a document',
+                'empty_collection_explain' => 'No documents',
            ]);
        }

@@ -286,38 +315,43 @@ class ActivityType extends AbstractType
            $builder->add('users', HiddenType::class);
            $builder->get('users')
                ->addModelTransformer(new CallbackTransformer(
-                   function (iterable $usersAsIterable): string {
+                    static function (iterable $usersAsIterable): string {
                        $userIds = [];
+
                        foreach ($usersAsIterable as $value) {
                            $userIds[] = $value->getId();
                        }
+
                        return implode(',', $userIds);
                    },
                    function (?string $usersAsString): array {
+                        if (null === $usersAsString) {
+                            return [];
+                        }
+
                        return array_map(
-                           fn(string $id): ?User => $this->om->getRepository(User::class)->findOneBy(['id' => (int) $id]),
+                            fn (string $id): ?User => $this->om->getRepository(User::class)->findOneBy(['id' => (int) $id]),
                            explode(',', $usersAsString)
                        );
                    }
-               ))
-           ;
+                ));
        }

        if ($activityType->isVisible('location')) {
            $builder->add('location', HiddenType::class)
                ->get('location')
                ->addModelTransformer(new CallbackTransformer(
-                    function (?Location $location): string {
+                    static function (?Location $location): string {
                        if (null === $location) {
                            return '';
                        }
-                        return $location->getId();
+
+                        return (string) $location->getId();
                    },
                    function (?string $id): ?Location {
                        return $this->om->getRepository(Location::class)->findOneBy(['id' => (int) $id]);
                    }
-                ))
-            ;
+                ));
        }

        if ($activityType->isVisible('emergency')) {
@@ -347,7 +381,7 @@ class ActivityType extends AbstractType
                ->addModelTransformer($durationTimeTransformer);

            $builder->get($fieldName)
-                ->addEventListener(FormEvents::PRE_SET_DATA, function(FormEvent $formEvent) use (
+                ->addEventListener(FormEvents::PRE_SET_DATA, static function (FormEvent $formEvent) use (
                    $timeChoices,
                    $builder,
                    $durationTimeTransformer,
@@ -356,24 +390,25 @@ class ActivityType extends AbstractType
                ) {
                    // set the timezone to GMT, and fix the difference between current and GMT
                    // the datetimetransformer will then handle timezone as GMT
-                    $timezoneUTC = new \DateTimeZone('GMT');
-                    /* @var $data \DateTime */
-                    $data = $formEvent->getData() === NULL ?
-                        \DateTime::createFromFormat('U', 300) :
+                    $timezoneUTC = new DateTimeZone('GMT');
+                    /** @var DateTime $data */
+                    $data = $formEvent->getData() === null ?
+                        DateTime::createFromFormat('U', '300') :
                        $formEvent->getData();
                    $seconds = $data->getTimezone()->getOffset($data);
                    $data->setTimeZone($timezoneUTC);
-                    $data->add(new \DateInterval('PT'.$seconds.'S'));
+                    $data->add(new DateInterval('PT' . $seconds . 'S'));

                    // test if the timestamp is in the choices.
                    // If not, recreate the field with the new timestamp
-                    if (!in_array($data->getTimestamp(), $timeChoices)) {
+                    if (!in_array($data->getTimestamp(), $timeChoices, true)) {
                        // the data are not in the possible values. add them
                        $timeChoices[$data->format('H:i')] = $data->getTimestamp();
                        $form = $builder->create($fieldName, ChoiceType::class, array_merge(
-                            $durationTimeOptions, [
+                            $durationTimeOptions,
+                            [
                                'choices' => $timeChoices,
-                                'auto_initialize' => false
+                                'auto_initialize' => false,
                            ]
                        ));
                        $form->addModelTransformer($durationTimeTransformer);
@@ -383,12 +418,10 @@ class ActivityType extends AbstractType
        }
    }

-
-
    public function configureOptions(OptionsResolver $resolver): void
    {
        $resolver->setDefaults([
-            'data_class' => Activity::class
+            'data_class' => Activity::class,
        ]);

        $resolver
@@ -396,8 +429,7 @@ class ActivityType extends AbstractType
            ->setAllowedTypes('center', ['null', 'Chill\MainBundle\Entity\Center'])
            ->setAllowedTypes('role', 'Symfony\Component\Security\Core\Role\Role')
            ->setAllowedTypes('activityType', \Chill\ActivityBundle\Entity\ActivityType::class)
-            ->setAllowedTypes('accompanyingPeriod', [\Chill\PersonBundle\Entity\AccompanyingPeriod::class, 'null'])
-        ;
+            ->setAllowedTypes('accompanyingPeriod', [\Chill\PersonBundle\Entity\AccompanyingPeriod::class, 'null']);
    }

    public function getBlockPrefix(): string
--- a/src/Bundle/ChillActivityBundle/Form/ActivityTypeCategoryType.php
+++ b/src/Bundle/ChillActivityBundle/Form/ActivityTypeCategoryType.php
@@ -1,14 +1,23 @@
 <?php

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

 use Chill\ActivityBundle\Entity\ActivityTypeCategory;
+use Chill\MainBundle\Form\Type\TranslatableStringFormType;
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\Extension\Core\Type\NumberType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
-use Chill\MainBundle\Form\Type\TranslatableStringFormType;

 class ActivityTypeCategoryType extends AbstractType
 {
@@ -16,24 +25,23 @@ class ActivityTypeCategoryType extends AbstractType
    {
        $builder
            ->add('name', TranslatableStringFormType::class)
-            ->add('active', ChoiceType::class, array(
-                'choices' => array(
+            ->add('active', ChoiceType::class, [
+                'choices' => [
                    'Yes' => true,
-                    'No'  => false
-                ),
-                'expanded' => true
-            ))
+                    'No' => false,
+                ],
+                'expanded' => true,
+            ])
            ->add('ordering', NumberType::class, [
                'required' => true,
-                'scale' => 5
-            ])
-        ;
+                'scale' => 5,
+            ]);
    }

    public function configureOptions(OptionsResolver $resolver): void
    {
-        $resolver->setDefaults(array(
-            'data_class' => ActivityTypeCategory::class
-        ));
+        $resolver->setDefaults([
+            'data_class' => ActivityTypeCategory::class,
+        ]);
    }
 }
--- a/src/Bundle/ChillActivityBundle/Form/ActivityTypeType.php
+++ b/src/Bundle/ChillActivityBundle/Form/ActivityTypeType.php
@@ -1,18 +1,27 @@
 <?php

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

 use Chill\ActivityBundle\Entity\ActivityTypeCategory;
 use Chill\ActivityBundle\Form\Type\ActivityFieldPresence;
+use Chill\MainBundle\Form\Type\TranslatableStringFormType;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\Extension\Core\Type\NumberType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
-use Chill\MainBundle\Form\Type\TranslatableStringFormType;

 class ActivityTypeType extends AbstractType
 {
@@ -30,9 +39,9 @@ class ActivityTypeType extends AbstractType
            ->add('active', ChoiceType::class, [
                'choices' => [
                    'Yes' => true,
-                    'No'  => false
+                    'No' => false,
                ],
-                'expanded' => true
+                'expanded' => true,
            ])
            ->add('category', EntityType::class, [
                'class' => ActivityTypeCategory::class,
@@ -42,20 +51,20 @@ class ActivityTypeType extends AbstractType
            ])
            ->add('ordering', NumberType::class, [
                'required' => true,
-                'scale' => 5
-            ])
-        ;
+                'scale' => 5,
+            ]);

        $fields = [
-            'persons', 'user', 'date', 'place', 'persons',
+            'persons', 'user', 'date', 'location', 'persons',
            'thirdParties', 'durationTime', 'travelTime', 'attendee',
            'reasons', 'comment', 'sentReceived', 'documents',
-            'emergency', 'accompanyingPeriod', 'socialData', 'users'
+            'emergency', 'socialIssues', 'socialActions', 'users',
        ];
+
        foreach ($fields as $field) {
            $builder
-                ->add($field.'Visible', ActivityFieldPresence::class)
-                ->add($field.'Label', TextType::class, [
+                ->add($field . 'Visible', ActivityFieldPresence::class)
+                ->add($field . 'Label', TextType::class, [
                    'required' => false,
                    'empty_data' => '',
                ]);
@@ -64,8 +73,8 @@ class ActivityTypeType extends AbstractType

    public function configureOptions(OptionsResolver $resolver)
    {
-        $resolver->setDefaults(array(
-            'data_class' => \Chill\ActivityBundle\Entity\ActivityType::class
-        ));
+        $resolver->setDefaults([
+            'data_class' => \Chill\ActivityBundle\Entity\ActivityType::class,
+        ]);
    }
 }
--- a/src/Bundle/ChillActivityBundle/Form/Type/ActivityFieldPresence.php
+++ b/src/Bundle/ChillActivityBundle/Form/Type/ActivityFieldPresence.php
@@ -1,5 +1,14 @@
 <?php

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

 use Chill\ActivityBundle\Entity\ActivityType;
@@ -9,21 +18,21 @@ use Symfony\Component\OptionsResolver\OptionsResolver;

 class ActivityFieldPresence extends AbstractType
 {
-    public function getParent()
-    {
-        return ChoiceType::class;
-    }
-
    public function configureOptions(OptionsResolver $resolver)
    {
        $resolver->setDefaults(
-            array(
+            [
                'choices' => [
                    'Invisible' => ActivityType::FIELD_INVISIBLE,
                    'Optional' => ActivityType::FIELD_OPTIONAL,
                    'Required' => ActivityType::FIELD_REQUIRED,
                ],
-            )
+            ]
        );
    }
+
+    public function getParent()
+    {
+        return ChoiceType::class;
+    }
 }
--- a/src/Bundle/ChillActivityBundle/Form/Type/TranslatableActivityReason.php
+++ b/src/Bundle/ChillActivityBundle/Form/Type/TranslatableActivityReason.php
@@ -1,54 +1,39 @@
 <?php

-/*
+/**
 * Chill is a software for social workers
 *
- * Copyright (C) 2014-2020, Champs Libres Cooperative SCRLFS,
- * <http://www.champs-libres.coop>, <info@champs-libres.coop>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
 */

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

-use Symfony\Component\Form\AbstractType;
-use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Bridge\Doctrine\Form\Type\EntityType;
-use Chill\MainBundle\Templating\TranslatableStringHelper;
-use Doctrine\ORM\EntityRepository;
 use Chill\ActivityBundle\Entity\ActivityReason;
 use Chill\ActivityBundle\Templating\Entity\ActivityReasonRender;
+use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Doctrine\ORM\EntityRepository;
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\OptionsResolver\OptionsResolver;

 /**
- * FormType to choose amongst activity reasons
- * 
+ * FormType to choose amongst activity reasons.
 */
 class TranslatableActivityReason extends AbstractType
 {
-
    /**
-     *
-     * @var TranslatableStringHelper
-     */
-    protected $translatableStringHelper;
-    
-    /**
-     *
     * @var ActivityReasonRender
     */
    protected $reasonRender;

+    /**
+     * @var TranslatableStringHelper
+     */
+    protected $translatableStringHelper;
+
    public function __construct(
        TranslatableStringHelper $translatableStringHelper,
        ActivityReasonRender $reasonRender
@@ -57,6 +42,30 @@ class TranslatableActivityReason extends AbstractType
        $this->reasonRender = $reasonRender;
    }

+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $resolver->setDefaults(
+            [
+                'class' => 'ChillActivityBundle:ActivityReason',
+                'choice_label' => function (ActivityReason $choice) {
+                    return $this->reasonRender->renderString($choice, []);
+                },
+                'group_by' => function (ActivityReason $choice): ?string {
+                    if (null !== $category = $choice->getCategory()) {
+                        return $this->translatableStringHelper->localize($category->getName());
+                    }
+
+                    return null;
+                },
+                'query_builder' => static function (EntityRepository $er) {
+                    return $er->createQueryBuilder('r')
+                        ->where('r.active = true');
+                },
+                'attr' => ['class' => ' select2 '],
+            ]
+        );
+    }
+
    public function getBlockPrefix()
    {
        return 'translatable_activity_reason';
@@ -66,28 +75,4 @@ class TranslatableActivityReason extends AbstractType
    {
        return EntityType::class;
    }
-    
-    public function configureOptions(OptionsResolver $resolver)
-    {
-        $resolver->setDefaults(
-            array(
-                'class' => 'ChillActivityBundle:ActivityReason',
-                'choice_label' => function(ActivityReason $choice)  {
-                    return $this->reasonRender->renderString($choice, []);
-                },
-                'group_by' => function(ActivityReason $choice): ?string {
-                    if (null !== $category = $choice->getCategory()) {
-                        return $this->translatableStringHelper->localize($category->getName());
-                    }
-
-                    return null;
-                },
-                'query_builder' => function (EntityRepository $er) {
-                    return $er->createQueryBuilder('r')
-                        ->where('r.active = true');
-                },
-                'attr' => [ 'class' => ' select2 ']
-            )
-        );
-    }
 }
--- a/src/Bundle/ChillActivityBundle/Form/Type/TranslatableActivityReasonCategory.php
+++ b/src/Bundle/ChillActivityBundle/Form/Type/TranslatableActivityReasonCategory.php
@@ -1,40 +1,25 @@
 <?php

-/*
+/**
 * Chill is a software for social workers
 *
- * Copyright (C) 2014-2015, Champs Libres Cooperative SCRLFS,
- * <http://www.champs-libres.coop>, <info@champs-libres.coop>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
 */

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

-use Symfony\Component\Form\AbstractType;
-use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Component\HttpFoundation\RequestStack;
-use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Doctrine\ORM\EntityRepository;
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\OptionsResolver\OptionsResolver;

 /**
- * Description of TranslatableActivityReasonCategory
- *
- * @author Champs-Libres Coop
+ * Description of TranslatableActivityReasonCategory.
 */
-
-
 class TranslatableActivityReasonCategory extends AbstractType
 {
    /**
@@ -47,6 +32,21 @@ class TranslatableActivityReasonCategory extends AbstractType
        $this->requestStack = $requestStack;
    }

+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $locale = $this->requestStack->getCurrentRequest()->getLocale();
+        $resolver->setDefaults(
+            [
+                'class' => 'ChillActivityBundle:ActivityReasonCategory',
+                'choice_label' => 'name[' . $locale . ']',
+                'query_builder' => static function (EntityRepository $er) {
+                    return $er->createQueryBuilder('c')
+                        ->where('c.active = true');
+                },
+            ]
+        );
+    }
+
    public function getBlockPrefix()
    {
        return 'translatable_activity_reason_category';
@@ -56,19 +56,4 @@ class TranslatableActivityReasonCategory extends AbstractType
    {
        return EntityType::class;
    }
-
-    public function configureOptions(OptionsResolver $resolver)
-    {
-        $locale = $this->requestStack->getCurrentRequest()->getLocale();
-        $resolver->setDefaults(
-            array(
-                'class' => 'ChillActivityBundle:ActivityReasonCategory',
-                'choice_label' => 'name['.$locale.']',
-                'query_builder' => function (EntityRepository $er) {
-                    return $er->createQueryBuilder('c')
-                        ->where('c.active = true');
-                }
-            )
-        );
-    }
 }
--- a/src/Bundle/ChillActivityBundle/Form/Type/TranslatableActivityType.php
+++ b/src/Bundle/ChillActivityBundle/Form/Type/TranslatableActivityType.php
@@ -1,25 +1,32 @@
 <?php

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

 namespace Chill\ActivityBundle\Form\Type;

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

 class TranslatableActivityType extends AbstractType
 {
-    protected TranslatableStringHelperInterface $translatableStringHelper;
-
    protected ActivityTypeRepository $activityTypeRepository;

+    protected TranslatableStringHelperInterface $translatableStringHelper;
+
    public function __construct(
        TranslatableStringHelperInterface $helper,
        ActivityTypeRepository $activityTypeRepository
@@ -28,6 +35,32 @@ class TranslatableActivityType extends AbstractType
        $this->activityTypeRepository = $activityTypeRepository;
    }

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

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

 use Chill\ActivityBundle\Security\Authorization\ActivityVoter;
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
-use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Knp\Menu\MenuItem;
-use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 use Symfony\Component\Security\Core\Security;
 use Symfony\Contracts\Translation\TranslatorInterface;

 class AccompanyingCourseMenuBuilder implements LocalMenuBuilderInterface
 {
-    protected TranslatorInterface $translator;
-
    protected Security $security;

+    protected TranslatorInterface $translator;
+
    public function __construct(
        Security $security,
        TranslatorInterface $translator
@@ -24,23 +31,26 @@ class AccompanyingCourseMenuBuilder implements LocalMenuBuilderInterface
        $this->security = $security;
        $this->translator = $translator;
    }
-    public static function getMenuIds(): array
-    {
-        return ['accompanyingCourse'];
-    }

    public function buildMenu($menuId, MenuItem $menu, array $parameters)
    {
        $period = $parameters['accompanyingCourse'];

-        if (AccompanyingPeriod::STEP_DRAFT !== $period->getStep()
-            && $this->security->isGranted(ActivityVoter::SEE, $period)) {
+        if (
+            AccompanyingPeriod::STEP_DRAFT !== $period->getStep()
+            && $this->security->isGranted(ActivityVoter::SEE, $period)
+        ) {
            $menu->addChild($this->translator->trans('Activity'), [
                'route' => 'chill_activity_activity_list',
                'routeParameters' => [
                    'accompanying_period_id' => $period->getId(),
-                ]])
+                ], ])
                ->setExtras(['order' => 40]);
        }
    }
+
+    public static function getMenuIds(): array
+    {
+        return ['accompanyingCourse'];
+    }
 }
--- a/src/Bundle/ChillActivityBundle/Menu/AdminMenuBuilder.php
+++ b/src/Bundle/ChillActivityBundle/Menu/AdminMenuBuilder.php
@@ -1,4 +1,12 @@
 <?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);

 namespace Chill\ActivityBundle\Menu;
@@ -7,6 +15,8 @@ use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
 use Knp\Menu\MenuItem;
 use Symfony\Component\Security\Core\Security;

+use function in_array;
+
 final class AdminMenuBuilder implements LocalMenuBuilderInterface
 {
    private Security $security;
@@ -16,33 +26,33 @@ final class AdminMenuBuilder implements LocalMenuBuilderInterface
        $this->security = $security;
    }

-    public static function getMenuIds(): array
-    {
-        return ['admin_index', 'admin_section', 'admin_activity'];
-    }
-
    public function buildMenu($menuId, MenuItem $menu, array $parameters)
    {
        if (!$this->security->isGranted('ROLE_ADMIN')) {
            return;
        }

-        if (in_array($menuId, ['admin_index', 'admin_section'])) {
+        if (in_array($menuId, ['admin_index', 'admin_section'], true)) {
            $menu->addChild('Activities', [
-                'route' => 'chill_admin_activity_index'
+                'route' => 'chill_admin_activity_index',
            ])
                ->setExtras([
                    'order' => 2000,
-                    'explain' => "Activity configuration"
+                    'explain' => 'Activity configuration',
                ]);
        } else {
            $menu
                ->addChild('Activities', [
-                    'route' => 'chill_admin_activity_index'
+                    'route' => 'chill_admin_activity_index',
                ])
                ->setExtras([
-                    'order' => '60'
+                    'order' => '60',
                ]);
        }
    }
+
+    public static function getMenuIds(): array
+    {
+        return ['admin_index', 'admin_section', 'admin_activity'];
+    }
 }
--- a/src/Bundle/ChillActivityBundle/Menu/PersonMenuBuilder.php
+++ b/src/Bundle/ChillActivityBundle/Menu/PersonMenuBuilder.php
@@ -1,68 +1,56 @@
 <?php
-/*
- * Copyright (C) 2018 Julien Fastré <julien.fastre@champs-libres.coop>
+
+/**
+ * Chill is a software for social workers
 *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
 */
+
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Menu;
+
+use Chill\ActivityBundle\Security\Authorization\ActivityVoter;
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
 use Knp\Menu\MenuItem;
 use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
-use Chill\ActivityBundle\Security\Authorization\ActivityVoter;
 use Symfony\Component\Translation\TranslatorInterface;

-/**
- * 
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- */
 class PersonMenuBuilder implements LocalMenuBuilderInterface
 {
    /**
-     *
-     * @var TranslatorInterface
-     */
-    protected $translator;
-    
-    /**
-     *
     * @var AuthorizationCheckerInterface
     */
    protected $authorizationChecker;

+    /**
+     * @var TranslatorInterface
+     */
+    protected $translator;
+
    public function __construct(
        AuthorizationCheckerInterface $authorizationChecker,
-        TranslatorInterface $translator)
-    {
+        TranslatorInterface $translator
+    ) {
        $this->translator = $translator;
        $this->authorizationChecker = $authorizationChecker;
    }

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

        if ($this->authorizationChecker->isGranted(ActivityVoter::SEE, $person)) {
            $menu->addChild(
-                $this->translator->trans('Activity list'), [
+                $this->translator->trans('Activity list'),
+                [
                    'route' => 'chill_activity_activity_list',
-                    'routeParameters' => [ 'person_id' => $person->getId() ],
-                ])
-                ->setExtra('order', 201)
-                ;
+                    'routeParameters' => ['person_id' => $person->getId()],
+                ]
+            )
+                ->setExtra('order', 201);
        }
    }

--- a/src/Bundle/ChillActivityBundle/Notification/ActivityNotificationHandler.php
+++ b/src/Bundle/ChillActivityBundle/Notification/ActivityNotificationHandler.php
@@ -0,0 +1,45 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\ActivityBundle\Notification;
+
+use Chill\ActivityBundle\Entity\Activity;
+use Chill\ActivityBundle\Repository\ActivityRepository;
+use Chill\MainBundle\Entity\Notification;
+use Chill\MainBundle\Notification\NotificationHandlerInterface;
+
+final class ActivityNotificationHandler implements NotificationHandlerInterface
+{
+    private ActivityRepository $activityRepository;
+
+    public function __construct(ActivityRepository $activityRepository)
+    {
+        $this->activityRepository = $activityRepository;
+    }
+
+    public function getTemplate(Notification $notification, array $options = []): string
+    {
+        return '@ChillActivity/Activity/showInNotification.html.twig';
+    }
+
+    public function getTemplateData(Notification $notification, array $options = []): array
+    {
+        return [
+            'notification' => $notification,
+            'activity' => $this->activityRepository->find($notification->getRelatedEntityId()),
+        ];
+    }
+
+    public function supports(Notification $notification, array $options = []): bool
+    {
+        return $notification->getRelatedEntityClass() === Activity::class;
+    }
+}
--- a/src/Bundle/ChillActivityBundle/Notification/ActivityNotificationRenderer.php
+++ b/src/Bundle/ChillActivityBundle/Notification/ActivityNotificationRenderer.php
@@ -1,24 +0,0 @@
-<?php
-
-namespace Chill\ActivityBundle\Notification;
-
-use Chill\MainBundle\Entity\Notification;
-use Chill\ActivityBundle\Entity\Activity;
-
-final class ActivityNotificationRenderer
-{
-    public function supports(Notification $notification, array $options = []): bool
-    {
-        return $notification->getRelatedEntityClass() == Activity::class;
-    }
-
-    public function getTemplate()
-    {
-        return '@ChillActivity/Activity/showInNotification.html.twig';
-    }
-
-    public function getTemplateData(Notification $notification)
-    {
-        return ['notification' => $notification];
-    }
-}
--- a/src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepository.php
+++ b/src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepository.php
@@ -1,60 +1,48 @@
 <?php

-/*
+/**
 * Chill is a software for social workers
 *
- * Copyright (C) 2021, Champs Libres Cooperative SCRLFS,
- * <http://www.champs-libres.coop>, <info@champs-libres.coop>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
 */

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

 use Chill\ActivityBundle\Entity\Activity;
-use Chill\MainBundle\Security\Resolver\CenterResolverDispatcher;
-use Chill\PersonBundle\Entity\AccompanyingPeriod;
-use Chill\PersonBundle\Entity\Person;
-use Chill\ActivityBundle\Repository\ActivityRepository;
 use Chill\ActivityBundle\Security\Authorization\ActivityVoter;
 use Chill\MainBundle\Entity\Scope;
-use Doctrine\ORM\QueryBuilder;
-use Doctrine\ORM\Query\Expr\Orx;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
+use Chill\MainBundle\Security\Resolver\CenterResolverDispatcherInterface;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Entity\Person;
+use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 use Symfony\Component\Security\Core\Role\Role;
-use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\Security\Core\Security;

+use function count;
+use function in_array;

 final class ActivityACLAwareRepository implements ActivityACLAwareRepositoryInterface
 {
    private AuthorizationHelper $authorizationHelper;

-    private TokenStorageInterface $tokenStorage;
-
-    private ActivityRepository $repository;
+    private CenterResolverDispatcherInterface $centerResolverDispatcher;

    private EntityManagerInterface $em;

+    private ActivityRepository $repository;
+
    private Security $security;

-    private CenterResolverDispatcher $centerResolverDispatcher;
+    private TokenStorageInterface $tokenStorage;

    public function __construct(
        AuthorizationHelper $authorizationHelper,
-        CenterResolverDispatcher $centerResolverDispatcher,
+        CenterResolverDispatcherInterface $centerResolverDispatcher,
        TokenStorageInterface $tokenStorage,
        ActivityRepository $repository,
        EntityManagerInterface $em,
@@ -68,34 +56,11 @@ final class ActivityACLAwareRepository implements ActivityACLAwareRepositoryInte
        $this->security = $security;
    }

-    /**
-     * @param Person $person
-     * @param string $role
-     * @param int|null $start
-     * @param int|null $limit
-     * @param array $orderBy
-     * @return array|Activity[]
-     */
-    public function findByPerson(Person $person, string $role, ?int $start = 0, ?int $limit = 1000, ?array $orderBy = []): array
-    {
-        $user = $this->security->getUser();
-        $center = $this->centerResolverDispatcher->resolveCenter($person);
-        if (0 === count($orderBy)) {
-            $orderBy = ['date' => 'DESC'];
-        }
-
-        $reachableScopes = $this->authorizationHelper
-            ->getReachableCircles($user, $role, $center);
-
-        return $this->em->getRepository(Activity::class)
-            ->findByPersonImplied($person, $reachableScopes, $orderBy, $limit, $start);
-        ;
-    }
-
    public function findByAccompanyingPeriod(AccompanyingPeriod $period, string $role, ?int $start = 0, ?int $limit = 1000, ?array $orderBy = []): array
    {
        $user = $this->security->getUser();
        $center = $this->centerResolverDispatcher->resolveCenter($period);
+
        if (0 === count($orderBy)) {
            $orderBy = ['date' => 'DESC'];
        }
@@ -107,6 +72,27 @@ final class ActivityACLAwareRepository implements ActivityACLAwareRepositoryInte
            ->findByAccompanyingPeriod($period, $scopes, true, $limit, $start, $orderBy);
    }

+    /**
+     * @param array $orderBy
+     *
+     * @return Activity[]|array
+     */
+    public function findByPerson(Person $person, string $role, ?int $start = 0, ?int $limit = 1000, ?array $orderBy = []): array
+    {
+        $user = $this->security->getUser();
+        $center = $this->centerResolverDispatcher->resolveCenter($person);
+
+        if (0 === count($orderBy)) {
+            $orderBy = ['date' => 'DESC'];
+        }
+
+        $reachableScopes = $this->authorizationHelper
+            ->getReachableCircles($user, $role, $center);
+
+        return $this->em->getRepository(Activity::class)
+            ->findByPersonImplied($person, $reachableScopes, $orderBy, $limit, $start);
+    }
+
    public function queryTimelineIndexer(string $context, array $args = []): array
    {
        $metadataActivity = $this->em->getClassMetadata(Activity::class);
@@ -116,13 +102,13 @@ final class ActivityACLAwareRepository implements ActivityACLAwareRepositoryInte

        return [
            'id' => $metadataActivity->getTableName()
-                .'.'.$metadataActivity->getColumnName('id'),
+                 . '.' . $metadataActivity->getColumnName('id'),
            'type' => 'activity',
            'date' => $metadataActivity->getTableName()
-                .'.'.$metadataActivity->getColumnName('date'),
+                 . '.' . $metadataActivity->getColumnName('date'),
            'FROM' => $from,
            'WHERE' => $where,
-           'parameters' => $parameters
+            'parameters' => $parameters,
        ];
    }

@@ -132,13 +118,12 @@ final class ActivityACLAwareRepository implements ActivityACLAwareRepositoryInte
        $metadataPerson = $this->em->getClassMetadata(Person::class);
        $associationMapping = $metadataActivity->getAssociationMapping('person');

-        return $metadataActivity->getTableName().' JOIN '
-            .$metadataPerson->getTableName().' ON '
-            .$metadataPerson->getTableName().'.'.
+        return $metadataActivity->getTableName() . ' JOIN '
+            . $metadataPerson->getTableName() . ' ON '
+            . $metadataPerson->getTableName() . '.' .
                $associationMapping['joinColumns'][0]['referencedColumnName']
-            .' = '
-            .$associationMapping['joinColumns'][0]['name']
-            ;
+            . ' = '
+            . $associationMapping['joinColumns'][0]['name'];
    }

    private function getWhereClause(string $context, array $args): array
@@ -152,18 +137,19 @@ final class ActivityACLAwareRepository implements ActivityACLAwareRepositoryInte
        $activityToScope = $metadataActivity->getAssociationMapping('scope')['joinColumns'][0]['name'];
        $personToCenter = $metadataPerson->getAssociationMapping('center')['joinColumns'][0]['name'];

-
        // acls:
        $role = new Role(ActivityVoter::SEE);
-        $reachableCenters = $this->authorizationHelper->getReachableCenters($this->tokenStorage->getToken()->getUser(),
-                $role);
+        $reachableCenters = $this->authorizationHelper->getReachableCenters(
+            $this->tokenStorage->getToken()->getUser(),
+            $role
+        );

        if (count($reachableCenters) === 0) {
            // insert a dummy condition
            return 'FALSE = TRUE';
        }

-        if ($context === 'person') {
+        if ('person' === $context) {
            // we start with activities having the person_id linked to person
            $where .= sprintf('%s = ? AND ', $activityToPerson);
            $parameters[] = $person->getId();
@@ -172,21 +158,24 @@ final class ActivityACLAwareRepository implements ActivityACLAwareRepositoryInte
        // we add acl (reachable center and scopes)
        $where .= '('; // first loop for the for centers
        $centersI = 0; // like centers#i
+
        foreach ($reachableCenters as $center) {
            // we pass if not in centers
-            if (!\in_array($center, $args['centers'])) {
+            if (!in_array($center, $args['centers'], true)) {
                continue;
            }
            // we get all the reachable scopes for this center
            $reachableScopes = $this->authorizationHelper->getReachableScopes($this->tokenStorage->getToken()->getUser(), $role, $center);
            // we get the ids for those scopes
            $reachablesScopesId = array_map(
-                function(Scope $scope) { return $scope->getId(); },
+                static function (Scope $scope) {
+                    return $scope->getId();
+                },
                $reachableScopes
            );

            // if not the first center
-            if ($centersI > 0) {
+            if (0 < $centersI) {
                $where .= ') OR (';
            }

@@ -199,21 +188,20 @@ final class ActivityACLAwareRepository implements ActivityACLAwareRepositoryInte
            $scopesI = 0; //like scope#i

            foreach ($reachablesScopesId as $scopeId) {
-                if ($scopesI > 0) {
+                if (0 < $scopesI) {
                    $where .= ' OR ';
                }
                $where .= sprintf(' %s.%s = ? ', $metadataActivity->getTableName(), $activityToScope);
                $parameters[] = $scopeId;
-                $scopesI ++;
+                ++$scopesI;
            }
            // close loop for scopes
            $where .= ') ';
-            $centersI++;
+            ++$centersI;
        }
        // close loop for centers
        $where .= ')';

        return [$where, $parameters];
    }
-
 }
--- a/src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepositoryInterface.php
+++ b/src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepositoryInterface.php
@@ -1,5 +1,14 @@
 <?php

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

 use Chill\PersonBundle\Entity\AccompanyingPeriod;
@@ -8,12 +17,12 @@ use Chill\PersonBundle\Entity\Person;
 interface ActivityACLAwareRepositoryInterface
 {
    /**
-     * @return array|Activity[]
-     */
-    public function findByPerson(Person $person, string $role, ?int $start = 0, ?int $limit = 1000, ?array $orderBy = []): array;
-
-    /**
-     * @return array|Activity[]
+     * @return Activity[]|array
     */
    public function findByAccompanyingPeriod(AccompanyingPeriod $period, string $role, ?int $start = 0, ?int $limit = 1000, ?array $orderBy = []): array;
+
+    /**
+     * @return Activity[]|array
+     */
+    public function findByPerson(Person $person, string $role, ?int $start = 0, ?int $limit = 1000, ?array $orderBy = []): array;
 }
--- a/src/Bundle/ChillActivityBundle/Repository/ActivityReasonCategoryRepository.php
+++ b/src/Bundle/ChillActivityBundle/Repository/ActivityReasonCategoryRepository.php
@@ -1,5 +1,12 @@
 <?php

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

 namespace Chill\ActivityBundle\Repository;
--- a/src/Bundle/ChillActivityBundle/Repository/ActivityReasonRepository.php
+++ b/src/Bundle/ChillActivityBundle/Repository/ActivityReasonRepository.php
@@ -1,5 +1,12 @@
 <?php

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

 namespace Chill\ActivityBundle\Repository;
--- a/src/Bundle/ChillActivityBundle/Repository/ActivityRepository.php
+++ b/src/Bundle/ChillActivityBundle/Repository/ActivityRepository.php
@@ -1,5 +1,12 @@
 <?php

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

 namespace Chill\ActivityBundle\Repository;
@@ -24,34 +31,8 @@ class ActivityRepository extends ServiceEntityRepository
    }

    /**
-     * @return Activity[]
-     */
-    public function findByPersonImplied(Person $person, array $scopes, ?array $orderBy = [ 'date' => 'DESC'], ?int $limit = 100, ?int $offset = 0): array
-    {
-        $qb = $this->createQueryBuilder('a');
-        $qb->select('a');
-
-        $qb
-            ->where($qb->expr()->in('a.scope', ':scopes'))
-            ->setParameter('scopes', $scopes)
-            ->andWhere(
-                $qb->expr()->orX(
-                    $qb->expr()->eq('a.person', ':person'),
-                    ':person MEMBER OF a.persons'
-                )
-            )
-            ->setParameter('person', $person);
-
-        foreach ($orderBy as $k => $dir) {
-            $qb->addOrderBy('a.'.$k, $dir);
-        }
-
-        $qb->setMaxResults($limit)->setFirstResult($offset);
-
-        return $qb->getQuery()->getResult();
-    }
-
-    /**
+     * @deprecated use @see{ActivityACLAwareRepositoryInterface::findByAccompanyingPeriod}
+     *
     * @return Activity[]
     */
    public function findByAccompanyingPeriod(AccompanyingPeriod $period, array $scopes, ?bool $allowNullScope = false, ?int $limit = 100, ?int $offset = 0, array $orderBy = ['date' => 'desc']): array
@@ -81,7 +62,35 @@ class ActivityRepository extends ServiceEntityRepository
            ->setParameter('period', $period);

        foreach ($orderBy as $k => $dir) {
-            $qb->addOrderBy('a.'.$k, $dir);
+            $qb->addOrderBy('a.' . $k, $dir);
+        }
+
+        $qb->setMaxResults($limit)->setFirstResult($offset);
+
+        return $qb->getQuery()->getResult();
+    }
+
+    /**
+     * @return Activity[]
+     */
+    public function findByPersonImplied(Person $person, array $scopes, ?array $orderBy = ['date' => 'DESC'], ?int $limit = 100, ?int $offset = 0): array
+    {
+        $qb = $this->createQueryBuilder('a');
+        $qb->select('a');
+
+        $qb
+            ->where($qb->expr()->in('a.scope', ':scopes'))
+            ->setParameter('scopes', $scopes)
+            ->andWhere(
+                $qb->expr()->orX(
+                    $qb->expr()->eq('a.person', ':person'),
+                    ':person MEMBER OF a.persons'
+                )
+            )
+            ->setParameter('person', $person);
+
+        foreach ($orderBy as $k => $dir) {
+            $qb->addOrderBy('a.' . $k, $dir);
        }

        $qb->setMaxResults($limit)->setFirstResult($offset);
--- a/src/Bundle/ChillActivityBundle/Repository/ActivityTypeCategoryRepository.php
+++ b/src/Bundle/ChillActivityBundle/Repository/ActivityTypeCategoryRepository.php
@@ -1,5 +1,12 @@
 <?php

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

 namespace Chill\ActivityBundle\Repository;
--- a/src/Bundle/ChillActivityBundle/Repository/ActivityTypeRepository.php
+++ b/src/Bundle/ChillActivityBundle/Repository/ActivityTypeRepository.php
@@ -1,5 +1,12 @@
 <?php

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

 namespace Chill\ActivityBundle\Repository;
--- a/src/Bundle/ChillActivityBundle/Resources/public/chill/chillactivity.scss
+++ b/src/Bundle/ChillActivityBundle/Resources/public/chill/chillactivity.scss
@@ -9,8 +9,9 @@ div.new-activity-select-type {
      display: flex;
      flex-direction: row;
      flex-wrap: wrap;
-      justify-content: center;
+      justify-content: flex-start;
      gap: 12px;
+      margin-bottom: 30px;

      div.bloc {
         width: 200px;
@@ -24,14 +25,18 @@ div.new-activity-select-type {
 }

 //// ACTIVITY LIST PAGE
-// precise badge-title specific details
+// precise dashboard specific details

+p.date-label {
+   display: inline-block;
+   margin: 0 0.5em 0 0;
+   font-weight: 700;
+   font-size: 18pt;
+}
+div.dashboard,
+h4.badge-title,
+h3.badge-title,
 h2.badge-title {
-    div.duration {
-        font-size: smaller;
-        padding-left: 1em;
-        margin-top: 1em;
-    }
   ul.list-content {
      font-size: 70%;
      list-style-type: none;
@@ -39,16 +44,13 @@ h2.badge-title {
      margin: 0;
      li {
         margin-bottom: 0.2em;
-            // exception: change bg color for action badges above badge-title
+         // exception: change bg color for action badges above dashboard
         .bg-light {
               background-color: $chill-light-gray !important;
         }
      }
   }
 }
-div.main {
-    padding: 1em;
-}

 //// ACTIVITY SHOW AND FORM PAGES
 // Exceptions for flex-bloc in concerned-groups
--- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/App.vue
+++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/App.vue
@@ -1,7 +1,7 @@
 <template>
-   <concerned-groups></concerned-groups>
-   <social-issues-acc></social-issues-acc>
-   <location></location>
+   <concerned-groups v-if="hasPerson"></concerned-groups>
+   <social-issues-acc v-if="hasSocialIssues"></social-issues-acc>
+   <location v-if="hasLocation"></location>
 </template>

 <script>
@@ -11,6 +11,7 @@ import Location from './components/Location.vue';

 export default {
   name: "App",
+   props: ['hasSocialIssues', 'hasLocation', 'hasPerson'],
   components: {
      ConcernedGroups,
      SocialIssuesAcc,
--- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/api.js
+++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/api.js
@@ -1,4 +1,5 @@
 import { getSocialIssues } from 'ChillPersonAssets/vuejs/AccompanyingCourse/api.js';
+import { fetchResults } from 'ChillMainAssets/lib/api/apiMethods';

 /*
 *  Load socialActions by socialIssue (id)
@@ -12,33 +13,28 @@ const getSocialActionByIssue = (id) => {
      });
 };

-/*
-*   Load Locations
- */
-const getLocations = () => {
-    const url = `/api/1.0/main/location.json`;
-    return fetch(url)
+const getLocations = () => fetchResults('/api/1.0/main/location.json');
+
+const getLocationTypes = () => fetchResults('/api/1.0/main/location-type.json');
+
+const getUserCurrentLocation = 
+    () => fetch('/api/1.0/main/user-current-location.json')
        .then(response => {
            if (response.ok) { return response.json(); }
            throw Error('Error with request resource response');
         });
-};
+

 /*
-*   Load Location Types
+*   Load Location Type by defaultFor
+*   @param {string} entity - can be "person" or "thirdparty"
 */
-const getLocationTypes = () => {
-    const url = `/api/1.0/main/location-type.json`;
-    return fetch(url)
-        .then(response => {
-            if (response.ok) { return response.json(); }
-            throw Error('Error with request resource response');
-        });
+const getLocationTypeByDefaultFor = (entity) => {
+    return getLocationTypes().then(results =>
+        results.filter(t => t.defaultFor === entity)[0]
+    );
 };

-/*
-*   Post a Location
- */
 const postLocation = (body) => {
    const url = `/api/1.0/main/location.json`;
    return fetch(url, {
@@ -59,5 +55,7 @@ export {
   getSocialActionByIssue,
   getLocations,
   getLocationTypes,
-   postLocation
+   getLocationTypeByDefaultFor,
+   postLocation,
+   getUserCurrentLocation
 };
--- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/ConcernedGroups.vue
+++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/ConcernedGroups.vue
@@ -1,22 +1,20 @@
 <template>
-   <teleport to="#add-persons">
+   <teleport to="#add-persons" v-if="isComponentVisible">

      <div class="flex-bloc concerned-groups" :class="getContext">
         <persons-bloc
               v-for="bloc in contextPersonsBlocs"
               v-bind:key="bloc.key"
               v-bind:bloc="bloc"
+               v-bind:blocWidth="getBlocWidth"
               v-bind:setPersonsInBloc="setPersonsInBloc">
         </persons-bloc>
      </div>
-
-     <div v-if="getContext === 'accompanyingCourse' && filterSuggestedPersons.length > 0">
-         <ul class="list-unstyled">
-          <li v-for="p in filterSuggestedPersons" @click="addNewPerson(p)">
-             <span class="badge bg-primary" style="cursor: pointer;">
-                 <i class="fa fa-plus fa-fw text-success"></i>
-                 {{ p.text }}
-             </span>
+      <div v-if="getContext === 'accompanyingCourse' && suggestedEntities.length > 0">
+         <ul class="list-suggest add-items inline">
+               <li v-for="(p, i) in suggestedEntities" @click="addSuggestedEntity(p)" :key="`suggestedEntities-${i}`">
+                  <person-text v-if="p.type === 'person'" :person="p"></person-text>
+                  <span v-else>{{ p.text }}</span>
               </li>
         </ul>
      </div>
@@ -25,7 +23,7 @@
         buttonTitle="activity.add_persons"
         modalTitle="activity.add_persons"
         v-bind:key="addPersons.key"
-         v-bind:options="addPersons.options"
+         v-bind:options="addPersonsOptions"
         @addNewPersons="addNewPersons"
         ref="addPersons">
      </add-persons>
@@ -37,12 +35,14 @@
 import { mapState, mapGetters } from 'vuex';
 import AddPersons from 'ChillPersonAssets/vuejs/_components/AddPersons.vue';
 import PersonsBloc from './ConcernedGroups/PersonsBloc.vue';
+import PersonText from 'ChillPersonAssets/vuejs/_components/Entity/PersonText.vue';

 export default {
   name: "ConcernedGroups",
   components: {
      AddPersons,
-      PersonsBloc
+      PersonsBloc,
+      PersonText
   },
   data() {
      return {
@@ -55,38 +55,35 @@ export default {
            {  key: 'personsAssociated',
               title: 'activity.bloc_persons_associated',
               persons: [],
-               included: false
+               included: window.activity ? window.activity.activityType.personsVisible !== 0 : true
            },
            {  key: 'personsNotAssociated',
               title: 'activity.bloc_persons_not_associated',
               persons: [],
-               included: false
+               included: window.activity ? window.activity.activityType.personsVisible !== 0 : true
            },
            {  key: 'thirdparty',
               title: 'activity.bloc_thirdparty',
               persons: [],
-               included: true
+               included: window.activity ? window.activity.activityType.thirdPartiesVisible !== 0 : true
            },
            {  key: 'users',
               title: 'activity.bloc_users',
               persons: [],
-               included: true
+               included: window.activity ? window.activity.activityType.usersVisible !== 0 : true
            },
         ],
         addPersons: {
-            key: 'activity',
-            options: {
-               type: ['person', 'thirdparty', 'user'],
-               priority: null,
-               uniq: false,
-               button: {
-                   size: 'btn-sm'
-               }
-            }
+            key: 'activity'
         }
      }
   },
   computed: {
+      isComponentVisible() {
+         return window.activity
+             ? (window.activity.activityType.personsVisible !== 0 || window.activity.activityType.thirdPartiesVisible !== 0 || window.activity.activityType.usersVisible !== 0)
+             : true
+      },
      ...mapState({
         persons: state => state.activity.persons,
         thirdParties: state => state.activity.thirdParties,
@@ -94,13 +91,40 @@ export default {
         accompanyingCourse: state => state.activity.accompanyingPeriod
      }),
      ...mapGetters([
-          'filterSuggestedPersons'
+          'suggestedEntities'
      ]),
      getContext() {
         return (this.accompanyingCourse) ? "accompanyingCourse" : "person";
      },
      contextPersonsBlocs() {
         return this.personsBlocs.filter(bloc => bloc.included !== false);
+      },
+      addPersonsOptions() {
+         let optionsType = [];
+         if (window.activity) {
+            if (window.activity.activityType.personsVisible !== 0) {
+               optionsType.push('person')
+            }
+            if (window.activity.activityType.thirdPartiesVisible !== 0) {
+               optionsType.push('thirdparty')
+            }
+            if (window.activity.activityType.usersVisible !== 0) {
+               optionsType.push('user')
+            }
+         } else {
+            optionsType = ['person', 'thirdparty', 'user'];
+         }
+         return {
+            type: optionsType,
+            priority: null,
+            uniq: false,
+            button: {
+                  size: 'btn-sm'
+            }
+         }
+      },
+       getBlocWidth() {
+           return Math.round(100/(this.contextPersonsBlocs.length)) + '%';
       }
   },
   mounted() {
@@ -171,7 +195,7 @@ export default {
      },
      addNewPersons({ selected, modal }) {
         console.log('@@@ CLICK button addNewPersons', selected);
-         selected.forEach(function(item) {
+         selected.forEach((item) => {
               this.$store.dispatch('addPersonsInvolved', item);
            }, this
         );
@@ -179,7 +203,7 @@ export default {
         modal.showModal = false;
         this.setPersonsInBloc();
      },
-      addNewPerson(person) {
+      addSuggestedEntity(person) {
        this.$store.dispatch('addPersonsInvolved', { result: person, type: 'person' });
        this.setPersonsInBloc();
      },
--- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/ConcernedGroups/PersonBadge.vue
+++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/ConcernedGroups/PersonBadge.vue
@@ -1,26 +1,29 @@
 <template>
   <li>
-      <span class="badge bg-primary" :title="person.text">
-         <span class="chill_denomination">
-            {{ textCutted }}
+      <span :title="person.text">
+         <span class="chill_denomination" @click.prevent="$emit('remove', person)">
+            <person-text :person="person" :isCut="true"></person-text>
         </span>
-         <a class="fa fa-fw fa-times text-danger text-decoration-none"
-            @click.prevent="$emit('remove', person)">
-         </a>
      </span>
   </li>
 </template>

 <script>
+import PersonText from 'ChillPersonAssets/vuejs/_components/Entity/PersonText.vue';
+
+
 export default {
   name: "PersonBadge",
   props: ['person'],
-   computed: {
-      textCutted() {
-         let more = (this.person.text.length > 15) ?'…' : '';
-         return this.person.text.slice(0,15) + more;
-      }
+   components: {
+      PersonText
   },
+   // computed: {
+   //    textCutted() {
+   //       let more = (this.person.text.length > 15) ?'…' : '';
+   //       return this.person.text.slice(0,15) + more;
+   //    }
+   // },
   emits: ['remove'],
 }
 </script>
--- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/ConcernedGroups/PersonsBloc.vue
+++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/ConcernedGroups/PersonsBloc.vue
@@ -1,11 +1,11 @@
 <template>
-   <div class="item-bloc">
+   <div class="item-bloc" :style="{ 'flex-basis': blocWidth }">
      <div class="item-row">
         <div class="item-col">
            <h4>{{ $t(bloc.title) }}</h4>
         </div>
         <div class="item-col">
-            <ul class="list-content">
+            <ul class="list-suggest remove-items">
               <person-badge
                  v-for="person in bloc.persons"
                  v-bind:key="person.id"
@@ -25,7 +25,7 @@ export default {
   components: {
      PersonBadge
   },
-   props: ['bloc', 'setPersonsInBloc'],
+   props: ['bloc', 'setPersonsInBloc', 'blocWidth'],
   methods: {
      removePerson(item) {
         console.log('@@ CLICK remove person: item', item);
--- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/Location.vue
+++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/Location.vue
@@ -2,10 +2,9 @@
    <teleport to="#location">
        <div class="mb-3 row">
            <label class="col-form-label col-sm-4">
-                {{ $t('activity.location') }}
+                {{ $t("activity.location") }}
            </label>
            <div class="col-sm-8">
-
                <VueMultiselect
                    name="selectLocation"
                    id="selectLocation"
@@ -16,59 +15,57 @@
                    :searchable="true"
                    :placeholder="$t('activity.choose_location')"
                    :custom-label="customLabel"
-                    :options="locations"
-                    v-model="location">
+                    :select-label="$t('multiselect.select_label')"
+                    :deselect-label="$t('multiselect.deselect_label')"
+                    :selected-label="$t('multiselect.selected_label')"
+                    :options="availableLocations"
+                    group-values="locations"
+                    group-label="locationGroup"
+                    v-model="location"
+                >
                </VueMultiselect>
-
-                <new-location v-bind:locations="locations"></new-location>
+                <new-location v-bind:availableLocations="availableLocations"></new-location>
            </div>
        </div>
    </teleport>
 </template>

 <script>
-import { mapState } from "vuex";
-import VueMultiselect from 'vue-multiselect';
-import NewLocation from './Location/NewLocation.vue';
-import { getLocations } from '../api.js';
+import { mapState, mapGetters } from "vuex";
+import VueMultiselect from "vue-multiselect";
+import NewLocation from "./Location/NewLocation.vue";

 export default {
    name: "Location",
    components: {
        NewLocation,
-        VueMultiselect
-    },
-    data() {
-        return {
-            locations: []
-        }
+        VueMultiselect,
    },
    computed: {
-        ...mapState(['activity']),
+        ...mapState(["activity", "availableLocations"]),
+        ...mapGetters(["suggestedEntities"]),
        location: {
            get() {
                return this.activity.location;
            },
            set(value) {
-                this.$store.dispatch('updateLocation', value);
-            }
-        }
+                this.$store.dispatch("updateLocation", value);
+            },
        },
-    mounted() {
-        this.getLocationsList();
    },
    methods: {
-        getLocationsList() {
-            getLocations().then(response => new Promise(resolve => {
-                console.log('getLocations', response);
-                this.locations = response.results;
-                resolve();
-            }))
+        labelAccompanyingCourseLocation(value) {
+            return `${value.address.text} (${value.locationType.title.fr})`
        },
        customLabel(value) {
-            return `${value.locationType.title.fr} ${value.name ? value.name : ''}`;
-        }
-    }
-}
-
+            return value.locationType
+                ? value.name
+                    ? value.name === '__AccompanyingCourseLocation__'
+                        ? this.labelAccompanyingCourseLocation(value)
+                        : `${value.name} (${value.locationType.title.fr})`
+                    : value.locationType.title.fr
+                : '';
+        },
+    },
+};
 </script>
--- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/Location/NewLocation.vue
+++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/Location/NewLocation.vue
@@ -18,15 +18,6 @@
                </template>
                <template v-slot:body>
                    <form>
-                        <div class="form-floating mb-3">
-                            <p v-if="errors.length">
-                                <b>{{ $t('activity.errors') }}</b>
-                                <ul>
-                                    <li v-for="error in errors" :key="error">{{ error }}</li>
-                                </ul>
-                            </p>
-                        </div>
-
                        <div class="form-floating mb-3">
                            <select class="form-select form-select-lg" id="type" required v-model="selectType">
                                <option selected disabled value="">{{ $t('activity.choose_location_type') }}</option>
@@ -62,6 +53,12 @@
                            <input class="form-control form-control-lg" id="email" v-model="inputEmail" placeholder />
                            <label for="email">{{ $t('activity.location_fields.email') }}</label>
                        </div>
+
+                        <div class="alert alert-warning" v-if="errors.length">
+                            <ul>
+                                <li v-for="(e, i) in errors" :key="i">{{ e }}</li>
+                            </ul>
+                        </div>
                    </form>
                </template>
                <template v-slot:footer>
@@ -81,7 +78,8 @@
 import Modal from 'ChillMainAssets/vuejs/_components/Modal.vue';
 import AddAddress from "ChillMainAssets/vuejs/Address/components/AddAddress.vue";
 import { mapState } from "vuex";
-import { getLocationTypes, postLocation } from "../../api";
+import { getLocationTypes } from "../../api";
+import { makeFetch } from 'ChillMainAssets/lib/api/apiMethods';

 export default {
    name: "NewLocation",
@@ -89,7 +87,7 @@ export default {
        Modal,
        AddAddress,
    },
-    props: ['locations'],
+    props: ['availableLocations'],
    data() {
        return {
            errors: [],
@@ -214,18 +212,15 @@ export default {
            return cond;
        },
        getLocationTypesList() {
-            getLocationTypes().then(response => new Promise(resolve => {
-                console.log('getLocationTypes', response);
-                this.locationTypes = response.results.filter(t => t.availableForUsers === true);
-                resolve();
-            }))
+            getLocationTypes().then(results => {
+                this.locationTypes = results.filter(t => t.availableForUsers === true);
+            })
        },
        openModal() {
            this.modal.showModal = true;
        },
        saveNewLocation() {
            if (this.checkForm()) {
-                console.log('saveNewLocation', this.selected);
                let body = {
                    type: 'location',
                    name: this.selected.name,
@@ -244,24 +239,28 @@ export default {
                        }
                    });
                }
-                postLocation(body)
-                    .then(
-                        location => new Promise(resolve => {
-                            console.log('postLocation', location);
-                            this.locations.push(location);
-                            this.$store.dispatch('updateLocation', location);
-                            resolve();
+
+                makeFetch('POST', '/api/1.0/main/location.json', body)
+                    .then(response => {
+                         this.$store.dispatch('addAvailableLocationGroup', {
+                            locationGroup: 'Localisations nouvellement créées',
+                            locations: [response]
+                        });
+                        this.$store.dispatch('updateLocation', response);
                        this.modal.showModal = false;
                    })
-                    ).catch(
-                        err => {
-                            this.errors.push(err.message);
+                    .catch((error) => {
+                        if (error.name === 'ValidationException') {
+                            for (let v of error.violations) {
+                                this.errors.push(v);
                            }
-                    );
+                        } else {
+                            this.errors.push('An error occurred');
+                        }
+                    })
            };
        },
        submitNewAddress(payload) {
-            console.log('submitNewAddress', payload);
            this.selected.addressId = payload.addressId;
            this.addAddress.context.addressId = payload.addressId;
            this.addAddress.context.edit = true;
--- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc.vue
+++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc.vue
@@ -9,9 +9,9 @@

            <check-social-issue
               v-for="issue in socialIssuesList"
-               v-bind:key="issue.id"
-               v-bind:issue="issue"
-               v-bind:selection="socialIssuesSelected"
+               :key="issue.id"
+               :issue="issue"
+               :selection="socialIssuesSelected"
               @updateSelected="updateIssuesSelected">
            </check-social-issue>

@@ -21,18 +21,18 @@
               label="text"
               track-by="id"
               open-direction="bottom"
-               v-bind:close-on-select="true"
-               v-bind:preserve-search="false"
-               v-bind:reset-after="true"
-               v-bind:hide-selected="true"
-               v-bind:taggable="false"
-               v-bind:multiple="false"
-               v-bind:searchable="true"
-               v-bind:allow-empty="true"
-               v-bind:show-labels="false"
-               v-bind:loading="issueIsLoading"
-               v-bind:placeholder="$t('activity.choose_other_social_issue')"
-               v-bind:options="socialIssuesOther"
+               :close-on-select="true"
+               :preserve-search="false"
+               :reset-after="true"
+               :hide-selected="true"
+               :taggable="false"
+               :multiple="false"
+               :searchable="true"
+               :allow-empty="true"
+               :show-labels="false"
+               :loading="issueIsLoading"
+               :placeholder="$t('activity.choose_other_social_issue')"
+               :options="socialIssuesOther"
               @select="addIssueInList">
            </VueMultiselect>
            </div>
@@ -50,19 +50,26 @@
               <i class="chill-green fa fa-circle-o-notch fa-spin fa-lg"></i>
            </div>

+            <span v-else-if="socialIssuesSelected.length === 0" class="inline-choice chill-no-data-statement mt-3">
+               {{ $t('activity.select_first_a_social_issue') }}
+            </span>
+
+             <template v-else-if="socialActionsList.length > 0">
                 <check-social-action
                     v-if="socialIssuesSelected.length || socialActionsSelected.length"
                     v-for="action in socialActionsList"
-               v-bind:key="action.id"
-               v-bind:action="action"
-               v-bind:selection="socialActionsSelected"
+                     :key="action.id"
+                     :action="action"
+                     :selection="socialActionsSelected"
                     @updateSelected="updateActionsSelected">
                 </check-social-action>
+             </template>

-            <span v-else class="inline-choice chill-no-data-statement mt-3">
-               {{ $t('activity.select_first_a_social_issue') }}
+            <span v-else-if="actionAreLoaded && socialActionsList.length === 0" class="inline-choice chill-no-data-statement mt-3">
+                {{ $t('activity.social_action_list_empty') }}
            </span>

+
         </div>
      </div>

@@ -85,7 +92,8 @@ export default {
   data() {
      return {
         issueIsLoading: false,
-         actionIsLoading: false
+         actionIsLoading: false,
+         actionAreLoaded: false,
      }
   },
   computed: {
@@ -109,6 +117,7 @@ export default {
      /* Load others issues in multiselect
      */
      this.issueIsLoading = true;
+      this.actionAreLoaded = false;
      getSocialIssues().then(response => new Promise((resolve, reject) => {
         this.$store.commit('updateIssuesOther', response.results);

@@ -141,6 +150,8 @@ export default {
         this.$store.commit('filterList', 'actions');

         this.issueIsLoading = false;
+         this.actionAreLoaded = true;
+         this.updateActionsList();
         resolve();
      }));
   },
@@ -173,7 +184,6 @@ export default {
         to get social actions concerned
      */
      updateActionsList() {
-         //console.log('updateActionsList');
         this.resetActionsList();
         this.socialIssuesSelected.forEach(item => {

@@ -188,6 +198,7 @@ export default {
                  this.$store.commit('filterList', 'actions');

                  this.actionIsLoading = false;
+                  this.actionAreLoaded = true;
                  resolve();
            }));
         }, this);
@@ -196,6 +207,7 @@ export default {
      */
      resetActionsList() {
         this.$store.commit('resetActionsList');
+         this.actionAreLoaded = false;
         this.socialActionsSelected.forEach(item => {
            this.$store.commit('addActionInList', item);
         }, this);
--- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc/CheckSocialAction.vue
+++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc/CheckSocialAction.vue
@@ -10,7 +10,7 @@
            v-bind:value="action"
            />
         <label class="form-check-label" v-bind:for="action.id">
-            {{ action.text }}
+            <span class="badge bg-light text-dark">{{ action.text }}</span>
         </label>

      </div>
@@ -34,3 +34,15 @@ export default {
   }
 }
 </script>
+
+<style lang="scss" scoped>
+@import 'ChillMainAssets/module/bootstrap/shared';
+@import 'ChillPersonAssets/chill/scss/mixins';
+@import 'ChillMainAssets/chill/scss/chill_variables';
+span.badge {
+    @include badge_social($social-action-color);
+    font-size: 95%;
+    margin-bottom: 5px;
+    margin-right: 1em;
+}
+</style>
--- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc/CheckSocialIssue.vue
+++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc/CheckSocialIssue.vue
@@ -10,7 +10,7 @@
            v-bind:value="issue"
            />
         <label class="form-check-label" v-bind:for="issue.id">
-            {{ issue.text }}
+            <span class="badge bg-chill-l-gray text-dark">{{ issue.text }}</span>
         </label>

      </div>
@@ -34,3 +34,15 @@ export default {
   }
 }
 </script>
+
+<style lang="scss" scoped>
+@import 'ChillMainAssets/module/bootstrap/shared';
+@import 'ChillPersonAssets/chill/scss/mixins';
+@import 'ChillMainAssets/chill/scss/chill_variables';
+span.badge {
+    @include badge_social($social-issue-color);
+    font-size: 95%;
+    margin-bottom: 5px;
+    margin-right: 1em;
+}
+</style>
--- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/i18n.js
+++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/i18n.js
@@ -1,4 +1,5 @@
 import { personMessages } from 'ChillPersonAssets/vuejs/_js/i18n'
+import { multiSelectMessages } from 'ChillMainAssets/vuejs/_js/i18n'

 const activityMessages = {
   fr: {
@@ -9,6 +10,7 @@ const activityMessages = {
         choose_other_social_issue: "Ajouter une autre problématique sociale...",
         social_actions: "Actions d'accompagnement",
         select_first_a_social_issue: "Sélectionnez d'abord une problématique sociale",
+         social_action_list_empty: "Aucune action sociale disponible",

         //
         add_persons: "Ajouter des personnes concernées",
@@ -32,12 +34,11 @@ const activityMessages = {
          },
          create_address: 'Créer une adresse',
          edit_address: "Modifier l'adresse"
-
      }
   }
 }

-Object.assign(activityMessages.fr, personMessages.fr);
+Object.assign(activityMessages.fr, personMessages.fr, multiSelectMessages.fr);

 export {
   activityMessages
--- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/index.js
+++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/index.js
@@ -7,8 +7,23 @@ import App from './App.vue';

 const i18n = _createI18n(activityMessages);

+const hasSocialIssues = document.querySelector('#social-issues-acc') !== null;
+const hasLocation = document.querySelector('#location') !== null;
+const hasPerson = document.querySelector('#add-persons') !== null;
+
 const app = createApp({
-   template: `<app></app>`,
+   template: `<app
+       :hasSocialIssues="hasSocialIssues"
+       :hasLocation="hasLocation"
+       :hasPerson="hasPerson"
+    ></app>`,
+    data() {
+       return {
+           hasSocialIssues,
+           hasLocation,
+           hasPerson,
+       };
+    }
 })
 .use(store)
 .use(i18n)
--- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/store.js
+++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/store.js
@@ -1,5 +1,7 @@
 import 'es6-promise/auto';
 import { createStore } from 'vuex';
+import { postLocation } from './api';
+import prepareLocations from './store.locations.js';

 const debug = process.env.NODE_ENV !== 'production';
 //console.log('window.activity', window.activity);
@@ -24,17 +26,81 @@ const store = createStore({
        activity: window.activity,
        socialIssuesOther: [],
        socialActionsList: [],
+        availableLocations: [],
    },
    getters: {
-    filterSuggestedPersons(state) {
-      if (typeof(state.activity.accompanyingPeriod) === 'undefined') {
+        suggestedEntities(state) {
+            if (typeof state.activity.accompanyingPeriod === "undefined") {
                return [];
            }
-      let existingPersonIds = state.activity.persons.map(p => p.id);
-      return state.activity.accompanyingPeriod.participations.filter(p => p.endDate === null)
-        .map(p => p.person)
-        .filter(p => !existingPersonIds.includes(p.id))
+            const allEntities = [
+                ...store.getters.suggestedPersons,
+                ...store.getters.suggestedRequestor,
+                ...store.getters.suggestedUser,
+                ...store.getters.suggestedResources,
+            ];
+            const uniqueIds = [
+                ...new Set(allEntities.map((i) => `${i.type}-${i.id}`)),
+            ];
+            return Array.from(
+                uniqueIds,
+                (id) => allEntities.filter((r) => `${r.type}-${r.id}` === id)[0]
+            );
+        },
+        suggestedPersons(state) {
+            const existingPersonIds = state.activity.persons.map((p) => p.id);
+            return state.activity.activityType.personsVisible === 0
+                ? []
+                : state.activity.accompanyingPeriod.participations
+                    .filter((p) => p.endDate === null)
+                    .map((p) => p.person)
+                    .filter((p) => !existingPersonIds.includes(p.id));
+        },
+        suggestedRequestor(state) {
+            if (state.activity.accompanyingPeriod.requestor === null) {
+                return [];
            }
+            const existingPersonIds = state.activity.persons.map((p) => p.id);
+            const existingThirdPartyIds = state.activity.thirdParties.map(
+                (p) => p.id
+            );
+
+            return [state.activity.accompanyingPeriod.requestor].filter(
+                (r) =>
+                    (r.type === "person" &&
+                        !existingPersonIds.includes(r.id) &&
+                        state.activity.activityType.personsVisible !== 0) ||
+                    (r.type === "thirdparty" &&
+                        !existingThirdPartyIds.includes(r.id) &&
+                        state.activity.activityType.thirdPartiesVisible !== 0)
+            );
+        },
+        suggestedUser(state) {
+            const existingUserIds = state.activity.users.map((p) => p.id);
+            return state.activity.activityType.usersVisible === 0
+                ? []
+                : [state.activity.accompanyingPeriod.user].filter(
+                    (u) => u !== null && !existingUserIds.includes(u.id)
+                );
+        },
+        suggestedResources(state) {
+            const resources = state.activity.accompanyingPeriod.resources;
+            const existingPersonIds = state.activity.persons.map((p) => p.id);
+            const existingThirdPartyIds = state.activity.thirdParties.map(
+                (p) => p.id
+            );
+            return state.activity.accompanyingPeriod.resources
+                .map((r) => r.resource)
+                .filter(
+                    (r) =>
+                        (r.type === "person" &&
+                            !existingPersonIds.includes(r.id) &&
+                            state.activity.activityType.personsVisible !== 0) ||
+                        (r.type === "thirdparty" &&
+                            !existingThirdPartyIds.includes(r.id) &&
+                            state.activity.activityType.thirdPartiesVisible !== 0)
+                );
+        },
    },
    mutations: {
        // SocialIssueAcc
@@ -56,7 +122,9 @@ const store = createStore({
        },
        removeIssueInOther(state, issue) {
            //console.log('remove issue other', issue.id);
-      state.socialIssuesOther = state.socialIssuesOther.filter(i => i.id !== issue.id);
+            state.socialIssuesOther = state.socialIssuesOther.filter(
+                (i) => i.id !== issue.id
+            );
        },
        resetActionsList(state) {
            //console.log('reset list actions');
@@ -73,118 +141,208 @@ const store = createStore({
        filterList(state, list) {
            const filterList = (list) => {
                // remove duplicates entries
-        list = list.filter((value, index) => list.findIndex(array => array.id === value.id) === index);
+                list = list.filter(
+                    (value, index) =>
+                        list.findIndex((array) => array.id === value.id) ===
+                        index
+                );
                // alpha sort
-        list.sort((a,b) => (a.text > b.text) ? 1 : ((b.text > a.text) ? -1 : 0));
+                list.sort((a, b) =>
+                    a.text > b.text ? 1 : b.text > a.text ? -1 : 0
+                );
                return list;
            };
-      if (list === 'issues') {
-        state.activity.accompanyingPeriod.socialIssues = filterList(state.activity.accompanyingPeriod.socialIssues);
+            if (list === "issues") {
+                state.activity.accompanyingPeriod.socialIssues = filterList(
+                    state.activity.accompanyingPeriod.socialIssues
+                );
            }
-      if (list === 'actions') {
+            if (list === "actions") {
                state.socialActionsList = filterList(state.socialActionsList);
            }
        },

        // ConcernedGroups
        addPersonsInvolved(state, payload) {
-      //console.log('### mutation addPersonsInvolved', payload.result.type);
+            console.log("### mutation addPersonsInvolved", payload);
            switch (payload.result.type) {
-        case 'person':
+                case "person":
                    state.activity.persons.push(payload.result);
                    break;
-        case 'thirdparty':
+                case "thirdparty":
                    state.activity.thirdParties.push(payload.result);
                    break;
-        case 'user':
+                case "user":
                    state.activity.users.push(payload.result);
                    break;
-      };
+            }
        },
        removePersonInvolved(state, payload) {
            //console.log('### mutation removePersonInvolved', payload.type);
            switch (payload.type) {
-        case 'person':
-          state.activity.persons = state.activity.persons.filter(person => person !== payload);
+                case "person":
+                    state.activity.persons = state.activity.persons.filter(
+                        (person) => person !== payload
+                    );
                    break;
-        case 'thirdparty':
-          state.activity.thirdParties = state.activity.thirdParties.filter(thirdparty => thirdparty !== payload);
+                case "thirdparty":
+                    state.activity.thirdParties =
+                        state.activity.thirdParties.filter(
+                            (thirdparty) => thirdparty !== payload
+                        );
                    break;
-        case 'user':
-          state.activity.users = state.activity.users.filter(user => user !== payload);
+                case "user":
+                    state.activity.users = state.activity.users.filter(
+                        (user) => user !== payload
+                    );
                    break;
-      };
+            }
        },
        updateLocation(state, value) {
-        console.log('### mutation: updateLocation', value);
+            console.log("### mutation: updateLocation", value);
            state.activity.location = value;
+        },
+        addAvailableLocationGroup(state, group) {
+            state.availableLocations.push(group);
        }
    },
    actions: {
        addIssueSelected({ commit }, issue) {
-      let aSocialIssues = document.getElementById("chill_activitybundle_activity_socialIssues");
+            let aSocialIssues = document.getElementById(
+                "chill_activitybundle_activity_socialIssues"
+            );
            aSocialIssues.value = addIdToValue(aSocialIssues.value, issue.id);
-      commit('addIssueSelected', issue);
+            commit("addIssueSelected", issue);
        },
        updateIssuesSelected({ commit }, payload) {
-      let aSocialIssues = document.getElementById("chill_activitybundle_activity_socialIssues");
-      aSocialIssues.value = '';
-      payload.forEach(item => {
-        aSocialIssues.value = addIdToValue(aSocialIssues.value, item.id);
+            let aSocialIssues = document.getElementById(
+                "chill_activitybundle_activity_socialIssues"
+            );
+            aSocialIssues.value = "";
+            payload.forEach((item) => {
+                aSocialIssues.value = addIdToValue(
+                    aSocialIssues.value,
+                    item.id
+                );
            });
-      commit('updateIssuesSelected', payload);
+            commit("updateIssuesSelected", payload);
        },
        updateActionsSelected({ commit }, payload) {
-      let aSocialActions = document.getElementById("chill_activitybundle_activity_socialActions");
-      aSocialActions.value = '';
-      payload.forEach(item => {
-        aSocialActions.value = addIdToValue(aSocialActions.value, item.id);
+            let aSocialActions = document.getElementById(
+                "chill_activitybundle_activity_socialActions"
+            );
+            aSocialActions.value = "";
+            payload.forEach((item) => {
+                aSocialActions.value = addIdToValue(
+                    aSocialActions.value,
+                    item.id
+                );
            });
-      commit('updateActionsSelected', payload);
+            commit("updateActionsSelected", payload);
+        },
+        addAvailableLocationGroup({ commit }, payload) {
+            commit("addAvailableLocationGroup", payload);
        },
        addPersonsInvolved({ commit }, payload) {
            //console.log('### action addPersonsInvolved', payload.result.type);
            switch (payload.result.type) {
-        case 'person':
-          let aPersons = document.getElementById("chill_activitybundle_activity_persons");
-          aPersons.value = addIdToValue(aPersons.value, payload.result.id);
+                case "person":
+                    let aPersons = document.getElementById(
+                        "chill_activitybundle_activity_persons"
+                    );
+                    aPersons.value = addIdToValue(
+                        aPersons.value,
+                        payload.result.id
+                    );
                    break;
-        case 'thirdparty':
-          let aThirdParties = document.getElementById("chill_activitybundle_activity_thirdParties");
-          aThirdParties.value = addIdToValue(aThirdParties.value, payload.result.id);
+                case "thirdparty":
+                    let aThirdParties = document.getElementById(
+                        "chill_activitybundle_activity_thirdParties"
+                    );
+                    aThirdParties.value = addIdToValue(
+                        aThirdParties.value,
+                        payload.result.id
+                    );
                    break;
-        case 'user':
-          let aUsers = document.getElementById("chill_activitybundle_activity_users");
-          aUsers.value = addIdToValue(aUsers.value, payload.result.id);
+                case "user":
+                    let aUsers = document.getElementById(
+                        "chill_activitybundle_activity_users"
+                    );
+                    aUsers.value = addIdToValue(
+                        aUsers.value,
+                        payload.result.id
+                    );
                    break;
-      };
-      commit('addPersonsInvolved', payload);
+            }
+            commit("addPersonsInvolved", payload);
        },
        removePersonInvolved({ commit }, payload) {
            //console.log('### action removePersonInvolved', payload);
            switch (payload.type) {
-        case 'person':
-          let aPersons = document.getElementById("chill_activitybundle_activity_persons");
-          aPersons.value = removeIdFromValue(aPersons.value, payload.id);
+                case "person":
+                    let aPersons = document.getElementById(
+                        "chill_activitybundle_activity_persons"
+                    );
+                    aPersons.value = removeIdFromValue(
+                        aPersons.value,
+                        payload.id
+                    );
                    break;
-        case 'thirdparty':
-          let aThirdParties = document.getElementById("chill_activitybundle_activity_thirdParties");
-          aThirdParties.value = removeIdFromValue(aThirdParties.value, payload.id);
+                case "thirdparty":
+                    let aThirdParties = document.getElementById(
+                        "chill_activitybundle_activity_thirdParties"
+                    );
+                    aThirdParties.value = removeIdFromValue(
+                        aThirdParties.value,
+                        payload.id
+                    );
                    break;
-        case 'user':
-          let aUsers = document.getElementById("chill_activitybundle_activity_users");
+                case "user":
+                    let aUsers = document.getElementById(
+                        "chill_activitybundle_activity_users"
+                    );
                    aUsers.value = removeIdFromValue(aUsers.value, payload.id);
                    break;
-      };
-      commit('removePersonInvolved', payload);
+            }
+            commit("removePersonInvolved", payload);
        },
        updateLocation({ commit }, value) {
-        console.log('### action: updateLocation', value);
-        let hiddenLocation = document.getElementById("chill_activitybundle_activity_location");
+            console.log("### action: updateLocation", value);
+            let hiddenLocation = document.getElementById(
+                "chill_activitybundle_activity_location"
+            );
+            if (value.onthefly) {
+                const body = {
+                    "type": "location",
+                    "name": value.name === '__AccompanyingCourseLocation__' ? null : value.name,
+                    "locationType": {
+                        "id": value.locationType.id,
+                        "type": "location-type"
+                    }
+                };
+                if (value.address.id) {
+                    Object.assign(body, {
+                        "address": {
+                            "id": value.address.id
+                        },
+                    })
+                }
+                postLocation(body)
+                    .then(
+                        location => hiddenLocation.value = location.id
+                    ).catch(
+                        err => {
+                            console.log(err.message);
+                        }
+                    );
+            } else {
                hiddenLocation.value = value.id;
-        commit('updateLocation', value);
-    }
            }
+            commit("updateLocation", value);
+        },
+    },
 });

+prepareLocations(store);
+
 export default store;
--- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/store.locations.js
+++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/store.locations.js
@@ -0,0 +1,123 @@
+import {getLocations, getLocationTypeByDefaultFor, getUserCurrentLocation} from "./api";
+
+const makeConcernedPersonsLocation = (locationType, store) => {
+    let locations = [];
+    store.getters.suggestedEntities.forEach(
+        (e) => {
+            if (e.type === 'person' && e.current_household_address !== null){
+                locations.push({
+                    type: 'location',
+                    id: -store.getters.suggestedEntities.indexOf(e)*10,
+                    onthefly: true,
+                    name: e.text,
+                    address: {
+                        id: e.current_household_address.address_id,
+                    },
+                    locationType: locationType
+                });
+            }
+        }
+    )
+    return locations;
+};
+const makeConcernedThirdPartiesLocation = (locationType, store) => {
+    let locations = [];
+    store.getters.suggestedEntities.forEach(
+        (e) => {
+            if (e.type === 'thirdparty' && e.address !== null){
+                locations.push({
+                    type: 'location',
+                    id: -store.getters.suggestedEntities.indexOf(e)*10,
+                    onthefly: true,
+                    name: e.text,
+                    address: { id: e.address.address_id },
+                    locationType: locationType
+                });
+            }
+        }
+    )
+    return locations;
+};
+const makeAccompanyingPeriodLocation = (locationType, store) => {
+    const accPeriodLocation = store.state.activity.accompanyingPeriod.location;
+    return {
+        type: 'location',
+        id: -1,
+        onthefly: true,
+        name: '__AccompanyingCourseLocation__',
+        address: {
+            id: accPeriodLocation.address_id,
+            text: `${accPeriodLocation.text} - ${accPeriodLocation.postcode.code} ${accPeriodLocation.postcode.name}`
+        },
+        locationType: locationType
+    }
+};
+
+export default function prepareLocations(store) {
+
+// find the locations
+    let allLocations = getLocations().then(
+        (results) => {
+            store.commit('addAvailableLocationGroup', {
+                locationGroup: 'Autres localisations',
+                locations: results
+            });
+        }
+    );
+
+    let currentLocation = getUserCurrentLocation().then(
+        userCurrentLocation => {
+            if (null !== userCurrentLocation) {
+                store.commit('addAvailableLocationGroup', {
+                    locationGroup: 'Ma localisation',
+                    locations: [userCurrentLocation]
+                });
+            }
+        }
+    );
+
+    let partiesLocations = [], partyPromise;
+    ['person', 'thirdparty'].forEach(kind => {
+        partyPromise = getLocationTypeByDefaultFor(kind).then(
+            (kindLocationType) => {
+                if (kindLocationType) {
+                    let concernedKindLocations;
+                    if (kind === 'person') {
+                        concernedKindLocations = makeConcernedPersonsLocation(kindLocationType, store);
+                        // add location for the parcours into suggestions
+                        const personLocation = makeAccompanyingPeriodLocation(kindLocationType, store);
+                        store.commit('addAvailableLocationGroup', {
+                            locationGroup: 'Localisation du parcours',
+                            locations: [personLocation]
+                        });
+                    } else {
+                        concernedKindLocations = makeConcernedThirdPartiesLocation(kindLocationType, store);
+                    }
+
+                    store.commit('addAvailableLocationGroup', {
+                        locationGroup: kind === 'person' ? 'Usagers concernés' : 'Tiers concernés',
+                        locations: concernedKindLocations,
+                    });
+                }
+            }
+        );
+        partiesLocations.push(partyPromise);
+    });
+
+// when all location are loaded
+    Promise.all([allLocations, currentLocation, ...partiesLocations]).then(() => {
+        console.log('current location in activity', store.state.activity.location);
+        console.log('default loation id', window.default_location_id);
+        if (window.default_location_id) {
+            for (let group of store.state.availableLocations) {
+                console.log(group);
+                let location = group.locations.find((l) => l.id === window.default_location_id);
+                console.log(location);
+                if (location !== undefined) {
+                    store.dispatch('updateLocation', location);
+                    break;
+                }
+            }
+        }
+    });
+}
--- a/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/AppKernel.php
+++ b/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/AppKernel.php
@@ -1,13 +1,38 @@
 <?php

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

 class AppKernel extends Kernel
 {
+    /**
+     * @return string
+     */
+    public function getCacheDir()
+    {
+        return sys_get_temp_dir() . '/ActivityBundle/cache';
+    }
+
+    /**
+     * @return string
+     */
+    public function getLogDir()
+    {
+        return sys_get_temp_dir() . '/ActivityBundle/logs';
+    }
+
    public function registerBundles()
    {
-        return array(
+        return [
            new Symfony\Bundle\FrameworkBundle\FrameworkBundle(),
            new Chill\CustomFieldsBundle\ChillCustomFieldsBundle(),
            new Symfony\Bundle\SecurityBundle\SecurityBundle(),
@@ -20,28 +45,12 @@ class AppKernel extends Kernel
            new \Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle(),
            new Doctrine\Bundle\MigrationsBundle\DoctrineMigrationsBundle(),
            new Symfony\Bundle\MonologBundle\MonologBundle(),
-            #add here all the required bundle (some bundle are not required)
-        );
+            //add here all the required bundle (some bundle are not required)
+        ];
    }

    public function registerContainerConfiguration(LoaderInterface $loader)
    {
-        $loader->load($this->getRootDir().'/config/config_'.$this->getEnvironment().'.yml');
-    }
-
-    /**
-     * @return string
-     */
-    public function getCacheDir()
-    {
-        return sys_get_temp_dir().'/ActivityBundle/cache';
-    }
-
-    /**
-     * @return string
-     */
-    public function getLogDir()
-    {
-        return sys_get_temp_dir().'/ActivityBundle/logs';
+        $loader->load($this->getRootDir() . '/config/config_' . $this->getEnvironment() . '.yml');
    }
 }
--- a/Show More
+++ b/Show More