patchOnTheFly improved

further conversions to general makeFetch and toasts
Merge branch 'convert_to_makeFetch' of gitlab.com:Chill-Projet/chill-bundles into convert_to_makeFetch
2025-09-11 17:25:02 +00:00 · 2021-12-10 17:16:45 +01:00 · 2021-12-01 10:43:18 +01:00 · 2021-11-30 15:03:01 +01:00 · 2021-11-30 14:51:20 +01:00 · 2021-11-30 11:31:20 +01:00
1693 changed files with 53330 additions and 54100 deletions
--- a/.editorconfig
+++ b/.editorconfig
@@ -18,10 +18,3 @@ max_line_length = 80

 [COMMIT_EDITMSG]
 max_line_length = 0
-<<<<<<< Updated upstream
-=======
-
-[*.{js, vue, ts}]
-indent_size = 2
-indent_style = space
->>>>>>> Stashed changes
--- a/.env
+++ b/.env
@@ -0,0 +1,64 @@
+##
+##  Manually dump .env files in .env.local.php with
+## `$ composer symfony:dump-env prod`
+##
+
+## Project environment
+APP_ENV=dev
+
+## Enable debug
+APP_DEBUG=true
+
+## Locale
+LOCALE=fr
+
+## Framework secret
+APP_SECRET=ThisTokenIsNotSoSecretChangeIt
+
+## Symfony/swiftmailer
+MAILER_TRANSPORT=smtp
+MAILER_HOST=smtp
+MAILER_PORT=1025
+MAILER_CRYPT=
+MAILER_AUTH=
+MAILER_USER=
+MAILER_PASSWORD=
+MAILER_URL=${MAILER_TRANSPORT}://${MAILER_HOST}:${MAILER_PORT}?encryption=${MAILER_CRYPT}&auth_mode=${MAILER_AUTH}&username=${MAILER_USER}&password=${MAILER_PASSWORD}
+
+## Notifications
+NOTIFICATION_HOST=localhost:8001
+NOTIFICATION_FROM_EMAIL=admin@chill.social
+NOTIFICATION_FROM_NAME=Chill
+
+## Gelf
+GELF_HOST=gelf
+GELF_PORT=12201
+
+## OVH OpenStack Storage User/Role
+OS_USERNAME=
+OS_PASSWORD=
+OS_TENANT_ID=
+OS_REGION_NAME=GRA
+OS_AUTH_URL=https://auth.cloud.ovh.net/v2.0/
+
+## OVH OpenStack Storage Container
+ASYNC_UPLOAD_TEMP_URL_KEY=
+ASYNC_UPLOAD_TEMP_URL_BASE_PATH=
+ASYNC_UPLOAD_TEMP_URL_CONTAINER=
+
+## Redis Cache
+REDIS_HOST=redis
+REDIS_PORT=6379
+REDIS_URL=redis://${REDIS_HOST}:${REDIS_PORT}
+
+## Twilio
+TWILIO_SID=~
+TWILIO_SECRET=~
+
+## DOCKER IMAGES REGISTRY
+#IMAGE_PHP=
+#IMAGE_NGINX=
+
+## DOCKER IMAGES VERSION
+#VERSION=test
+VERSION=prod
--- a/.env.test
+++ b/.env.test
@@ -3,3 +3,4 @@
 # 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
@@ -22,4 +22,3 @@ docs/build/

 /.php-cs-fixer.cache
 /.idea/
-/.psalm/
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -20,8 +20,6 @@ variables:
    # 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
@@ -29,7 +27,6 @@ variables:
    REDIS_URL: redis://redis:6379
    # change vendor dir to make the app install into tests/apps
    COMPOSER_VENDOR_DIR: tests/app/vendor
-    DEFAULT_CARRIER_CODE: BE

 stages:
    - Composer install
@@ -63,7 +60,7 @@ code_style:
            - bin
            - tests/app/vendor/

-phpstan_tests:
+sa_tests:
    stage: Tests
    image: registry.gitlab.com/chill-projet/chill-app/php-base-image:7.4
    script:
@@ -74,18 +71,6 @@ phpstan_tests:
            - 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
-    allow_failure: true
-    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
@@ -94,7 +79,7 @@ unit_tests:
        - 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
+        - php -d memory_limit=3G bin/phpunit --colors=never
    artifacts:
        expire_in: 30 min
        paths:
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,439 +11,10 @@ and this project adheres to
 ## Unreleased

 <!-- write down unreleased development here -->
-* [workflow]: added pagination to workflow list page
-* [homepage_widget]: null error on tasks widget fixed
-* [person-thirdparty]: fix quick-add of names that consist of multiple parts (eg. De Vlieger) within onthefly modal person/thirdparty
-* [search]: Order of birthdate fields changed in advanced search to avoid confusion.
-* [workflow]: Constraint added to workflow (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/675)
-* [action]: Agents traitants should be prefilled with referrer of the parcours or left empty if there is no referrer (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/696)
-
-## Test releases
-
-### 2022-05-30
-
-* fix creating a new AccompanyingPeriodWorkEvaluationDocument when replacing the document (the workflow was lost)
-
-### 2022-05-27
-
-* [storedobject] add title field on StoredObject entity + use it in activity documents (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/604)
-* [main] add a "read more..." on comment embeddable when overflown (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/604)
-* [person] add closing motive to closed acc course (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/603)
-* [person] household filiation: fetch person info when unfolding person (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/586)
-* [admin] repair edit of social action in the admin (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/601)
-* [admin]: add select2 to Goal form type entity fields (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/702)
-* [main] allow hide permissions group list menu (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/577)
-* [main] allow hide change user password menu (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/577)
-* [main] filter user jobs by active jobs (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/577)
-* [main] add civility to User (entity, migration and form type) (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/577)
-* [admin] refactorisation of the admin section: reorganisation of the menu, translations, form types, new entities (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/592)
-* [admin] add admin section for languages and countries (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/596)
-* [activity] activity admin: translations + remove label field for comment on admin activity type (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/587)
-* [main] admin user_job: improvements (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/588)
-* [address] can add extra address info even if noAddress (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/576)
-* [search] Change order of birthdate fields in advanced search
-
-
-### 2022-05-06
-
-* [person] add civility when creating a person (with the on-the-fly component or in the php form) (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/557)
-* [person] add address when creating a person (with the on-the-fly component or in the php form) (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/557)
-* [person] add household creation API point (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/557)
-
-### 2021-04-29
-
-* [person] prevent circular references in PersonDocGenNormalizer (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/527)
-* [person] add maritalStatusComment to PersonDocGenNormalizer (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/582)
-* Load relationships without gender in french fixtures
-* Add command to remove old draft accompanying periods
-* [parcours]: If users assings him/herself as referrer and job is not null. Update parcours job (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/578)
-
-### 2021-04-28
-
-* [address] fix bug when editing address: update location and addressreferenceId + better update of the map in edition (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/593)
-* [main] avoid address reference search on undefined post code (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/561)
-* [person] prevent duplicate relationship in filiation/household graph (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/560)
-* [Documents] Validate storedObject and allow for null data (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/565)
-* [parcours]: Comments can be unpinned + edit/delete for all users that are allowed to edit parcours (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/566)
-
-### 2021-04-26
-
-* [Datepickers] datepickers fixed when using keyboard to enter date (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/545)
-* [social_action] Display 'agents traitants' in parcours resumé and social action list (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/568)
-* [Person_search] Closed parcours shown within an accordeon that can be opened/closed (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/574)
-
-### 2021-04-24
-
-* [notification email on course designation] allow raw string in email content generation
-* [Accompanying period work] list evaluations associated to a work by startDate, and then by id, from the most recent to older
-* [Documents] Change wording 'créer' to 'enregistrer' (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/634)
-* [Parcours]: The number of 'mes parcours' displayed (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/572)
-* [Hompage_widget]: Renaming of tabs and removal of social actions tab (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/570)
-* [activity]: Ignore thirdparties when creating a social action via an activity (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/573)
-* [parcours]: change wording of warning message and button when user is not associated to a household yet (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/590#note_918370943)
-* [Accompanying period work evaluations] list documents associated to a work by creation date, and then by id, from the most recent to older
-* [Course comment] add validationConstraint NotNull and NotBlank on comment content, to avoid sql error
-* [Notifications] delay the sending of notificaiton to kernel.terminate
-* [Notifications / Period user change] fix the sending of notification when user changes
-* [Activity form] invert 'incoming' and 'receiving' in Activity form
-* [Activity form] keep the same order for 'attendee' field in new and edit form
-* [list with period] use "sameas" test operator to introduce requestor in list
-* [notification email on course designation] allow raw string in email content generation
-* [Accompanying period work] list evaluations associated to a work by startDate, and then by id, from the most recent to older
-* [evaluation_document] changing date to datetime in order to display the time at which document was created (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/569)
-
-
-### 2021-04-13
-
-* [person] household address: add a form for editing the validFrom date (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/541)
-* [person] householdmemberseditor: fix composition type bug in select form (vuejs) (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/543)
-* [docgen] add more persons choices in docgen for course: amongst requestor (if person), resources of course (if person), and PersonResource (if person);
-* [docgen] add a new context with a list of activities in course
-* [docgen] add a comment in budget lines
-* [notifications] allow to send a notification to an email address. The address receive an access link
-* [adresses] add constraints in database to avoid errors later: postcode not null, and validfrom <= validto
-* [accompanying work editor] add a label on document title input
-
-### 2021-04-07
-
-* notification list: move action buttons outside of the toggle
-* fix detecting of non-read notification
-* filter users which are disabled in search user api
-* order query for location and add pagination in list
-* allow every person which has part for a workflow  to see the workflow page
-* able to see the workflow if the evaluation document has been deleted
-* hardcode the list of supported mime types for edition with collabora
-* list of accompanying course: allow to see the pinned comment in list_item
-
-### 2021-04-06
-
-* [main] notification toggle read: correct js syntax for compilation in production (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/548)
-* [parcours] Display of interlocuteurs changed to flex-table in parcours edit page to prevent cut-off of information (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/535)
-* [activity] espace entre les boutons pour supprimer les documents
-
-
-### continuous release in February and March
-
-* Creation of PickCivilityType, and implementation in PersonType and ThirdpartyType
-* [person] Accompanying course evaluation documents: disable the WOPI edit link if mimetype not supported and if no keyInfos
-(https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/585)
-* [activity] display error messages above the form in creating a new location (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/481)
-* [activity] show required field in activity edit/new by an asterix in the vuejs fields (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/494)
-* [ACL] fix allow to see the course, event if the scope'course does not contains the scope's user
-* [search] enforce limit of results for fetching rsults by search api https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/576
-* [activity] Fix delete button for document (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/554)
-* [activity] Add return path the document generation (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/553)
-* [person] add person ressource to person docgen normaliser (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/517)
-* [person] AccompanyingCourseWorkEdit: fix deleting evaluation documents (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/546)
-* [person] AccompanyingCourseWorkEdit: download existing documents (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/512)
-* [person] AccompanyingCourseWorkEdit: replace document by a new one (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/511)
-* [person] AccompanyingPeriodWork: add referrers to work, add doctrine event listener to add logged user to referrers collection and display a referrers list in work list (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/502)
-* [person] AccompanyingPeriodWorkEvaluation: fix circular reference when serialising (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/495)
-* [person] order accompanying period by opening date in search persons, person and household period lists (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/493)
-* [parcours] autosave of the pinned comment for draft accompanying course (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/477)
-* [main] filter user job in undispatch acc period to assign (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/472)
-* [main] filter user job in undispatch acc period to assign (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/472)
-* [person] Add url in accompanying period work evaluations entity and form (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/476)
-* [person] Add document generation in admin and in person/{id}/document (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/464)
-* [activity] do not override location if already exist (when validating new activity) (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/470)
-* [parcours] Toggle emergency/intensity only by referrer (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/442)
-* [docstore] Add an API entrypoint for StoredObject (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/466)
-* [person] Add the possibility of uploading existing documents to AccPeriodWorkEvaluationDocument (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/466)
-* [person] Add title to AccPeriodWorkEvaluationDocument (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/466)
-* [person] Order social issues by the field "ordering" (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/388)
-* [Person/Household list] when listing other simultaneous members of an household, exclude the members on person, not on members (avoid to show two membersship with the same person)
-* [draft periods] add a delete button (if acl granted) on each draft period listed on draft period page (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/463)
-* [Person] Display suffixText in RenderPerson, PersonText.vue, RenderPersonBox.vue (was made for displaying "enfant confie") (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/441)
-* [budget]: budget enabled for persons and households (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/469)
-*  [person] residential address: show residential address or info in PersonRenderBox, refactor Residential Address (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/439)
-* [thirdparty] Add a contact to a thirdparty from within onTheFly (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/345)
-* [documents] Improve flex-table item-col placement when long buttons and long metadata
-* [thirdparty] Fix display of multiple contact badges so they wrap onto next line (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/482)
-* [confidential] Fix position of toggle button so it does not cover text nor fall outside of box (no issue)
-* [parcours] Fix edit of both thirdparty and contact name (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/474)
-* [template] do not list inactive templates (for doc generator)
-* [household] bugfix if position of member is null, renderbox no longer throws an error (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/480)
-* [parcours] location cannot be removed if linked to a user (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/478)
-* [person] email added to twig personRenderbox (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/490)
-* [activity] Only youngest descendant is kept for social issues and actions (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/471)
-* [person] Add link to current household in person banner (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/484)
-* [address] person badge in address history changed to open OnTheFly with all person info (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/489)
-* [person] Change 'personne' with 'usager' and '&' with 'ET' (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/499)
-* [thirdparty] Add parameter condition to display centers or not (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/500)
-* [phonenumber] Remove placeholder in phonenumber field (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/496)
-* [person_resource] separate create page created to avoid confusion (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/504)
-* [contact] add contact button color changed plus the pipe at the side removed (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/506)
-* [thirdparty] For contacts show current civility/profession in edit form + fix saving of edited information (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/491)
-* [household] create-edit household composition placed in separate page to avoid confusion (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/505)
-* [blur] Improved positioning of toggle icon (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/486)
-* [thirdparty] add firstname field to thirdparty 'child' or 'contact' types (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/508)
-* [household] create-edit household composition placed in separate page to avoid confusion (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/505)
-* [blur] Improved positioning of toggle icon (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/486)
-* [parcours] List of parcours for a specific user so they can be reassigned in case of absence (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/509)
-* [thirdparty] Thirdparty view page, english text translated (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/534)
-* [social_action] Translation changed in evaluation section (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/512)
-* [filiation] Possible to add person (or create onthefly) to add to filiation graph + add relation (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/519)
-* [household] Within parcours listing page of household add create button (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/560)
-* [person_resource] bugfix when adding thirdparty or freetext resource + prevent personOwner themselves to be added. (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/526)
-* [aside_activity] style correction + sticky-form create button (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/529)
-* [budget] order within the menu adjusted (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/592)
-* [onthefly] fix create person. Bug was noticed in filiation (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/591)
-* [parcours] Create document buttons made sticky (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/532)
-* [person] Trailing guillemet removed (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/530)
-* [notification] Display of social action within workflow notification set to display block (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/537)
-* [onthefly] trim trailing whitespace in email of person and thirdparty (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/542)
-
-* [action] Only youngest descendant is kept for social issues and actions (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/471)
-## Test releases
-
-### test release 2022-02-21
-
-* [notifications] Word 'un' changed to number '1' for notifications in user menu (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/483)
-* [documents] 'gabarit' changed to 'modèle' (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/405)
-* [person_resources] Menu name and order changed (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/460)
-* workflow: fix sending notifications
-* [thirdparty] Extend the thirdparty search to thirdparty children (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/448)
-* [person]: AddPersons: allow creation of person or thirdparty only (no users) (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/422)
-* [person]: AddPersons: allow creation of person or thirdparty depending on allowed types (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/422)
-* [person]: AddPersons: add suggestion of name when creating new person or thirdparty (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/422)
-* [main] Address: fix small bug: when modifying an address without street (isNoAddress), also check errors if street is an empty string as back-end change null value to empty string for street (and streetNumber)
-* [main] Address: stronger client-side validation of addresses (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/449)
-* [person] accompanying course: filter suggested entities by open participations (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/415)
-[activity] can click through the cross icon for removing person in concerned group (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/476)
-[activity] correct associated persons by considering only open participations (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/476)
-* [person_resources]: Renderboxes used to display person/thirdparty info (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/465)
-* [Household]: Add end date in HouseholdMember form for 'enfant hors menage' (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/434)
-* [homepage_widget]: If no sender then display as 'notification automatique' (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/435)
-* [parcours]: Order social activities and only display most recent three in parcours resumé (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/481)
-* [3party]: 3party: redirect to parent when contact (child) is opened in view page
-* [parcours / addresses]: launch an event when a person change address (either through changing household or because the household is associated to a new address). If the person is localising a course, the course location go back to a temporarily address.
-* [thirdparty]: address/phonenumber/email/fonction displayed in thirdpartyrenderbox (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/401)
-* [thirdparty_contact]: in search results the 'qualité' is displayed (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/465)
-* [bug]: fix confidential toggle of address in thirdpartyrenderbox (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/460)
-
-
-
-### test release 2022-02-14
-
-* AddPersons: remove ul-li html tags from AddPersons (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/419)
-* [doc-generator] do not set required fields for mainPerson, person1, person2 (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement#456)
-* [doc-generation] add age and obele in the mainPerson, person1 and person2 list + add obele in person renderString if addAge (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/370)
-* [person] accompanying course work: fix on-the-fly update of thirdParty
-* fix normalisation of accompanying course requestor api (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/378)
-* [person] add a returnPath when clicking on some Person or ThirdParty badge (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/427)
-* [person] accompanying course work: fix on-the-fly update of thirdParty
-* [on-the-fly] close modal only after validation
-* [person] correct thirdparty PATCH url + add email and altnames in AddPerson and serializer (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/433)
-* change order for accompanying course work list
-* [parcours]: Mes parcours brouillon added to user menu (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/440)
-* [Documents]: List view adapted to display more information (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/414)
-* [person]: style fix in parcours listing per person. (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/432)
-* [parcours]: Only the referrer can toggle the intensity of the parcours (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/442)
-* [household]: display address of current household (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/415)
-* ajoute un ordre dans les localisation (api)
-* [pick entity]: fix translations in modal (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/419)
-* [homepage_widget]: fix translation on emergency badge (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/440)
-* [person]: create person and household added to button dropdown (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/454)
-* display full address in address.text in normalization. Adapt AddressRenderBox
-* [address]: Correction residential address 'depuis le' (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/459)
-* [Documents]: List view adapted to display more information (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/414)
-* [Thirdparty_contact]: address blurred if confidential in view page (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/450)
-* [thirdparty] Add a contact to a thirdparty from within onTheFly (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/345)
-
-
-### test release 2021-02-01
-
-* 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
-* [homepage widget] improve content tables, improve counter pluralization with style on number
-* [notification lists] add comments counter information
-* [workflows] fix popover header with previous transition
-* [parcours]: validation + message for closing parcours adjusted.
-* [household]: household composition double edit button replaced by a delete action (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/426)
-[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]: Comment on marital status is possible even if marital status is not defined (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/421)
-* [parcours]: In the list of person results the requestor is not displayed if defined as anonymous (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/424)
-* [bugfix]: modal closes and newly created person/thirdparty is selected when multiple persons/thirdparties are created through the modal (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/429)
-* [person_resource]: Onthefly button added to view person/thirdparty and badge differentiation for a contact-thirdparty (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/428)
-* [workflow][notification] improve how notifications and workflows are 'attached' to entities: contextual list, counter, buttons and vue modal
-* [AddAddress] disable multiselect search, and rely only on most pertinent Cities and Street computed backend
-* [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.
-* [thirdparty] Add a contact to a thirdparty from within onTheFly (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/345)
-* [homepage widget] add vue homepage_widget with asynchone loading, give a global view resume of the user concerned actions, notifications, etc.
-
-
-### test release 2021-01-31
-
-* [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
-
-
-### 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 releases

 ### Test release 2021-11-19 - bis

@@ -452,7 +23,6 @@ and this project adheres to
 * [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)
@@ -479,10 +49,6 @@ and this project adheres to
 * 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
-* [period] Validation added when period is confidential and confirmed -> user cannot be null.
-
-
-## Test releases

 ### Test release 2021-11-22

@@ -598,7 +164,7 @@ and this project adheres to
    * fast creation buttons
    * add ordering for types

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

 * [ThirdParty]:
--- a/CONVENTIONS.md
+++ b/CONVENTIONS.md
@@ -2,14 +2,7 @@

 en cours de rédaction

-## Translations

-
-Par bundle, toutes les traductions des pages twig se trouvent dans un seul fichier `translations/messages.fr.yaml`.
-
-## Emplacement des fichiers
-
-Les controllers, form type & templates twig sont placés à la racine des dossiers `Controller`, `Form` & `Ressources/views`, respectivement. Pour les pages Admin, on ne les mets plus dans des sous-dossiers Admin.
 ## Assets: nommage des entrypoints

 Trois types d'entrypoint:
@@ -153,20 +146,19 @@ Ces règles n'ont pas toujours été utilisées par le passé. Elles sont souhai

 Les routes sont nommées de cette manière:

-`chill_(api|crud)_bundle_(api)_entite_action`
+`chill_bundle_entite_action`

 1. d'abord chill_ (pour tous les modules chill)
-2. ensuite `crud` ou `api`, optionnel, automatiquement ajouté si la route est générée par la configuration
-3. ensuite une string qui indique le bundle (`main`, `person`, `activity`, ...)
-4. ensuite, `api`, si la route est une route d'api.
-5. ensuite une string qui indique sur quelle entité porte la route, voire également les sous-entités
-6. ensuite une action (`list`, `view`, `edit`, `new`, ...)
+2. ensuite une string qui est identique, par bundle
+3. si le point est un point d'api (json), alors ajouter la string `api`
+4. ensuite une string qui indique sur quelle entité porte la route, voire également les sous-entités
+5. ensuite une action (`list`, `view`, `edit`, `new`, ...)

-Le fait d'indiquer `api` en quatrième position permet de distinguer les routes d'api qui sont générées par la configuration (qui sont toutes préfixées par `chill_api`, de celles générées manuellement. (Exemple: `chill_api_household__index`, et `chill_person_api_household_members_move`)
+Le fait d'indiquer `api` en 3 permet de distinguer les routes d'api qui sont générées par la configuration (qui sont toutes préfixées par `chill_api`, de celles générées manuellement. (Exemple: `chill_api_household__index`, et `chill_person_api_household_members_move`)

 Si les points 4 et 5 sont inexistants, alors ils sont remplacés par d'autres éléments de manière à garantir l'unicité de la route, et sa bonne compréhension.

-### Nommage des URL
+### URL

 Les URL respectent également une convention:

@@ -227,14 +219,6 @@ Les éléments suivants devraient se trouver dans la liste:

 Ces éléments peuvent être entrecoupés de l'identifiant d'une entité. Dans ce cas, cet identifiant se place juste après l'entité auquel il se rapporte.

-#### Pour les URL de l'espace Admin
-
-Même conventions que dans les autres pages html de l'application, **mais `admin` est ajouté en deuxième position**. Soit:
-
-
-`/{_locale}/admin/bundle/entity/{id}/action`
-
-
 ## Règles UI chill

 ### Titre des pages
@@ -413,6 +397,7 @@ Créer une liste de suggestions à enlever (avec une croix rouge cliquable, l'an
    <li>
        <span>
            item
+            <a></a>
        </span>
    </li>
 </ul>
@@ -420,8 +405,7 @@ Créer une liste de suggestions à enlever (avec une croix rouge cliquable, l'an
 Créer un titre enlevable (avec une croix rouge cliquable, l'ancre a est vide)
 ```html
 <div class="item-title">
-    <span>title</span>
+    title
+    <a></a>
 </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/BIN
+++ b/BIN
--- a/composer.json
+++ b/composer.json
@@ -1,87 +1,79 @@
 {
    "name": "chill-project/chill-bundles",
-    "description": "Most used bundles for chill-project",
-    "license": "AGPL-3.0-only",
    "type": "library",
+    "description": "Most used bundles for chill-project",
    "keywords": [
        "chill",
        "social worker"
    ],
+    "license": "AGPL-3.0-only",
    "require": {
-        "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",
+        "champs-libres/async-uploader-bundle": "dev-sf4",
+        "champs-libres/wopi-bundle": "dev-master",
+        "composer/package-versions-deprecated": "^1.10",
        "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 || ^2",
-        "odolbeau/phone-number-bundle": "^3.6",
        "phpoffice/phpspreadsheet": "^1.16",
        "ramsey/uuid-doctrine": "^1.7",
        "sensio/framework-extra-bundle": "^5.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/http-foundation": "^4.4",
-        "symfony/intl": "^4.4",
-        "symfony/mailer": "^5.4",
-        "symfony/mime": "^5.4",
+        "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",
        "symfony/monolog-bundle": "^3.5",
-        "symfony/security-bundle": "^4.4",
-        "symfony/serializer": "^5.3",
+        "symfony/security-bundle": "4.*",
+        "symfony/serializer": "^5.2",
        "symfony/swiftmailer-bundle": "^3.5",
-        "symfony/templating": "^4.4",
-        "symfony/translation": "^4.4",
+        "symfony/templating": "4.*",
+        "symfony/translation": "4.*",
        "symfony/twig-bundle": "^4.4",
-        "symfony/validator": "^4.4",
-        "symfony/web-link": "*",
+        "symfony/validator": "4.*",
        "symfony/webpack-encore-bundle": "^1.11",
-        "symfony/workflow": "^4.4",
-        "symfony/yaml": "^4.4",
-        "twig/extra-bundle": "^3.0",
+        "symfony/workflow": "4.*",
+        "symfony/yaml": "4.*",
+        "twig/extra-bundle": "^2.12 || ^3.0",
        "twig/intl-extra": "^3.0",
        "twig/markdown-extra": "^3.3",
-        "twig/string-extra": "^3.3",
-        "twig/twig": "^3.0"
+        "twig/twig": "^2.12 || ^3.0"
+    },
+    "conflict": {
+        "symfony/symfony": "*"
    },
    "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",
+        "phpunit/phpunit": "^7.0",
        "symfony/debug-bundle": "^5.1",
-        "symfony/dotenv": "^4.4",
+        "symfony/dotenv": "^5.1",
        "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"
+        "symfony/phpunit-bridge": "^5.2",
+        "symfony/stopwatch": "^5.1",
+        "symfony/var-dumper": "4.*",
+        "symfony/web-profiler-bundle": "^5.0"
    },
-    "conflict": {
-        "symfony/symfony": "*"
+    "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",
@@ -90,6 +82,9 @@
            "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"
        }
    },
@@ -99,24 +94,12 @@
            "Chill\\DocGeneratorBundle\\Tests\\": "src/Bundle/ChillDocGeneratorBundle/tests"
        }
    },
-    "config": {
-        "allow-plugins": {
-            "composer/package-versions-deprecated": true,
-            "ergebnis/composer-normalize": true,
-            "ocramius/package-versions": true,
-            "phpro/grumphp": true,
-            "phpstan/extension-installer": true,
-            "roave/you-are-using-it-wrong": true
-        },
-        "bin-dir": "bin",
-        "optimize-autoloader": true,
-        "sort-packages": true,
-        "vendor-dir": "tests/app/vendor"
-    },
+    "minimum-stability": "dev",
+    "prefer-stable": true,
    "scripts": {
        "auto-scripts": {
-            "assets:install %PUBLIC_DIR%": "symfony-cmd",
-            "cache:clear": "symfony-cmd"
+            "cache:clear": "symfony-cmd",
+            "assets:install %PUBLIC_DIR%": "symfony-cmd"
        }
    }
 }
--- a/docs/source/_static/code/exports/CountPerson.php
+++ b/docs/source/_static/code/exports/CountPerson.php
@@ -91,9 +91,7 @@ class CountPerson implements ExportInterface
    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
    {
        // we gather all center the user choose.
-        $centers = array_map(static function ($el) {
-            return $el['center'];
-        }, $acl);
+        $centers = array_map(static function ($el) { return $el['center']; }, $acl);

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

--- a/docs/source/development/pagination.rst
+++ b/docs/source/development/pagination.rst
@@ -32,7 +32,7 @@ Then, render the pagination using the dedicated twig function.

   {% block title 'Item list'|trans %}

-   {% block content %}
+   {% block personcontent %}

   <table>

--- a/docs/source/development/user-interface/layout-template-usage.rst
+++ b/docs/source/development/user-interface/layout-template-usage.rst
@@ -156,7 +156,7 @@ This layout extend `ChillMainBundle::layoutWithVerticalMenu.html.twig` add the p

 It proposes 1 new block :

-* content
+* personcontent

  * where to display the information of the person

--- a/docs/source/development/user-interface/widgets/ChillMainConfiguration.php
+++ b/docs/source/development/user-interface/widgets/ChillMainConfiguration.php
@@ -11,53 +11,53 @@ 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;
+   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;
+   /**
+    * Configure the main bundle.
+    */
+   class ChillMainConfiguration implements ConfigurationInterface
+   {
+       use AddWidgetConfigurationTrait;

-    /**
-     * @var ContainerBuilder
-     */
-    private $containerBuilder;
+       /**
+        * @var ContainerBuilder
+        */
+       private $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;
-    }
+       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;
+       }

-    public function getConfigTreeBuilder()
-    {
-        $treeBuilder = new TreeBuilder();
-        $rootNode = $treeBuilder->root('chill_main');
+       public function getConfigTreeBuilder()
+       {
+           $treeBuilder = new TreeBuilder();
+           $rootNode = $treeBuilder->root('chill_main');

-        $rootNode
-            ->children()
+           $rootNode
+               ->children()

-                // ...
-            ->arrayNode('widgets')
-            ->canBeDisabled()
-            ->children()
-                         // we declare here all configuration for homepage place
-            ->append($this->addWidgetsConfiguration('homepage', $this->containerBuilder))
-            ->end() // end of widgets/children
-            ->end() // end of widgets
-            ->end() // end of root/children
-            ->end() // end of root
+                   // ...
+               ->arrayNode('widgets')
+               ->canBeDisabled()
+               ->children()
+                            // we declare here all configuration for homepage place
+               ->append($this->addWidgetsConfiguration('homepage', $this->containerBuilder))
+               ->end() // end of widgets/children
+               ->end() // end of widgets
+               ->end() // end of root/children
+               ->end() // end of root
 ;

-        return $treeBuilder;
-    }
-}
+           return $treeBuilder;
+       }
+   }
--- a/grumphp.yml
+++ b/grumphp.yml
@@ -12,28 +12,3 @@ parameters:
    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
@@ -0,0 +1,3 @@
+add npm/yarn dependency in package.json :
+
+"select2-bootstrap-theme": "0.1.0-beta.10",
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -10,6 +10,16 @@ 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
@@ -80,6 +90,11 @@ 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
@@ -5,6 +5,11 @@ parameters:
            count: 1
            path: src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php

+        -
+            message: "#^Access to an undefined property Chill\\\\PersonBundle\\\\Entity\\\\Person\\:\\:\\$currentHouseholdParticipationAt\\.$#"
+            count: 3
+            path: src/Bundle/ChillPersonBundle/Entity/Person.php
+
        -
            message: "#^Access to an undefined property Chill\\\\PersonBundle\\\\Entity\\\\Household\\\\PersonHouseholdAddress\\:\\:\\$relation\\.$#"
            count: 1
@@ -20,6 +25,41 @@ parameters:
            count: 1
            path: src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepository.php

+        -
+            message: "#^Access to an undefined property Chill\\\\PersonBundle\\\\Household\\\\MembersEditorFactory\\:\\:\\$validator\\.$#"
+            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
--- a/phpstan-deprecations.neon
+++ b/phpstan-deprecations.neon
@@ -105,6 +105,15 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillActivityBundle/Export/Export/ListActivity.php

+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\ActivityBundle\\\\Export\\\\Export\\\\ListActivity\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillActivityBundle/Export/Export/ListActivity.php
+
 		-
 			message:
 				"""
@@ -132,6 +141,15 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillActivityBundle/Export/Export/StatActivityDuration.php

+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\ActivityBundle\\\\Export\\\\Filter\\\\ActivityDateFilter\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillActivityBundle/Export/Filter/ActivityDateFilter.php
+
 		-
 			message:
 				"""
@@ -177,6 +195,15 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillActivityBundle/Export/Filter/ActivityTypeFilter.php

+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\ActivityBundle\\\\Export\\\\Filter\\\\PersonHavingActivityBetweenDateFilter\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillActivityBundle/Export/Filter/PersonHavingActivityBetweenDateFilter.php
+
 		-
 			message:
 				"""
@@ -186,6 +213,15 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillActivityBundle/Export/Filter/PersonHavingActivityBetweenDateFilter.php

+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\ActivityBundle\\\\Menu\\\\PersonMenuBuilder\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillActivityBundle/Menu/PersonMenuBuilder.php
+
 		-
 			message:
 				"""
@@ -222,6 +258,78 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillActivityBundle/Timeline/TimelineActivityProvider.php

+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\AsideActivityBundle\\\\Menu\\\\UserMenuBuilder\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillAsideActivityBundle/src/Menu/UserMenuBuilder.php
+
+		-
+			message:
+				"""
+					#^Class Chill\\\\AMLI\\\\BudgetBundle\\\\Controller\\\\AbstractElementController extends deprecated class Symfony\\\\Bundle\\\\FrameworkBundle\\\\Controller\\\\Controller\\:
+					since Symfony 4\\.2, use "Symfony\\\\Bundle\\\\FrameworkBundle\\\\Controller\\\\AbstractController" instead\\.$#
+				"""
+			count: 1
+			path: src/Bundle/ChillBudgetBundle/Controller/AbstractElementController.php
+
+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\AMLI\\\\BudgetBundle\\\\Controller\\\\AbstractElementController\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillBudgetBundle/Controller/AbstractElementController.php
+
+		-
+			message:
+				"""
+					#^Class Chill\\\\AMLI\\\\BudgetBundle\\\\Controller\\\\ElementController extends deprecated class Symfony\\\\Bundle\\\\FrameworkBundle\\\\Controller\\\\Controller\\:
+					since Symfony 4\\.2, use "Symfony\\\\Bundle\\\\FrameworkBundle\\\\Controller\\\\AbstractController" instead\\.$#
+				"""
+			count: 1
+			path: src/Bundle/ChillBudgetBundle/Controller/ElementController.php
+
+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\AMLI\\\\BudgetBundle\\\\Controller\\\\ElementController\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillBudgetBundle/Controller/ElementController.php
+
+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\AMLI\\\\BudgetBundle\\\\Menu\\\\UserMenuBuilder\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillBudgetBundle/Menu/UserMenuBuilder.php
+
+		-
+			message:
+				"""
+					#^Instantiation of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
+					since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
+				"""
+			count: 1
+			path: src/Bundle/ChillBudgetBundle/Security/Authorization/BudgetElementVoter.php
+
+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\CalendarBundle\\\\Menu\\\\UserMenuBuilder\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillCalendarBundle/Menu/UserMenuBuilder.php
+
 		-
 			message:
 				"""
@@ -291,6 +399,51 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldsGroup.php

+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\CustomFieldsBundle\\\\Form\\\\CustomFieldsGroupType\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/Form/CustomFieldsGroupType.php
+
+		-
+			message:
+				"""
+					#^Call to deprecated method getReachableScopes\\(\\) of class Chill\\\\MainBundle\\\\Security\\\\Authorization\\\\AuthorizationHelper\\:
+					Use getReachableCircles$#
+				"""
+			count: 1
+			path: src/Bundle/ChillDocStoreBundle/Controller/DocumentPersonController.php
+
+		-
+			message:
+				"""
+					#^Instantiation of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
+					since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
+				"""
+			count: 3
+			path: src/Bundle/ChillDocStoreBundle/Controller/DocumentPersonController.php
+
+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\DocStoreBundle\\\\Controller\\\\DocumentPersonController\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillDocStoreBundle/Controller/DocumentPersonController.php
+
+		-
+			message:
+				"""
+					#^Fetching class constant class of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
+					since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
+				"""
+			count: 1
+			path: src/Bundle/ChillDocStoreBundle/Form/PersonDocumentType.php
+
 		-
 			message:
 				"""
@@ -300,6 +453,15 @@ parameters:
 			count: 6
 			path: src/Bundle/ChillEventBundle/Controller/EventController.php

+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\EventBundle\\\\Controller\\\\EventController\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillEventBundle/Controller/EventController.php
+
 		-
 			message:
 				"""
@@ -318,6 +480,42 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillEventBundle/Form/Type/PickEventType.php

+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\EventBundle\\\\Form\\\\Type\\\\PickEventType\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillEventBundle/Form/Type/PickEventType.php
+
+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\EventBundle\\\\Form\\\\Type\\\\PickRoleType\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillEventBundle/Form/Type/PickRoleType.php
+
+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\EventBundle\\\\Form\\\\Type\\\\PickStatusType\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillEventBundle/Form/Type/PickStatusType.php
+
+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\EventBundle\\\\Menu\\\\PersonMenuBuilder\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillEventBundle/Menu/PersonMenuBuilder.php
+
 		-
 			message:
 				"""
@@ -327,6 +525,42 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillEventBundle/Search/EventSearch.php

+		-
+			message:
+				"""
+					#^Instantiation of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
+					since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
+				"""
+			count: 2
+			path: src/Bundle/ChillEventBundle/Search/EventSearch.php
+
+		-
+			message:
+				"""
+					#^Instantiation of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
+					since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
+				"""
+			count: 1
+			path: src/Bundle/ChillEventBundle/Timeline/TimelineEventProvider.php
+
+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\AMLI\\\\FamilyMembersBundle\\\\Controller\\\\FamilyMemberController\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillFamilyMembersBundle/Controller/FamilyMemberController.php
+
+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\AMLI\\\\FamilyMembersBundle\\\\Menu\\\\UserMenuBuilder\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillFamilyMembersBundle/Menu/UserMenuBuilder.php
+
 		-
 			message:
 				"""
@@ -336,6 +570,24 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillFamilyMembersBundle/Security/Voter/FamilyMemberVoter.php

+		-
+			message:
+				"""
+					#^Fetching class constant class of deprecated class Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillMainBundle/CRUD/Controller/AbstractCRUDController.php
+
+		-
+			message:
+				"""
+					#^Fetching class constant class of deprecated class Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php
+
 		-
 			message:
 				"""
@@ -345,6 +597,15 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php

+		-
+			message:
+				"""
+					#^Return type of method Chill\\\\MainBundle\\\\CRUD\\\\Controller\\\\CRUDController\\:\\:getTranslator\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php
+
 		-
 			message:
 				"""
@@ -363,6 +624,24 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillMainBundle/Command/LoadCountriesCommand.php

+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\MainBundle\\\\Controller\\\\ExportController\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillMainBundle/Controller/ExportController.php
+
+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\MainBundle\\\\Controller\\\\PasswordController\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillMainBundle/Controller/PasswordController.php
+
 		-
 			message:
 				"""
@@ -435,6 +714,42 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillMainBundle/Export/ExportManager.php

+		-
+			message:
+				"""
+					#^Parameter \\$translatorInterface of method Chill\\\\MainBundle\\\\Export\\\\Formatter\\\\CSVListFormatter\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillMainBundle/Export/Formatter/CSVListFormatter.php
+
+		-
+			message:
+				"""
+					#^Parameter \\$translatorInterface of method Chill\\\\MainBundle\\\\Export\\\\Formatter\\\\CSVPivotedListFormatter\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillMainBundle/Export/Formatter/CSVPivotedListFormatter.php
+
+		-
+			message:
+				"""
+					#^Parameter \\$translatorInterface of method Chill\\\\MainBundle\\\\Export\\\\Formatter\\\\SpreadSheetFormatter\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillMainBundle/Export/Formatter/SpreadSheetFormatter.php
+
+		-
+			message:
+				"""
+					#^Parameter \\$translatorInterface of method Chill\\\\MainBundle\\\\Export\\\\Formatter\\\\SpreadsheetListFormatter\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillMainBundle/Export/Formatter/SpreadsheetListFormatter.php
+
 		-
 			message:
 				"""
@@ -453,6 +768,15 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillMainBundle/Form/Event/CustomizeFormEvent.php

+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\MainBundle\\\\Form\\\\Type\\\\PostalCodeType\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillMainBundle/Form/Type/PostalCodeType.php
+
 		-
 			message:
 				"""
@@ -471,11 +795,43 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillMainBundle/Form/Type/UserPickerType.php

+		-
+			message: "#^Only booleans are allowed in an if condition, mixed given\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Form/UserType.php
+
+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\MainBundle\\\\Notification\\\\Mailer\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillMainBundle/Notification/Mailer.php
+
 		-
 			message: "#^Only booleans are allowed in an if condition, mixed given\\.$#"
 			count: 2
 			path: src/Bundle/ChillMainBundle/Repository/NotificationRepository.php

+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\MainBundle\\\\Routing\\\\MenuBuilder\\\\SectionMenuBuilder\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillMainBundle/Routing/MenuBuilder/SectionMenuBuilder.php
+
+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\MainBundle\\\\Routing\\\\MenuComposer\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillMainBundle/Routing/MenuComposer.php
+
 		-
 			message:
 				"""
@@ -539,6 +895,11 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillMainBundle/Security/PasswordRecover/PasswordRecoverEvent.php

+		-
+			message: "#^Call to deprecated method setTimeout\\(\\) of class Redis\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Security/PasswordRecover/PasswordRecoverLocker.php
+
 		-
 			message:
 				"""
@@ -562,6 +923,15 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillMainBundle/Templating/Events/DelegatedBlockRenderingEvent.php

+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\MainBundle\\\\Validation\\\\Validator\\\\RoleScopeScopePresence\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillMainBundle/Validation/Validator/RoleScopeScopePresence.php
+
 		-
 			message:
 				"""
@@ -598,6 +968,15 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseController.php

+		-
+			message:
+				"""
+					#^Parameter \\$trans of method Chill\\\\PersonBundle\\\\Controller\\\\AccompanyingCourseWorkController\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseWorkController.php
+
 		-
 			message:
 				"""
@@ -607,6 +986,33 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodController.php

+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\PersonBundle\\\\Controller\\\\HouseholdController\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Controller/HouseholdController.php
+
+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\PersonBundle\\\\Controller\\\\HouseholdMemberController\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Controller/HouseholdMemberController.php
+
+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\PersonBundle\\\\Controller\\\\PersonController\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Controller/PersonController.php
+
 		-
 			message:
 				"""
@@ -616,6 +1022,15 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillPersonBundle/Controller/PersonDuplicateController.php

+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\PersonBundle\\\\Controller\\\\PersonDuplicateController\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Controller/PersonDuplicateController.php
+
 		-
 			message: "#^Access to deprecated property \\$proxyAccompanyingPeriodOpenState of class Chill\\\\PersonBundle\\\\Entity\\\\Person\\.$#"
 			count: 2
@@ -630,6 +1045,15 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillPersonBundle/Export/Aggregator/AgeAggregator.php

+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\PersonBundle\\\\Export\\\\Aggregator\\\\CountryOfBirthAggregator\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Export/Aggregator/CountryOfBirthAggregator.php
+
 		-
 			message:
 				"""
@@ -639,6 +1063,15 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillPersonBundle/Export/Aggregator/CountryOfBirthAggregator.php

+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\PersonBundle\\\\Export\\\\Aggregator\\\\GenderAggregator\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Export/Aggregator/GenderAggregator.php
+
 		-
 			message:
 				"""
@@ -648,6 +1081,15 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillPersonBundle/Export/Aggregator/GenderAggregator.php

+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\PersonBundle\\\\Export\\\\Aggregator\\\\NationalityAggregator\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Export/Aggregator/NationalityAggregator.php
+
 		-
 			message:
 				"""
@@ -684,6 +1126,15 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillPersonBundle/Export/Export/ListPerson.php

+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\PersonBundle\\\\Export\\\\Export\\\\ListPerson\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Export/Export/ListPerson.php
+
 		-
 			message:
 				"""
@@ -711,6 +1162,15 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillPersonBundle/Export/Export/ListPersonDuplicate.php

+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\PersonBundle\\\\Export\\\\Export\\\\ListPersonDuplicate\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Export/Export/ListPersonDuplicate.php
+
 		-
 			message:
 				"""
@@ -756,6 +1216,15 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillPersonBundle/Export/Filter/BirthdateFilter.php

+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\PersonBundle\\\\Export\\\\Filter\\\\GenderFilter\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Export/Filter/GenderFilter.php
+
 		-
 			message:
 				"""
@@ -797,6 +1266,24 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillPersonBundle/Form/Type/PickPersonType.php

+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\PersonBundle\\\\Form\\\\Type\\\\PickPersonType\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Form/Type/PickPersonType.php
+
+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\PersonBundle\\\\Menu\\\\SectionMenuBuilder\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Menu/SectionMenuBuilder.php
+
 		-
 			message:
 				"""
@@ -824,6 +1311,16 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodACLAwareRepository.php

+		-
+			message:
+				"""
+					#^Instantiation of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role\\:
+					since Symfony 4\\.3, to be removed in 5\\.0\\. Use strings as roles instead\\.$#
+				"""
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Search/SimilarPersonMatcher.php
+
+
 		-
 			message:
 				"""
@@ -860,6 +1357,15 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillReportBundle/Export/Export/ReportList.php

+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\ReportBundle\\\\Export\\\\Export\\\\ReportList\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillReportBundle/Export/Export/ReportList.php
+
 		-
 			message:
 				"""
@@ -869,6 +1375,15 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillReportBundle/Export/Export/ReportList.php

+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\ReportBundle\\\\Export\\\\Export\\\\ReportListProvider\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillReportBundle/Export/Export/ReportListProvider.php
+
 		-
 			message:
 				"""
@@ -950,6 +1465,15 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillTaskBundle/Controller/SingleTaskController.php

+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\TaskBundle\\\\Controller\\\\TaskController\\:\\:applyTransitionAction\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillTaskBundle/Controller/TaskController.php
+
 		-
 			message:
 				"""
@@ -995,6 +1519,33 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillTaskBundle/Form/SingleTaskType.php

+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\TaskBundle\\\\Menu\\\\MenuBuilder\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillTaskBundle/Menu/MenuBuilder.php
+
+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\TaskBundle\\\\Menu\\\\SectionMenuBuilder\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillTaskBundle/Menu/SectionMenuBuilder.php
+
+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\TaskBundle\\\\Menu\\\\UserMenuBuilder\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillTaskBundle/Menu/UserMenuBuilder.php
+
 		-
 			message:
 				"""
@@ -1031,6 +1582,33 @@ parameters:
 			count: 3
 			path: src/Bundle/ChillTaskBundle/Timeline/TaskLifeCycleEventTimelineProvider.php

+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\ThirdPartyBundle\\\\Controller\\\\ThirdPartyController\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillThirdPartyBundle/Controller/ThirdPartyController.php
+
+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\ThirdPartyBundle\\\\Form\\\\Type\\\\PickThirdPartyType\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillThirdPartyBundle/Form/Type/PickThirdPartyType.php
+
+		-
+			message:
+				"""
+					#^Parameter \\$translator of method Chill\\\\ThirdPartyBundle\\\\Menu\\\\MenuBuilder\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillThirdPartyBundle/Menu/MenuBuilder.php
+
 		-
 			message:
 				"""
--- a/phpstan-types.neon
+++ b/phpstan-types.neon
@@ -250,6 +250,11 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillMainBundle/Entity/Address.php

+		-
+			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Entity/Embeddable/CommentEmbeddable.php
+
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
 			count: 1
@@ -290,6 +295,11 @@ parameters:
 			count: 3
 			path: src/Bundle/ChillMainBundle/Form/Type/DataTransformer/DateIntervalTransformer.php

+		-
+			message: "#^Only booleans are allowed in a negated boolean, mixed given\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Form/Type/DataTransformer/ObjectToIdTransformer.php
+
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
 			count: 2
@@ -305,6 +315,11 @@ parameters:
 			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
@@ -315,6 +330,11 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillMainBundle/Timeline/TimelineBuilder.php

+		-
+			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Validation/Validator/ValidPhonenumber.php
+
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
 			count: 1
@@ -345,6 +365,11 @@ parameters:
 			count: 6
 			path: src/Bundle/ChillPersonBundle/Command/ImportPeopleFromCSVCommand.php

+		-
+			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
+			count: 2
+			path: src/Bundle/ChillPersonBundle/Entity/PersonPhone.php
+
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
 			count: 1
@@ -380,6 +405,11 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillPersonBundle/Form/Type/PersonPhoneType.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: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
 			count: 3
@@ -450,8 +480,18 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillThirdPartyBundle/Repository/ThirdPartyRepository.php

+		-
+			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
+			count: 1
+			path: src/Bundle/ChillThirdPartyBundle/Search/ThirdPartyApiSearch.php
+
 		-
 			message: "#^Method Chill\\\\ThirdPartyBundle\\\\Search\\\\ThirdPartySearch\\:\\:renderResult\\(\\) should return string but return statement is missing\\.$#"
 			count: 1
 			path: src/Bundle/ChillThirdPartyBundle/Search/ThirdPartySearch.php

+		-
+			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
+			count: 1
+			path: src/Bundle/ChillThirdPartyBundle/Templating/Entity/ThirdPartyRender.php
+
--- a/phpstan.neon.dist
+++ b/phpstan.neon.dist
@@ -3,7 +3,6 @@ parameters:
    paths:
        - src/
    excludePaths:
-        - .php_cs*
        - docs/
        - src/Bundle/*/Tests/*
        - src/Bundle/*/tests/*
--- 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="tests/app/vendor/phpunit/phpunit/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="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
@@ -1,28 +0,0 @@
-<?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"
-    cacheDirectory="./.psalm"
->
-    <projectFiles>
-        <directory name="src" />
-        <ignoreFiles>
-            <directory name="./tests/" />
-        </ignoreFiles>
-    </projectFiles>
-
-    <!-- suppress error around parameter bags - see https://github.com/symfony/symfony/issues/45609#issuecomment-1056816975 -->
-    <!-- maybe to desactivate with php 8.1 ? -->
-    <issueHandlers>
-        <UndefinedDocblockClass>
-            <errorLevel type="suppress">
-                <referencedClass name="UnitEnum" />
-            </errorLevel>
-        </UndefinedDocblockClass>
-    </issueHandlers>
-
-</psalm>
--- a/src/Bundle/ChillActivityBundle/Controller/ActivityController.php
+++ b/src/Bundle/ChillActivityBundle/Controller/ActivityController.php
@@ -31,16 +31,13 @@ use DateTime;
 use Doctrine\ORM\EntityManagerInterface;
 use InvalidArgumentException;
 use Psr\Log\LoggerInterface;
-use RuntimeException;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
-use Symfony\Component\Form\Extension\Core\Type\HiddenType;
 use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Security\Core\Role\Role;
-
 use Symfony\Component\Serializer\SerializerInterface;
 use function array_key_exists;

@@ -179,15 +176,14 @@ final class ActivityController extends AbstractController
    {
        $view = null;

+        [$person, $accompanyingPeriod] = $this->getEntity($request);
+
        $entity = $this->activityRepository->find($id);

        if (null === $entity) {
            throw $this->createNotFoundException('Unable to find Activity entity.');
        }

-        $accompanyingPeriod = $entity->getAccompanyingPeriod();
-        $person = $entity->getPerson();
-
        if ($entity->getAccompanyingPeriod() instanceof AccompanyingPeriod) {
            $view = 'ChillActivityBundle:Activity:editAccompanyingCourse.html.twig';
            $accompanyingPeriod = $entity->getAccompanyingPeriod();
@@ -202,42 +198,17 @@ final class ActivityController extends AbstractController
            'role' => new Role('CHILL_ACTIVITY_UPDATE'),
            'activityType' => $entity->getActivityType(),
            'accompanyingPeriod' => $accompanyingPeriod,
-        ]);
-
-        if ($form->has('documents')) {
-            $form->add('gendocTemplateId', HiddenType::class, [
-                'mapped' => false,
-                'data' => null,
-                'attr' => [
-                    // required for js
-                    'data-template-id' => 'data-template-id',
-                ],
-            ]);
-        }
-
-        $form->handleRequest($request);
+        ])->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();

-            if ($form->has('gendocTemplateId') && null !== $form['gendocTemplateId']->getData()) {
-                return $this->redirectToRoute(
-                    'chill_docgenerator_generate_from_template',
-                    [
-                        'template' => $form->get('gendocTemplateId')->getData(),
-                        'entityClassName' => Activity::class,
-                        'entityId' => $entity->getId(),
-                        'returnPath' => $this->generateUrl('chill_activity_activity_edit', $params),
-                    ]
-                );
-            }
-
-            $this->addFlash('success', $this->get('translator')->trans('Success : activity updated!'));
-
            return $this->redirectToRoute('chill_activity_activity_show', $params);
        }

@@ -283,7 +254,7 @@ final class ActivityController extends AbstractController
        if ($person instanceof Person) {
            $this->denyAccessUnlessGranted(ActivityVoter::SEE, $person);
            $activities = $this->activityACLAwareRepository
-                ->findByPerson($person, ActivityVoter::SEE, 0, null, ['date' => 'DESC', 'id' => 'DESC']);
+                ->findByPerson($person, ActivityVoter::SEE, 0, null);

            $event = new PrivacyEvent($person, [
                'element_class' => Activity::class,
@@ -296,7 +267,7 @@ final class ActivityController extends AbstractController
            $this->denyAccessUnlessGranted(ActivityVoter::SEE, $accompanyingPeriod);

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

            $view = 'ChillActivityBundle:Activity:listAccompanyingCourse.html.twig';
        }
@@ -336,10 +307,8 @@ final class ActivityController extends AbstractController
            $activityData = $request->query->get('activityData');
        }

-        if (
-            !$activityType instanceof \Chill\ActivityBundle\Entity\ActivityType
-            || !$activityType->isActive()
-        ) {
+        if (!$activityType instanceof \Chill\ActivityBundle\Entity\ActivityType
+            || !$activityType->isActive()) {
            $params = $this->buildParamsToUrl($person, $accompanyingPeriod);

            if (null !== $activityData) {
@@ -420,39 +389,12 @@ final class ActivityController extends AbstractController
            'role' => new Role('CHILL_ACTIVITY_CREATE'),
            'activityType' => $entity->getActivityType(),
            'accompanyingPeriod' => $accompanyingPeriod,
-        ]);
-
-        if ($form->has('documents')) {
-            $form->add('gendocTemplateId', HiddenType::class, [
-                'mapped' => false,
-                'data' => null,
-                'attr' => [
-                    // required for js
-                    'data-template-id' => 'data-template-id',
-                ],
-            ]);
-        }
-
-        $form->handleRequest($request);
+        ])->handleRequest($request);

        if ($form->isSubmitted() && $form->isValid()) {
            $this->entityManager->persist($entity);
            $this->entityManager->flush();

-            if ($form->has('gendocTemplateId') && null !== $form['gendocTemplateId']->getData()) {
-                return $this->redirectToRoute(
-                    'chill_docgenerator_generate_from_template',
-                    [
-                        'template' => $form->get('gendocTemplateId')->getData(),
-                        'entityClassName' => Activity::class,
-                        'entityId' => $entity->getId(),
-                        'returnPath' => $this->generateUrl('chill_activity_activity_edit', [
-                            'id' => $entity->getId(),
-                        ]),
-                    ]
-                );
-            }
-
            $this->addFlash('success', $this->get('translator')->trans('Success : activity created!'));

            $params = $this->buildParamsToUrl($person, $accompanyingPeriod);
@@ -526,21 +468,20 @@ final class ActivityController extends AbstractController

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

-        if (null === $entity) {
-            throw $this->createNotFoundException('Unable to find Activity entity.');
-        }
-
-        $accompanyingPeriod = $entity->getAccompanyingPeriod();
-        $person = $entity->getPerson();
+        [$person, $accompanyingPeriod] = $this->getEntity($request);

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

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

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

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

--- a/src/Bundle/ChillActivityBundle/Controller/ActivityReasonCategoryController.php
+++ b/src/Bundle/ChillActivityBundle/Controller/ActivityReasonCategoryController.php
@@ -14,6 +14,7 @@ namespace Chill\ActivityBundle\Controller;
 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;

@@ -54,7 +55,7 @@ class ActivityReasonCategoryController extends AbstractController
    {
        $em = $this->getDoctrine()->getManager();

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

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

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

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

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

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

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

        if (!$entity) {
            throw $this->createNotFoundException('Unable to find ActivityReasonCategory entity.');
--- a/src/Bundle/ChillActivityBundle/Controller/ActivityReasonController.php
+++ b/src/Bundle/ChillActivityBundle/Controller/ActivityReasonController.php
@@ -14,6 +14,7 @@ namespace Chill\ActivityBundle\Controller;
 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;

@@ -54,7 +55,7 @@ class ActivityReasonController extends AbstractController
    {
        $em = $this->getDoctrine()->getManager();

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

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

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

        return $this->render('ChillActivityBundle:ActivityReason:index.html.twig', [
            'entities' => $entities,
@@ -105,7 +106,7 @@ class ActivityReasonController extends AbstractController
    {
        $em = $this->getDoctrine()->getManager();

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

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

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

        if (!$entity) {
            throw $this->createNotFoundException('Unable to find ActivityReason entity.');
--- a/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivitytACL.php
+++ b/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivitytACL.php
@@ -19,7 +19,6 @@ use Chill\MainBundle\Entity\RoleScope;
 use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
 use Doctrine\Persistence\ObjectManager;
-
 use function in_array;

 /**
--- a/src/Bundle/ChillActivityBundle/DependencyInjection/ChillActivityExtension.php
+++ b/src/Bundle/ChillActivityBundle/DependencyInjection/ChillActivityExtension.php
@@ -41,7 +41,6 @@ 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)
--- a/src/Bundle/ChillActivityBundle/DependencyInjection/Configuration.php
+++ b/src/Bundle/ChillActivityBundle/DependencyInjection/Configuration.php
@@ -13,7 +13,6 @@ namespace Chill\ActivityBundle\DependencyInjection;

 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
-
 use function is_int;

 /**
--- a/src/Bundle/ChillActivityBundle/Entity/Activity.php
+++ b/src/Bundle/ChillActivityBundle/Entity/Activity.php
@@ -12,10 +12,9 @@ declare(strict_types=1);
 namespace Chill\ActivityBundle\Entity;

 use Chill\ActivityBundle\Validator\Constraints as ActivityValidator;
-use Chill\DocStoreBundle\Entity\StoredObject;
+use Chill\DocStoreBundle\Entity\Document;
 use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable;
-use Chill\MainBundle\Entity\Embeddable\PrivateCommentEmbeddable;
 use Chill\MainBundle\Entity\HasCenterInterface;
 use Chill\MainBundle\Entity\HasScopeInterface;
 use Chill\MainBundle\Entity\Location;
@@ -36,7 +35,6 @@ use Symfony\Component\Security\Core\User\UserInterface;
 use Symfony\Component\Serializer\Annotation\DiscriminatorMap;
 use Symfony\Component\Serializer\Annotation\Groups;
 use Symfony\Component\Serializer\Annotation\SerializedName;
-use Symfony\Component\Validator\Constraints as Assert;

 /**
 * Class Activity.
@@ -49,8 +47,7 @@ use Symfony\Component\Validator\Constraints as Assert;
 * })
 * @ActivityValidator\ActivityValidity
 *
- * TODO see if necessary
- * UserCircleConsistency(
+ * @UserCircleConsistency(
 *     "CHILL_ACTIVITY_SEE_DETAILS",
 *     getUserFunction="getUser",
 * path="scope")
@@ -69,7 +66,7 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac

    /**
     * @ORM\ManyToOne(targetEntity="Chill\ActivityBundle\Entity\ActivityType")
-     * @Groups({"read", "docgen:read"})
+     * @Groups({"read"})
     * @SerializedName("activityType")
     * @ORM\JoinColumn(name="type_id")
     */
@@ -77,25 +74,21 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac

    /**
     * @ORM\ManyToOne(targetEntity="Chill\ActivityBundle\Entity\ActivityPresence")
-     * @Groups({"docgen:read"})
     */
    private ?ActivityPresence $attendee = null;

    /**
     * @ORM\Embedded(class="Chill\MainBundle\Entity\Embeddable\CommentEmbeddable", columnPrefix="comment_")
-     * @Groups({"docgen:read"})
     */
    private CommentEmbeddable $comment;

    /**
     * @ORM\Column(type="datetime")
-     * @Groups({"docgen:read"})
     */
    private DateTime $date;

    /**
     * @ORM\ManyToMany(targetEntity="Chill\DocStoreBundle\Entity\StoredObject", cascade={"persist"})
-     * @Assert\Valid(traverse=true)
     */
    private Collection $documents;

@@ -106,7 +99,6 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac

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

@@ -114,13 +106,13 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
     * @ORM\Id
     * @ORM\Column(name="id", type="integer")
     * @ORM\GeneratedValue(strategy="AUTO")
-     * @Groups({"read", "docgen:read"})
+     * @Groups({"read"})
     */
    private ?int $id = null;

    /**
     * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\Location")
-     * @groups({"read", "docgen:read"})
+     * @groups({"read"})
     */
    private ?Location $location = null;

@@ -131,50 +123,42 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac

    /**
     * @ORM\ManyToMany(targetEntity="Chill\PersonBundle\Entity\Person")
-     * @Groups({"read", "docgen:read"})
+     * @Groups({"read"})
     */
    private ?Collection $persons = null;

-    /**
-     * @ORM\Embedded(class="Chill\MainBundle\Entity\Embeddable\PrivateCommentEmbeddable", columnPrefix="privateComment_")
-     */
-    private PrivateCommentEmbeddable $privateComment;
-
    /**
     * @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\ManyToMany(targetEntity="Chill\PersonBundle\Entity\SocialWork\SocialAction")
     * @ORM\JoinTable(name="chill_activity_activity_chill_person_socialaction")
-     * @Groups({"read", "docgen:read"})
+     * @Groups({"read"})
     */
    private Collection $socialActions;

    /**
     * @ORM\ManyToMany(targetEntity="Chill\PersonBundle\Entity\SocialWork\SocialIssue")
     * @ORM\JoinTable(name="chill_activity_activity_chill_person_socialissue")
-     * @Groups({"read", "docgen:read"})
+     * @Groups({"read"})
     */
    private Collection $socialIssues;

    /**
     * @ORM\ManyToMany(targetEntity="Chill\ThirdPartyBundle\Entity\ThirdParty")
-     * @Groups({"read", "docgen:read"})
+     * @Groups({"read"})
     */
    private ?Collection $thirdParties = null;

@@ -185,13 +169,12 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac

    /**
     * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\User")
-     * @Groups({"docgen:read"})
     */
    private User $user;

    /**
     * @ORM\ManyToMany(targetEntity="Chill\MainBundle\Entity\User")
-     * @Groups({"read", "docgen:read"})
+     * @Groups({"read"})
     */
    private ?Collection $users = null;

@@ -199,7 +182,6 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
    {
        $this->reasons = new ArrayCollection();
        $this->comment = new CommentEmbeddable();
-        $this->privateComment = new PrivateCommentEmbeddable();
        $this->persons = new ArrayCollection();
        $this->thirdParties = new ArrayCollection();
        $this->documents = new ArrayCollection();
@@ -208,7 +190,7 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
        $this->socialActions = new ArrayCollection();
    }

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

@@ -240,22 +222,11 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
    {
        if (!$this->socialActions->contains($socialAction)) {
            $this->socialActions[] = $socialAction;
-            $this->ensureSocialActionConsistency();
        }

        return $this;
    }

-    /**
-     * Add a social issue.
-     *
-     * Note: the social issue consistency (the fact that only yougest social issues
-     * are kept) is processed by an entity listener:
-     *
-     * @see{\Chill\PersonBundle\AccompanyingPeriod\SocialIssueConsistency\AccompanyingPeriodSocialIssueConsistencyEntityListener}
-     *
-     * @return $this
-     */
    public function addSocialIssue(SocialIssue $socialIssue): self
    {
        if (!$this->socialIssues->contains($socialIssue)) {
@@ -330,18 +301,6 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
        return $this->documents;
    }

-    /**
-     * @Groups({"docgen:read"})
-     */
-    public function getDurationMinute(): int
-    {
-        if (null === $this->durationTime) {
-            return 0;
-        }
-
-        return (int) round(($this->durationTime->getTimestamp() + $this->durationTime->getOffset()) / 60.0, 0);
-    }
-
    public function getDurationTime(): ?DateTime
    {
        return $this->durationTime;
@@ -377,7 +336,7 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
        if (null !== $this->accompanyingPeriod) {
            $personsAssociated = [];

-            foreach ($this->accompanyingPeriod->getOpenParticipations() as $participation) {
+            foreach ($this->accompanyingPeriod->getParticipations() as $participation) {
                if ($this->persons->contains($participation->getPerson())) {
                    $personsAssociated[] = $participation->getPerson();
                }
@@ -407,11 +366,6 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
        return [];
    }

-    public function getPrivateComment(): PrivateCommentEmbeddable
-    {
-        return $this->privateComment;
-    }
-
    public function getReasons(): Collection
    {
        return $this->reasons;
@@ -447,18 +401,6 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
        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
     */
@@ -482,7 +424,7 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
        return $this->getEmergency();
    }

-    public function removeDocument(StoredObject $document): void
+    public function removeDocument(Document $document): void
    {
        $this->documents->removeElement($document);
    }
@@ -598,13 +540,6 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
        return $this;
    }

-    public function setPrivateComment(PrivateCommentEmbeddable $privateComment): self
-    {
-        $this->privateComment = $privateComment;
-
-        return $this;
-    }
-
    public function setReasons(?ArrayCollection $reasons): self
    {
        $this->reasons = $reasons;
@@ -663,13 +598,4 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac

        return $this;
    }
-
-    private function ensureSocialActionConsistency(): void
-    {
-        $ancestors = SocialAction::findAncestorSocialActions($this->getSocialActions());
-
-        foreach ($ancestors as $ancestor) {
-            $this->removeSocialAction($ancestor);
-        }
-    }
 }
--- a/src/Bundle/ChillActivityBundle/Entity/ActivityPresence.php
+++ b/src/Bundle/ChillActivityBundle/Entity/ActivityPresence.php
@@ -12,7 +12,6 @@ declare(strict_types=1);
 namespace Chill\ActivityBundle\Entity;

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

 /**
 * Class ActivityPresence.
@@ -32,14 +31,11 @@ class ActivityPresence
     * @ORM\Id
     * @ORM\Column(name="id", type="integer")
     * @ORM\GeneratedValue(strategy="AUTO")
-     * @Serializer\Groups({"docgen:read"})
     */
    private ?int $id;

    /**
     * @ORM\Column(type="json")
-     * @Serializer\Groups({"docgen:read"})
-     * @Serializer\Context({"is-translatable": true}, groups={"docgen:read"})
     */
    private array $name = [];

--- a/src/Bundle/ChillActivityBundle/Entity/ActivityType.php
+++ b/src/Bundle/ChillActivityBundle/Entity/ActivityType.php
@@ -13,10 +13,8 @@ namespace Chill\ActivityBundle\Entity;

 use Doctrine\ORM\Mapping as ORM;
 use InvalidArgumentException;
-use Symfony\Component\Serializer\Annotation as Serializer;
 use Symfony\Component\Serializer\Annotation\Groups;
 use Symfony\Component\Validator\Constraints as Assert;
-use Symfony\Component\Validator\Context\ExecutionContextInterface;

 /**
 * Class ActivityType.
@@ -120,7 +118,6 @@ class ActivityType
     * @ORM\Id
     * @ORM\Column(name="id", type="integer")
     * @ORM\GeneratedValue(strategy="AUTO")
-     * @Groups({"docgen:read"})
     */
    private ?int $id;

@@ -136,8 +133,7 @@ class ActivityType

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

@@ -170,12 +166,12 @@ class ActivityType
    /**
     * @ORM\Column(type="string", nullable=false, options={"default": ""})
     */
-    private string $privateCommentLabel = '';
+    private string $placeLabel = '';

    /**
     * @ORM\Column(type="smallint", nullable=false, options={"default": 1})
     */
-    private int $privateCommentVisible = self::FIELD_OPTIONAL;
+    private int $placeVisible = self::FIELD_OPTIONAL;

    /**
     * @ORM\Column(type="string", nullable=false, options={"default": ""})
@@ -204,6 +200,7 @@ class ActivityType

    /**
     * @ORM\Column(type="smallint", nullable=false, options={"default": 1})
+     * @Assert\EqualTo(propertyPath="socialIssuesVisible", message="This parameter must be equal to social issue parameter")
     */
    private int $socialActionsVisible = self::FIELD_INVISIBLE;

@@ -273,23 +270,6 @@ class ActivityType
     */
    private int $userVisible = self::FIELD_REQUIRED;

-    /**
-     * @Assert\Callback
-     *
-     * @param mixed $payload
-     */
-    public function checkSocialActionsVisibility(ExecutionContextInterface $context, $payload)
-    {
-        if ($this->socialIssuesVisible !== $this->socialActionsVisible) {
-            if (!(2 === $this->socialIssuesVisible && 1 === $this->socialActionsVisible)) {
-                $context
-                    ->buildViolation('The socialActionsVisible value is not compatible with the socialIssuesVisible value')
-                    ->atPath('socialActionsVisible')
-                    ->addViolation();
-            }
-        }
-    }
-
    /**
     * Get active
     * return true if the type is active.
@@ -426,14 +406,14 @@ class ActivityType
        return $this->personVisible;
    }

-    public function getPrivateCommentLabel(): string
+    public function getPlaceLabel(): string
    {
-        return $this->privateCommentLabel;
+        return $this->placeLabel;
    }

-    public function getPrivateCommentVisible(): int
+    public function getPlaceVisible(): int
    {
-        return $this->privateCommentVisible;
+        return $this->placeVisible;
    }

    public function getReasonsLabel(): string
@@ -708,16 +688,16 @@ class ActivityType
        return $this;
    }

-    public function setPrivateCommentLabel(string $privateCommentLabel): self
+    public function setPlaceLabel(string $placeLabel): self
    {
-        $this->privateCommentLabel = $privateCommentLabel;
+        $this->placeLabel = $placeLabel;

        return $this;
    }

-    public function setPrivateCommentVisible(int $privateCommentVisible): self
+    public function setPlaceVisible(int $placeVisible): self
    {
-        $this->privateCommentVisible = $privateCommentVisible;
+        $this->placeVisible = $placeVisible;

        return $this;
    }
--- a/src/Bundle/ChillActivityBundle/EntityListener/ActivityEntityListener.php
+++ b/src/Bundle/ChillActivityBundle/EntityListener/ActivityEntityListener.php
@@ -1,74 +0,0 @@
-<?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);
-                }
-
-                $this->em->persist($newAction);
-                $this->em->flush();
-            }
-        }
-    }
-}
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityReasonAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityReasonAggregator.php
@@ -25,7 +25,6 @@ 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;

--- a/src/Bundle/ChillActivityBundle/Export/Export/ListActivity.php
+++ b/src/Bundle/ChillActivityBundle/Export/Export/ListActivity.php
@@ -24,10 +24,9 @@ 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 Symfony\Component\Validator\Context\ExecutionContextInterface;
-use Symfony\Contracts\Translation\TranslatorInterface;
-
 use function array_key_exists;
 use function count;
 use function in_array;
@@ -190,9 +189,7 @@ class ListActivity implements ListInterface

    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
    {
-        $centers = array_map(static 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)) {
--- a/src/Bundle/ChillActivityBundle/Export/Filter/ActivityDateFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/ActivityDateFilter.php
@@ -21,7 +21,7 @@ use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\FormError;
 use Symfony\Component\Form\FormEvent;
 use Symfony\Component\Form\FormEvents;
-use Symfony\Contracts\Translation\TranslatorInterface;
+use Symfony\Component\Translation\TranslatorInterface;

 class ActivityDateFilter implements FilterInterface
 {
--- a/src/Bundle/ChillActivityBundle/Export/Filter/ActivityReasonFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/ActivityReasonFilter.php
@@ -25,7 +25,6 @@ use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Security\Core\Role\Role;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
-
 use function array_key_exists;
 use function count;

--- a/src/Bundle/ChillActivityBundle/Export/Filter/ActivityTypeFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/ActivityTypeFilter.php
@@ -24,7 +24,6 @@ use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Security\Core\Role\Role;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
-
 use function count;

 class ActivityTypeFilter implements ExportElementValidatedInterface, FilterInterface
--- a/src/Bundle/ChillActivityBundle/Export/Filter/PersonHavingActivityBetweenDateFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/PersonHavingActivityBetweenDateFilter.php
@@ -29,9 +29,8 @@ use Symfony\Component\Form\FormError;
 use Symfony\Component\Form\FormEvent;
 use Symfony\Component\Form\FormEvents;
 use Symfony\Component\Form\FormInterface;
+use Symfony\Component\Translation\TranslatorInterface;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
-use Symfony\Contracts\Translation\TranslatorInterface;
-
 use function count;

 class PersonHavingActivityBetweenDateFilter implements ExportElementValidatedInterface, FilterInterface
--- a/src/Bundle/ChillActivityBundle/Form/ActivityType.php
+++ b/src/Bundle/ChillActivityBundle/Form/ActivityType.php
@@ -20,7 +20,6 @@ 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\PrivateCommentType;
 use Chill\MainBundle\Form\Type\ScopePickerType;
 use Chill\MainBundle\Form\Type\UserPickerType;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
@@ -49,7 +48,6 @@ use Symfony\Component\Form\FormEvent;
 use Symfony\Component\Form\FormEvents;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
-
 use function in_array;

 class ActivityType extends AbstractType
@@ -126,9 +124,7 @@ class ActivityType extends AbstractType
        }

        if ($activityType->isVisible('socialIssues') && $accompanyingPeriod) {
-            $builder->add('socialIssues', HiddenType::class, [
-                'required' => $activityType->getSocialIssuesVisible() === 2,
-            ]);
+            $builder->add('socialIssues', HiddenType::class);
            $builder->get('socialIssues')
                ->addModelTransformer(new CallbackTransformer(
                    static function (iterable $socialIssuesAsIterable): string {
@@ -154,9 +150,7 @@ class ActivityType extends AbstractType
        }

        if ($activityType->isVisible('socialActions') && $accompanyingPeriod) {
-            $builder->add('socialActions', HiddenType::class, [
-                'required' => $activityType->getSocialActionsVisible() === 2,
-            ]);
+            $builder->add('socialActions', HiddenType::class);
            $builder->get('socialActions')
                ->addModelTransformer(new CallbackTransformer(
                    static function (iterable $socialActionsAsIterable): string {
@@ -252,13 +246,6 @@ class ActivityType extends AbstractType
            ]);
        }

-        if ($activityType->isVisible('privateComment')) {
-            $builder->add('privateComment', PrivateCommentType::class, [
-                'label' => '' === $activityType->getLabel('privateComment') ? 'private comment' : $activityType->getPrivateCommentLabel(),
-                'required' => false,
-            ]);
-        }
-
        if ($activityType->isVisible('persons')) {
            $builder->add('persons', HiddenType::class);
            $builder->get('persons')
@@ -273,10 +260,6 @@ class ActivityType extends AbstractType
                        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]),
                            explode(',', $personsAsString)
@@ -299,10 +282,6 @@ class ActivityType extends AbstractType
                        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]),
                            explode(',', $thirdpartyAsString)
@@ -317,11 +296,8 @@ class ActivityType extends AbstractType
                'label' => $activityType->getLabel('documents'),
                'required' => $activityType->isRequired('documents'),
                'allow_add' => true,
-                'allow_delete' => true,
                'button_add_label' => 'activity.Insert a document',
                'button_remove_label' => 'activity.Remove a document',
-                'empty_collection_explain' => 'No documents',
-                'entry_options' => ['has_title' => true],
            ]);
        }

@@ -339,10 +315,6 @@ class ActivityType extends AbstractType
                        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]),
                            explode(',', $usersAsString)
@@ -352,9 +324,7 @@ class ActivityType extends AbstractType
        }

        if ($activityType->isVisible('location')) {
-            $builder->add('location', HiddenType::class, [
-                'required' => $activityType->getLocationVisible() === 2,
-            ])
+            $builder->add('location', HiddenType::class)
                ->get('location')
                ->addModelTransformer(new CallbackTransformer(
                    static function (?Location $location): string {
@@ -362,7 +332,7 @@ class ActivityType extends AbstractType
                            return '';
                        }

-                        return (string) $location->getId();
+                        return $location->getId();
                    },
                    function (?string $id): ?Location {
                        return $this->om->getRepository(Location::class)->findOneBy(['id' => (int) $id]);
@@ -382,8 +352,8 @@ class ActivityType extends AbstractType
                'label' => $activityType->getLabel('sentReceived'),
                'required' => $activityType->isRequired('sentReceived'),
                'choices' => [
-                    'Received' => Activity::SENTRECEIVED_RECEIVED,
                    'Sent' => Activity::SENTRECEIVED_SENT,
+                    'Received' => Activity::SENTRECEIVED_RECEIVED,
                ],
            ]);
        }
@@ -409,7 +379,7 @@ class ActivityType extends AbstractType
                    $timezoneUTC = new DateTimeZone('GMT');
                    /** @var DateTime $data */
                    $data = $formEvent->getData() === null ?
-                        DateTime::createFromFormat('U', '300') :
+                        DateTime::createFromFormat('U', 300) :
                        $formEvent->getData();
                    $seconds = $data->getTimezone()->getOffset($data);
                    $data->setTimeZone($timezoneUTC);
--- a/src/Bundle/ChillActivityBundle/Form/ActivityTypeType.php
+++ b/src/Bundle/ChillActivityBundle/Form/ActivityTypeType.php
@@ -55,9 +55,9 @@ class ActivityTypeType extends AbstractType
            ]);

        $fields = [
-            'persons', 'user', 'date', 'location', 'persons',
+            'persons', 'user', 'date', 'place', 'persons',
            'thirdParties', 'durationTime', 'travelTime', 'attendee',
-            'reasons', 'comment', 'privateComment', 'sentReceived', 'documents',
+            'reasons', 'comment', 'sentReceived', 'documents',
            'emergency', 'socialIssues', 'socialActions', 'users',
        ];

@@ -69,9 +69,6 @@ class ActivityTypeType extends AbstractType
                    'empty_data' => '',
                ]);
        }
-
-        $builder
-            ->add('commentVisible', ActivityFieldPresence::class);
    }

    public function configureOptions(OptionsResolver $resolver)
--- a/src/Bundle/ChillActivityBundle/Menu/AccompanyingCourseMenuBuilder.php
+++ b/src/Bundle/ChillActivityBundle/Menu/AccompanyingCourseMenuBuilder.php
@@ -36,10 +36,8 @@ class AccompanyingCourseMenuBuilder implements LocalMenuBuilderInterface
    {
        $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' => [
--- a/src/Bundle/ChillActivityBundle/Menu/AdminMenuBuilder.php
+++ b/src/Bundle/ChillActivityBundle/Menu/AdminMenuBuilder.php
@@ -14,6 +14,7 @@ namespace Chill\ActivityBundle\Menu;
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
 use Knp\Menu\MenuItem;
 use Symfony\Component\Security\Core\Security;
+use function in_array;

 final class AdminMenuBuilder implements LocalMenuBuilderInterface
 {
@@ -30,38 +31,27 @@ final class AdminMenuBuilder implements LocalMenuBuilderInterface
            return;
        }

-        $menu->addChild('Activities', [
-            'route' => 'chill_activity_admin_index',
-        ])
-            ->setAttribute('class', 'list-group-item-header')
-            ->setExtras([
-                'order' => 5000,
-                'icons' => ['exchange'],
-            ]);
-
-        $menu->addChild('Activity Reasons', [
-            'route' => 'chill_activity_activityreason',
-        ])->setExtras(['order' => 5010]);
-
-        $menu->addChild('Activity Reasons Category', [
-            'route' => 'chill_activity_activityreasoncategory',
-        ])->setExtras(['order' => 5020]);
-
-        $menu->addChild('Activity type', [
-            'route' => 'chill_activity_type_admin',
-        ])->setExtras(['order' => 5030]);
-
-        $menu->addChild('Activity Presences', [
-            'route' => 'chill_crud_activity_presence_index',
-        ])->setExtras(['order' => 5040]);
-
-        $menu->addChild('Activity Types Categories', [
-            'route' => 'chill_activity_type_category_admin',
-        ])->setExtras(['order' => 5050]);
+        if (in_array($menuId, ['admin_index', 'admin_section'], true)) {
+            $menu->addChild('Activities', [
+                'route' => 'chill_admin_activity_index',
+            ])
+                ->setExtras([
+                    'order' => 2000,
+                    'explain' => 'Activity configuration',
+                ]);
+        } else {
+            $menu
+                ->addChild('Activities', [
+                    'route' => 'chill_admin_activity_index',
+                ])
+                ->setExtras([
+                    'order' => '60',
+                ]);
+        }
    }

    public static function getMenuIds(): array
    {
-        return ['admin_section', 'admin_activity'];
+        return ['admin_index', 'admin_section', 'admin_activity'];
    }
 }
--- a/src/Bundle/ChillActivityBundle/Menu/PersonMenuBuilder.php
+++ b/src/Bundle/ChillActivityBundle/Menu/PersonMenuBuilder.php
@@ -15,7 +15,7 @@ use Chill\ActivityBundle\Security\Authorization\ActivityVoter;
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
 use Knp\Menu\MenuItem;
 use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
-use Symfony\Contracts\Translation\TranslatorInterface;
+use Symfony\Component\Translation\TranslatorInterface;

 class PersonMenuBuilder implements LocalMenuBuilderInterface
 {
--- a/src/Bundle/ChillActivityBundle/Notification/ActivityNotificationHandler.php
+++ b/src/Bundle/ChillActivityBundle/Notification/ActivityNotificationHandler.php
@@ -1,45 +0,0 @@
-<?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
@@ -0,0 +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\Notification;
+
+use Chill\ActivityBundle\Entity\Activity;
+use Chill\MainBundle\Entity\Notification;
+
+final class ActivityNotificationRenderer
+{
+    public function getTemplate()
+    {
+        return '@ChillActivity/Activity/showInNotification.html.twig';
+    }
+
+    public function getTemplateData(Notification $notification)
+    {
+        return ['notification' => $notification];
+    }
+
+    public function supports(Notification $notification, array $options = []): bool
+    {
+        return $notification->getRelatedEntityClass() === Activity::class;
+    }
+}
--- a/src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepository.php
+++ b/src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepository.php
@@ -12,24 +12,16 @@ declare(strict_types=1);
 namespace Chill\ActivityBundle\Repository;

 use Chill\ActivityBundle\Entity\Activity;
-use Chill\ActivityBundle\Entity\ActivityPresence;
-use Chill\ActivityBundle\Entity\ActivityType;
 use Chill\ActivityBundle\Security\Authorization\ActivityVoter;
-use Chill\MainBundle\Entity\Location;
-use Chill\MainBundle\Entity\LocationType;
 use Chill\MainBundle\Entity\Scope;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
 use Chill\MainBundle\Security\Resolver\CenterResolverDispatcherInterface;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\Person;
-use Doctrine\DBAL\Types\Types;
-use Doctrine\ORM\AbstractQuery;
 use Doctrine\ORM\EntityManagerInterface;
-use Doctrine\ORM\Query\ResultSetMappingBuilder;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 use Symfony\Component\Security\Core\Role\Role;
 use Symfony\Component\Security\Core\Security;
-
 use function count;
 use function in_array;

@@ -79,86 +71,6 @@ final class ActivityACLAwareRepository implements ActivityACLAwareRepositoryInte
            ->findByAccompanyingPeriod($period, $scopes, true, $limit, $start, $orderBy);
    }

-    public function findByAccompanyingPeriodSimplified(AccompanyingPeriod $period, ?int $limit = 1000): array
-    {
-        $rsm = new ResultSetMappingBuilder($this->em);
-
-        $sql = '
-        SELECT
-            a.id AS activity_id,
-            date,
-            CASE WHEN durationtime IS NOT NULL THEN (EXTRACT(EPOCH from durationtime) / 60)::int ELSE 0 END AS durationtimeminute,
-            attendee_id,
-            comment_comment,
-            emergency,
-            sentreceived,
-            CASE WHEN traveltime IS NOT NULL THEN (EXTRACT(EPOCH from traveltime) / 60)::int ELSE 0 END AS traveltimeminute,
-            t.id AS type_id, t.name as type_name,
-            p.id AS presence_id, p.name AS presence_name,
-            location.id AS location_id, location.address_id, location.name AS location_name, location.phonenumber1, location.phonenumber2, location.email,
-            location.locationtype_id, locationtype.title AS locationtype_title,
-            users.userids AS userids,
-            thirdparties.thirdpartyids,
-            persons.personids,
-            actions.socialactionids,
-            issues.socialissueids
-
-        FROM activity a
-        LEFT JOIN chill_main_location location ON a.location_id = location.id
-        LEFT JOIN chill_main_location_type locationtype ON location.locationtype_id = locationtype.id
-        LEFT JOIN activitytpresence p ON a.attendee_id = p.id
-        LEFT JOIN activitytype t ON a.type_id = t.id
-        LEFT JOIN LATERAL (SELECT jsonb_agg(user_id) userids, activity_id FROM activity_user AS au WHERE a.id = au.activity_id GROUP BY activity_id) AS users ON TRUE
-        LEFT JOIN LATERAL (SELECT jsonb_agg(thirdparty_id) thirdpartyids, activity_id FROM activity_thirdparty AS au WHERE a.id = au.activity_id GROUP BY activity_id) AS thirdparties ON TRUE
-        LEFT JOIN LATERAL (SELECT jsonb_agg(person_id) personids, activity_id FROM activity_person AS au WHERE a.id = au.activity_id GROUP BY activity_id) AS persons ON TRUE
-        LEFT JOIN LATERAL (SELECT jsonb_agg(socialaction_id) socialactionids, activity_id FROM chill_activity_activity_chill_person_socialaction AS au WHERE a.id = au.activity_id GROUP BY activity_id) AS actions ON TRUE
-        LEFT JOIN LATERAL (SELECT jsonb_agg(socialissue_id) socialissueids, activity_id FROM chill_activity_activity_chill_person_socialissue AS au WHERE a.id = au.activity_id GROUP BY activity_id) AS issues ON TRUE
-
-        WHERE accompanyingperiod_id = ?
-        ORDER BY a.date DESC, a.id DESC
-        LIMIT ?
-        ';
-
-        $rsm
-            ->addEntityResult(Activity::class, 'a')
-            ->addFieldResult('a', 'activity_id', 'id')
-            ->addFieldResult('a', 'date', 'date')
-            ->addFieldResult('a', 'comment', 'comment')
-            ->addFieldResult('a', 'sentreceived', 'sentReceived')
-            ->addFieldResult('a', 'emergency', 'emergency')
-            ->addJoinedEntityResult(Location::class, 'location', 'a', 'location')
-            ->addFieldResult('location', 'location_id', 'id')
-            ->addFieldResult('location', 'location_name', 'name')
-            ->addFieldResult('location', 'phonenumber1', 'phonenumber1')
-            ->addFieldResult('location', 'phonenumber2', 'phonenumber2')
-            ->addFieldResult('location', 'email', 'email')
-            ->addJoinedEntityResult(LocationType::class, 'locationType', 'location', 'locationType')
-            ->addFieldResult('locationType', 'locationtype_id', 'id')
-            ->addFieldResult('locationType', 'locationtype_title', 'title')
-            ->addJoinedEntityResult(ActivityType::class, 'activityType', 'a', 'activityType')
-            ->addFieldResult('activityType', 'type_id', 'id')
-            ->addFieldResult('activityType', 'type_name', 'name')
-            ->addJoinedEntityResult(ActivityPresence::class, 'activityPresence', 'a', 'attendee')
-            ->addFieldResult('activityPresence', 'presence_id', 'id')
-            ->addFieldResult('activityPresence', 'presence_name', 'name')
-
-            // results which cannot be mapped into entity
-            ->addScalarResult('comment_comment', 'comment', Types::TEXT)
-            ->addScalarResult('userids', 'userIds', Types::JSON)
-            ->addScalarResult('thirdpartyids', 'thirdPartyIds', Types::JSON)
-            ->addScalarResult('personids', 'personIds', Types::JSON)
-            ->addScalarResult('socialactionids', 'socialActionIds', Types::JSON)
-            ->addScalarResult('socialissueids', 'socialIssueIds', Types::JSON)
-            ->addScalarResult('durationtimeminute', 'durationTimeMinute', Types::INTEGER)
-            ->addScalarResult('traveltimeminute', 'travelTimeMinute', Types::INTEGER);
-
-        $nq = $this->em->createNativeQuery($sql, $rsm);
-
-        $nq->setParameter(0, $period->getId())->setParameter(1, $limit);
-
-        return $nq->getResult(AbstractQuery::HYDRATE_ARRAY);
-    }
-
    /**
     * @param array $orderBy
     *
@@ -255,9 +167,7 @@ final class ActivityACLAwareRepository implements ActivityACLAwareRepositoryInte
            $reachableScopes = $this->authorizationHelper->getReachableScopes($this->tokenStorage->getToken()->getUser(), $role, $center);
            // we get the ids for those scopes
            $reachablesScopesId = array_map(
-                static function (Scope $scope) {
-                    return $scope->getId();
-                },
+                static function (Scope $scope) { return $scope->getId(); },
                $reachableScopes
            );

--- a/src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepositoryInterface.php
+++ b/src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepositoryInterface.php
@@ -21,15 +21,6 @@ interface ActivityACLAwareRepositoryInterface
     */
    public function findByAccompanyingPeriod(AccompanyingPeriod $period, string $role, ?int $start = 0, ?int $limit = 1000, ?array $orderBy = []): array;

-    /**
-     * Return a list of activities, simplified as array (not object).
-     *
-     * The aim of this method is to get a long list of activities and keep performance.
-     *
-     * @return array an array of array, each item representing an activity
-     */
-    public function findByAccompanyingPeriodSimplified(AccompanyingPeriod $period, ?int $limit = 1000): array;
-
    /**
     * @return Activity[]|array
     */
--- a/src/Bundle/ChillActivityBundle/Repository/ActivityRepository.php
+++ b/src/Bundle/ChillActivityBundle/Repository/ActivityRepository.php
@@ -31,8 +31,6 @@ class ActivityRepository extends ServiceEntityRepository
    }

    /**
-     * @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
--- a/src/Bundle/ChillActivityBundle/Resources/public/chill/chillactivity.scss
+++ b/src/Bundle/ChillActivityBundle/Resources/public/chill/chillactivity.scss
@@ -9,9 +9,8 @@ div.new-activity-select-type {
      display: flex;
      flex-direction: row;
      flex-wrap: wrap;
-      justify-content: flex-start;
+      justify-content: center;
      gap: 12px;
-      margin-bottom: 30px;

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

 //// ACTIVITY LIST PAGE
-// precise dashboard specific details
+// precise badge-title 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 {
-   ul.list-content {
-      font-size: 70%;
-      list-style-type: none;
-      padding-left: 0;
-      margin: 0;
-      li {
-         margin-bottom: 0.2em;
-         // exception: change bg color for action badges above dashboard
-         .bg-light {
-               background-color: $chill-light-gray !important;
-         }
-      }
-   }
+    div.duration {
+        font-size: smaller;
+        padding-left: 1em;
+        margin-top: 1em;
+    }
+    ul.list-content {
+        font-size: 70%;
+        list-style-type: none;
+        padding-left: 0;
+        margin: 0;
+        li {
+            margin-bottom: 0.2em;
+            // exception: change bg color for action badges above badge-title
+            .bg-light {
+                background-color: $chill-light-gray !important;
+            }
+        }
+    }
+}
+div.main {
+    padding: 1em;
 }

 //// ACTIVITY SHOW AND FORM PAGES
--- a/src/Bundle/ChillActivityBundle/Resources/public/page/edit_activity/index.scss
+++ b/src/Bundle/ChillActivityBundle/Resources/public/page/edit_activity/index.scss
@@ -1,23 +0,0 @@
-div.chill-dropzone__below-zone {
-    a.btn-delete {
-        display: none;
-    }
-}
-
-ul[data-collection-name="documents"] {
-    button.remove-entry {
-        margin: 0.5rem 0!important;
-    }
-}
-
-
-// do it in js does not work
-// document.addEventListener('DOMContentLoaded', e => {
-//     const dropzoneBelow = document.querySelectorAll('div.chill-dropzone__below-zone');
-//     dropzoneBelow.forEach(
-//         d => {
-//             const a = d.querySelector('a.btn-delete');
-//             d.removeChild(a);
-//         }
-//     )
-// });
--- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/App.vue
+++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/App.vue
@@ -11,7 +11,7 @@ import Location from './components/Location.vue';

 export default {
   name: "App",
-   props: ['hasSocialIssues', 'hasLocation', 'hasPerson'],
+    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
@@ -17,14 +17,6 @@ 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 Type by defaultFor
 *   @param {string} entity - can be "person" or "thirdparty"
@@ -56,6 +48,5 @@ export {
   getLocations,
   getLocationTypes,
   getLocationTypeByDefaultFor,
-   postLocation,
-   getUserCurrentLocation
+   postLocation
 };
--- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/ConcernedGroups.vue
+++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/ConcernedGroups.vue
@@ -1,52 +1,45 @@
 <template>
-   <teleport to="#add-persons" v-if="isComponentVisible">
+    <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' && 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>
+        <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' && suggestedEntities.length > 0">
+            <ul class="list-suggest add-items">
+                <li v-for="p in suggestedEntities" @click="addSuggestedEntity(p)">
+                    <span>{{ p.text }}</span>
+                </li>
+            </ul>
+        </div>

-      <ul class="record_actions">
-         <li class="add-persons">
-            <add-persons
-               buttonTitle="activity.add_persons"
-               modalTitle="activity.add_persons"
-               v-bind:key="addPersons.key"
-               v-bind:options="addPersonsOptions"
-               @addNewPersons="addNewPersons"
-               ref="addPersons">
-            </add-persons>
-         </li>
-      </ul>
+        <add-persons
+            buttonTitle="activity.add_persons"
+            modalTitle="activity.add_persons"
+            v-bind:key="addPersons.key"
+            v-bind:options="addPersonsOptions"
+            @addNewPersons="addNewPersons"
+            ref="addPersons">
+        </add-persons>

-   </teleport>
+    </teleport>
 </template>

 <script>
 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,
-      PersonText
+      PersonsBloc
   },
   data() {
      return {
--- 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,29 +1,22 @@
 <template>
   <li>
-      <span :title="person.text" @click.prevent="$emit('remove', person)">
-         <span class="chill_denomination">
-            <person-text :person="person" :isCut="true"></person-text>
-         </span>
+      <span :title="person.text">
+         <span class="chill_denomination">{{ textCutted }}</span>
+         <a @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'],
-   components: {
-      PersonText
+   computed: {
+      textCutted() {
+         let more = (this.person.text.length > 15) ?'…' : '';
+         return this.person.text.slice(0,15) + more;
+      }
   },
-   // 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/Location.vue
+++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/Location.vue
@@ -1,7 +1,7 @@
 <template>
    <teleport to="#location">
        <div class="mb-3 row">
-            <label :class="locationClassList">
+            <label class="col-form-label col-sm-4">
                {{ $t("activity.location") }}
            </label>
            <div class="col-sm-8">
@@ -15,16 +15,14 @@
                    :searchable="true"
                    :placeholder="$t('activity.choose_location')"
                    :custom-label="customLabel"
-                    :select-label="$t('multiselect.select_label')"
-                    :deselect-label="$t('multiselect.deselect_label')"
-                    :selected-label="$t('multiselect.selected_label')"
-                    :options="availableLocations"
+                    :options="locations"
                    group-values="locations"
                    group-label="locationGroup"
                    v-model="location"
                >
                </VueMultiselect>
-                <new-location v-bind:availableLocations="availableLocations"></new-location>
+
+                <new-location v-bind:locations="locations"></new-location>
            </div>
        </div>
    </teleport>
@@ -34,6 +32,7 @@
 import { mapState, mapGetters } from "vuex";
 import VueMultiselect from "vue-multiselect";
 import NewLocation from "./Location/NewLocation.vue";
+import { getLocations, getLocationTypeByDefaultFor } from "../api.js";

 export default {
    name: "Location",
@@ -43,12 +42,11 @@ export default {
    },
    data() {
        return {
-            locationClassList:
-               `col-form-label col-sm-4 ${document.querySelector('input#chill_activitybundle_activity_location').getAttribute('required') ? 'required' : ''}`,
-        }
+            locations: [],
+        };
    },
    computed: {
-        ...mapState(["activity", "availableLocations"]),
+        ...mapState(["activity"]),
        ...mapGetters(["suggestedEntities"]),
        location: {
            get() {
@@ -59,6 +57,53 @@ export default {
            },
        },
    },
+    mounted() {
+        getLocations().then(
+            (results) => {
+                getLocationTypeByDefaultFor('person').then(
+                    (personLocationType) => {
+                        if (personLocationType) {
+                            const personLocation = this.makeAccompanyingPeriodLocation(personLocationType);
+                            const concernedPersonsLocation =
+                                this.makeConcernedPersonsLocation(personLocationType);
+                            getLocationTypeByDefaultFor('thirdparty').then(
+                                thirdpartyLocationType => {
+                                    const concernedThirdPartiesLocation =
+                                        this.makeConcernedThirdPartiesLocation(thirdpartyLocationType);
+                                    this.locations = [
+                                        {
+                                            locationGroup: 'Localisation du parcours',
+                                            locations: [personLocation]
+                                        },
+                                        {
+                                            locationGroup: 'Parties concernées',
+                                            locations: [...concernedPersonsLocation, ...concernedThirdPartiesLocation]
+                                        },
+                                        {
+                                            locationGroup: 'Autres localisations',
+                                            locations: results
+                                        }
+                                    ];
+                                }
+                            )
+                        } else {
+                            this.locations = [
+                                {
+                                    locationGroup: 'Localisations',
+                                    locations: response.results
+                                }
+                            ];
+                        }
+                        if (window.default_location_id) {
+                            let location = this.locations.filter(
+                                (l) => l.id === window.default_location_id
+                            );
+                            this.$store.dispatch("updateLocation", location);
+                        }
+                    }
+                )
+            })
+    },
    methods: {
        labelAccompanyingCourseLocation(value) {
            return `${value.address.text} (${value.locationType.title.fr})`
@@ -72,6 +117,58 @@ export default {
                    : value.locationType.title.fr
                : '';
        },
+        makeConcernedPersonsLocation(locationType) {
+            let locations = [];
+            this.suggestedEntities.forEach(
+                (e) => {
+                    if (e.type === 'person' && e.current_household_address !== null){
+                        locations.push({
+                            type: 'location',
+                            id: -this.suggestedEntities.indexOf(e)*10,
+                            onthefly: true,
+                            name: e.text,
+                            address: {
+                                id: e.current_household_address.address_id,
+                            },
+                            locationType: locationType
+                        });
+                    }
+                }
+            )
+            return locations;
+        },
+        makeConcernedThirdPartiesLocation(locationType) {
+            let locations = [];
+            this.suggestedEntities.forEach(
+                (e) => {
+                    if (e.type === 'thirdparty' && e.address !== null){
+                        locations.push({
+                            type: 'location',
+                            id: -this.suggestedEntities.indexOf(e)*10,
+                            onthefly: true,
+                            name: e.text,
+                            address: { id: e.address.address_id },
+                            locationType: locationType
+                        });
+                    }
+                }
+            )
+            return locations;
+        },
+        makeAccompanyingPeriodLocation(locationType) {
+            const accPeriodLocation = this.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
+            }
+        }
    },
 };
 </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,10 +18,13 @@
                </template>
                <template v-slot:body>
                    <form>
-                        <div class="alert alert-warning" v-if="errors.length">
-                            <ul>
-                                <li v-for="(e, i) in errors" :key="i">{{ e }}</li>
-                            </ul>
+                        <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">
@@ -59,7 +62,6 @@
                            <input class="form-control form-control-lg" id="email" v-model="inputEmail" placeholder />
                            <label for="email">{{ $t('activity.location_fields.email') }}</label>
                        </div>
-
                    </form>
                </template>
                <template v-slot:footer>
@@ -79,8 +81,7 @@
 import Modal from 'ChillMainAssets/vuejs/_components/Modal.vue';
 import AddAddress from "ChillMainAssets/vuejs/Address/components/AddAddress.vue";
 import { mapState } from "vuex";
-import { getLocationTypes } from "../../api";
-import { makeFetch } from 'ChillMainAssets/lib/api/apiMethods';
+import { getLocationTypes, postLocation } from "../../api";

 export default {
    name: "NewLocation",
@@ -88,7 +89,7 @@ export default {
        Modal,
        AddAddress,
    },
-    props: ['availableLocations'],
+    props: ['locations'],
    data() {
        return {
            errors: [],
@@ -222,6 +223,7 @@ export default {
        },
        saveNewLocation() {
            if (this.checkForm()) {
+                console.log('saveNewLocation', this.selected);
                let body = {
                    type: 'location',
                    name: this.selected.name,
@@ -240,28 +242,23 @@ export default {
                        }
                    });
                }
-
-                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((error) => {
-                        if (error.name === 'ValidationException') {
-                            for (let v of error.violations) {
-                                this.errors.push(v);
-                            }
-                        } else {
-                            this.errors.push('An error occurred');
+                postLocation(body)
+                    .then(
+                        location => new Promise(resolve => {
+                            this.locations.push(location);
+                            this.$store.dispatch('updateLocation', location);
+                            resolve();
+                            this.modal.showModal = false;
+                        })
+                    ).catch(
+                        err => {
+                            this.errors.push(err.message);
                        }
-                    })
+                    );
            };
        },
        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
@@ -3,15 +3,15 @@

      <div class="mb-3 row">
         <div class="col-4">
-            <label :class="socialIssuesClassList">{{ $t('activity.social_issues') }}</label>
+            <label class="col-form-label">{{ $t('activity.social_issues') }}</label>
         </div>
         <div class="col-8">

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

@@ -21,18 +21,18 @@
               label="text"
               track-by="id"
               open-direction="bottom"
-               :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"
+               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"
               @select="addIssueInList">
            </VueMultiselect>
            </div>
@@ -42,7 +42,7 @@

      <div class="mb-3 row">
         <div class="col-4">
-            <label :class="socialActionsClassList">{{ $t('activity.social_actions') }}</label>
+            <label class="col-form-label">{{ $t('activity.social_actions') }}</label>
         </div>
         <div class="col-8">

@@ -54,19 +54,19 @@
               {{ $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"
-                  :key="action.id"
-                  :action="action"
-                  :selection="socialActionsSelected"
-                  @updateSelected="updateActionsSelected">
-               </check-social-action>
-            </template>
+             <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"
+                     @updateSelected="updateActionsSelected">
+                 </check-social-action>
+             </template>

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


@@ -94,10 +94,6 @@ export default {
         issueIsLoading: false,
         actionIsLoading: false,
         actionAreLoaded: false,
-         socialIssuesClassList:
-            `col-form-label ${document.querySelector('input#chill_activitybundle_activity_socialIssues').getAttribute('required') ? 'required' : ''}`,
-         socialActionsClassList:
-            `col-form-label ${document.querySelector('input#chill_activitybundle_activity_socialActions').getAttribute('required') ? 'required' : ''}`,
      }
   },
   computed: {
@@ -111,7 +107,7 @@ export default {
         return this.$store.state.socialIssuesOther;
      },
      socialActionsList() {
-         return this.$store.getters.socialActionsListSorted;
+         return this.$store.state.socialActionsList;
      },
      socialActionsSelected() {
         return this.$store.state.activity.socialActions;
--- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/i18n.js
+++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/i18n.js
@@ -1,5 +1,4 @@
 import { personMessages } from 'ChillPersonAssets/vuejs/_js/i18n'
-import { multiSelectMessages } from 'ChillMainAssets/vuejs/_js/i18n'

 const activityMessages = {
   fr: {
@@ -34,11 +33,12 @@ const activityMessages = {
          },
          create_address: 'Créer une adresse',
          edit_address: "Modifier l'adresse"
+
      }
   }
 }

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

 export {
   activityMessages
--- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/index.js
+++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/index.js
@@ -2,25 +2,17 @@ import { createApp } from 'vue';
 import { _createI18n } from 'ChillMainAssets/vuejs/_js/i18n'
 import { activityMessages } from './i18n'
 import store from './store'
-import PickTemplate from 'ChillDocGeneratorAssets/vuejs/_components/PickTemplate.vue';
-import {fetchTemplates} from 'ChillDocGeneratorAssets/api/pickTemplate.js';

 import App from './App.vue';

 const i18n = _createI18n(activityMessages);

-// app for activity
-
 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
-       :hasSocialIssues="hasSocialIssues"
-       :hasLocation="hasLocation"
-       :hasPerson="hasPerson"
-    ></app>`,
+   template: `<app :hasSocialIssues="hasSocialIssues", :hasLocation="hasLocation", :hasPerson="hasPerson"></app>`,
    data() {
       return {
           hasSocialIssues,
@@ -33,54 +25,3 @@ const app = createApp({
 .use(i18n)
 .component('app', App)
 .mount('#activity');
-
-
-// app for picking template
-
-const i18nGendoc = _createI18n({});
-
-document.querySelectorAll('div[data-docgen-template-picker]').forEach(el => {
-    fetchTemplates(el.dataset.entityClass).then(templates => {
-        const picker = {
-            template:
-                '<pick-template :templates="this.templates" :preventDefaultMoveToGenerate="true" ' +
-                    ':entityClass="faked" @go-to-generate-document="generateDoc"></pick-template>',
-            components: {
-                PickTemplate,
-            },
-            data() {
-                return {
-                    templates: templates,
-                    entityId: el.dataset.entityId,
-                }
-            },
-            methods: {
-                generateDoc({event, link, template}) {
-                    console.log('generateDoc');
-                    console.log('link', link);
-                    console.log('template', template);
-
-                    let hiddenInput = document.querySelector("input[data-template-id]");
-
-                    if (hiddenInput === null) {
-                        console.error('hidden input not found');
-                        return;
-                    }
-
-                    hiddenInput.value = template;
-
-                    let form = document.querySelector('form[name="chill_activitybundle_activity"');
-
-                    if (form === null) {
-                        console.error('form not found');
-                        return;
-                    }
-
-                    form.submit();
-                }
-            }
-        };
-        createApp(picker).use(i18nGendoc).mount(el);
-    })
-
-});
--- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/store.js
+++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/store.js
@@ -1,23 +1,22 @@
 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);

 const addIdToValue = (string, id) => {
-    let array = string ? string.split(',') : [];
-    array.push(id.toString());
-    let str = array.join();
-    return str;
+  let array = string ? string.split(',') : [];
+  array.push(id.toString());
+  let str = array.join();
+  return str;
 };

 const removeIdFromValue = (string, id) => {
-    let array = string.split(',');
-    array = array.filter(el => el !== id.toString());
-    let str = array.join();
-    return str;
+  let array = string.split(',');
+  array = array.filter(el => el !== id.toString());
+  let str = array.join();
+  return str;
 };

 const store = createStore({
@@ -26,7 +25,6 @@ const store = createStore({
        activity: window.activity,
        socialIssuesOther: [],
        socialActionsList: [],
-        availableLocations: [],
    },
    getters: {
        suggestedEntities(state) {
@@ -52,9 +50,9 @@ const store = createStore({
            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));
+                      .filter((p) => p.endDate === null)
+                      .map((p) => p.person)
+                      .filter((p) => !existingPersonIds.includes(p.id));
        },
        suggestedRequestor(state) {
            if (state.activity.accompanyingPeriod.requestor === null) {
@@ -80,8 +78,8 @@ const store = createStore({
            return state.activity.activityType.usersVisible === 0
                ? []
                : [state.activity.accompanyingPeriod.user].filter(
-                    (u) => u !== null && !existingUserIds.includes(u.id)
-                );
+                      (u) => u !== null && !existingUserIds.includes(u.id)
+                  );
        },
        suggestedResources(state) {
            const resources = state.activity.accompanyingPeriod.resources;
@@ -101,9 +99,6 @@ const store = createStore({
                            state.activity.activityType.thirdPartiesVisible !== 0)
                );
        },
-        socialActionsListSorted(state) {
-            return [ ...state.socialActionsList].sort((a, b) => a.ordering - b.ordering);
-        },
    },
    mutations: {
        // SocialIssueAcc
@@ -134,6 +129,7 @@ const store = createStore({
            state.socialActionsList = [];
        },
        addActionInList(state, action) {
+            //console.log('add action list', action.id);
            state.socialActionsList.push(action);
        },
        updateActionsSelected(state, actions) {
@@ -204,9 +200,6 @@ const store = createStore({
            console.log("### mutation: updateLocation", value);
            state.activity.location = value;
        },
-        addAvailableLocationGroup(state, group) {
-            state.availableLocations.push(group);
-        }
    },
    actions: {
        addIssueSelected({ commit }, issue) {
@@ -242,9 +235,6 @@ const store = createStore({
            });
            commit("updateActionsSelected", payload);
        },
-        addAvailableLocationGroup({ commit }, payload) {
-            commit("addAvailableLocationGroup", payload);
-        },
        addPersonsInvolved({ commit }, payload) {
            //console.log('### action addPersonsInvolved', payload.result.type);
            switch (payload.result.type) {
@@ -345,6 +335,4 @@ const store = createStore({
    },
 });

-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
@@ -1,121 +0,0 @@
-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) {
-                let location = group.locations.find((l) => l.id === window.default_location_id);
-                if (location !== undefined & store.state.activity.location === null) {
-                    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
@@ -0,0 +1,56 @@
+<?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);
+
+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 [
+            new Symfony\Bundle\FrameworkBundle\FrameworkBundle(),
+            new Chill\CustomFieldsBundle\ChillCustomFieldsBundle(),
+            new Symfony\Bundle\SecurityBundle\SecurityBundle(),
+            new Symfony\Bundle\TwigBundle\TwigBundle(),
+            new \Symfony\Bundle\AsseticBundle\AsseticBundle(),
+            new Doctrine\Bundle\DoctrineBundle\DoctrineBundle(),
+            new Chill\PersonBundle\ChillPersonBundle(),
+            new Chill\MainBundle\ChillMainBundle(),
+            new Chill\ActivityBundle\ChillActivityBundle(),
+            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)
+        ];
+    }
+
+    public function registerContainerConfiguration(LoaderInterface $loader)
+    {
+        $loader->load($this->getRootDir() . '/config/config_' . $this->getEnvironment() . '.yml');
+    }
+}
--- a/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/DoctrineMigrations/.gitignore
+++ b/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/DoctrineMigrations/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore
--- a/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/autoload.php
+++ b/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/autoload.php
@@ -0,0 +1,20 @@
+<?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);
+
+use Composer\Autoload\ClassLoader;
+use Doctrine\Common\Annotations\AnnotationRegistry;
+
+/** @var ClassLoader $loader */
+$loader = require __DIR__ . '/../../../../../vendor/autoload.php';
+
+AnnotationRegistry::registerLoader([$loader, 'loadClass']);
+
+return $loader;
--- a/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/bootstrap.php.cache
+++ b/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/bootstrap.php.cache
--- a/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/cache/dev/appDevDebugProjectContainer.php
+++ b/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/cache/dev/appDevDebugProjectContainer.php
--- a/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/cache/dev/appDevDebugProjectContainer.php.meta
+++ b/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/cache/dev/appDevDebugProjectContainer.php.meta
--- a/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/cache/dev/appDevDebugProjectContainer.xml
+++ b/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/cache/dev/appDevDebugProjectContainer.xml
--- a/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/cache/dev/appDevDebugProjectContainerCompiler.log
+++ b/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/cache/dev/appDevDebugProjectContainerCompiler.log
@@ -0,0 +1,438 @@
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "assets._default_package" (parent: assets.path_package).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "security.user.provider.concrete.chain_provider" (parent: security.user.provider.chain).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "security.user.provider.concrete.in_memory" (parent: security.user.provider.in_memory).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "security.user.provider.concrete.in_memory_admin" (parent: security.user.provider.in_memory.user).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "security.user.provider.concrete.users" (parent: doctrine.orm.security.user.provider).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "security.firewall.map.context.dev" (parent: security.firewall.context).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "security.context_listener.0" (parent: security.context_listener).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "security.logout_listener.default" (parent: security.logout_listener).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "security.logout.success_handler.default" (parent: security.logout.success_handler).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "security.authentication.provider.dao.default" (parent: security.authentication.provider.dao).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "security.authentication.success_handler.default.form_login" (parent: security.authentication.success_handler).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "security.authentication.failure_handler.default.form_login" (parent: security.authentication.failure_handler).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "security.authentication.listener.form" (parent: security.authentication.listener.abstract).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "security.authentication.listener.form.default" (parent: security.authentication.listener.form).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "security.authentication.form_entry_point.default" (parent: security.authentication.form_entry_point).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "security.authentication.listener.anonymous.default" (parent: security.authentication.listener.anonymous).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "security.authentication.provider.anonymous.default" (parent: security.authentication.provider.anonymous).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "security.exception_listener.default" (parent: security.exception_listener).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "security.firewall.map.context.default" (parent: security.firewall.context).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "monolog.logger" (parent: monolog.logger_prototype).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "swiftmailer.mailer.default.transport.eventdispatcher" (parent: swiftmailer.transport.eventdispatcher.abstract).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "swiftmailer.mailer.default.transport.authhandler" (parent: swiftmailer.transport.authhandler.abstract).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "swiftmailer.mailer.default.transport.buffer" (parent: swiftmailer.transport.buffer.abstract).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "swiftmailer.mailer.default.transport.smtp" (parent: swiftmailer.transport.smtp.abstract).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "swiftmailer.mailer.default" (parent: swiftmailer.mailer.abstract).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "swiftmailer.mailer.default.plugin.messagelogger" (parent: swiftmailer.plugin.messagelogger.abstract).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "doctrine.dbal.default_connection.configuration" (parent: doctrine.dbal.connection.configuration).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "doctrine.dbal.logger.profiling.default" (parent: doctrine.dbal.logger.profiling).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "doctrine.dbal.logger.chain.default" (parent: doctrine.dbal.logger.chain).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "doctrine.dbal.default_connection.event_manager" (parent: doctrine.dbal.connection.event_manager).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "doctrine.dbal.default_connection" (parent: doctrine.dbal.connection).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "doctrine.orm.default_configuration" (parent: doctrine.orm.configuration).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "doctrine_cache.providers.doctrine.orm.default_metadata_cache" (parent: doctrine_cache.abstract.array).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "doctrine_cache.providers.doctrine.orm.default_result_cache" (parent: doctrine_cache.abstract.array).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "doctrine_cache.providers.doctrine.orm.default_query_cache" (parent: doctrine_cache.abstract.array).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "doctrine.orm.default_manager_configurator" (parent: doctrine.orm.manager_configurator.abstract).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "doctrine.orm.default_entity_manager" (parent: doctrine.orm.entity_manager.abstract).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "monolog.logger.request" (parent: monolog.logger_prototype).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "monolog.logger.translation" (parent: monolog.logger_prototype).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "monolog.logger.security" (parent: monolog.logger_prototype).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "monolog.logger.templating" (parent: monolog.logger_prototype).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "monolog.logger.profiler" (parent: monolog.logger_prototype).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "monolog.logger.router" (parent: monolog.logger_prototype).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "monolog.logger.php" (parent: monolog.logger_prototype).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "monolog.logger.event" (parent: monolog.logger_prototype).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "monolog.logger.assetic" (parent: monolog.logger_prototype).
+Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass: Resolving inheritance for "monolog.logger.doctrine" (parent: monolog.logger_prototype).
+Symfony\Component\DependencyInjection\Compiler\RemovePrivateAliasesPass: Removed service "validator.mapping.class_metadata_factory"; reason: private alias
+Symfony\Component\DependencyInjection\Compiler\RemovePrivateAliasesPass: Removed service "assetic.value_supplier"; reason: private alias
+Symfony\Component\DependencyInjection\Compiler\RemovePrivateAliasesPass: Removed service "doctrine.dbal.event_manager"; reason: private alias
+Symfony\Component\DependencyInjection\Compiler\RemovePrivateAliasesPass: Removed service "doctrine.orm.metadata.annotation_reader"; reason: private alias
+Symfony\Component\DependencyInjection\Compiler\RemovePrivateAliasesPass: Removed service "doctrine.orm.default_entity_manager.event_manager"; reason: private alias
+Symfony\Component\DependencyInjection\Compiler\RemovePrivateAliasesPass: Removed service "sensio_framework_extra.security.expression_language"; reason: private alias
+Symfony\Component\DependencyInjection\Compiler\RemovePrivateAliasesPass: Removed service "translator.logging.inner"; reason: private alias
+Symfony\Component\DependencyInjection\Compiler\RemovePrivateAliasesPass: Removed service "translator.data_collector.inner"; reason: private alias
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "assets.path_package"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "assets.url_package"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "assets.static_version_strategy"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.firewall.context"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.user.provider.in_memory"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.user.provider.in_memory.user"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.user.provider.chain"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.logout_listener"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.logout.handler.cookie_clearing"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.logout.success_handler"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.authentication.form_entry_point"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.authentication.listener.abstract"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.authentication.custom_success_handler"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.authentication.success_handler"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.authentication.custom_failure_handler"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.authentication.failure_handler"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.authentication.listener.form"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.authentication.listener.simple_form"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.authentication.simple_success_failure_handler"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.authentication.listener.simple_preauth"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.authentication.listener.x509"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.authentication.listener.remote_user"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.authentication.listener.basic"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.authentication.listener.digest"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.authentication.provider.dao"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.authentication.provider.simple"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.authentication.provider.pre_authenticated"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.exception_listener"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.authentication.switchuser_listener"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.authentication.listener.rememberme"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.authentication.provider.rememberme"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.authentication.rememberme.services.abstract"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.authentication.rememberme.services.persistent"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "security.authentication.rememberme.services.simplehash"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "monolog.logger_prototype"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "swiftmailer.mailer.abstract"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "swiftmailer.transport.sendmail.abstract"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "swiftmailer.transport.mail.abstract"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "swiftmailer.transport.null.abstract"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "swiftmailer.transport.buffer.abstract"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "swiftmailer.transport.authhandler.abstract"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "swiftmailer.transport.eventdispatcher.abstract"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "swiftmailer.plugin.redirecting.abstract"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "swiftmailer.plugin.antiflood.abstract"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "swiftmailer.plugin.impersonate.abstract"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "swiftmailer.plugin.messagelogger.abstract"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "swiftmailer.transport.smtp.abstract"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "swiftmailer.transport.spool.abstract"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "swiftmailer.spool.file.abstract"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "swiftmailer.spool.memory.abstract"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "assetic.worker.ensure_filter"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "doctrine_cache.abstract.apc"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "doctrine_cache.abstract.array"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "doctrine_cache.abstract.file_system"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "doctrine_cache.abstract.php_file"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "doctrine_cache.abstract.memcache"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "doctrine_cache.abstract.memcached"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "doctrine_cache.abstract.redis"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "doctrine_cache.abstract.wincache"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "doctrine_cache.abstract.xcache"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "doctrine_cache.abstract.zenddata"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "doctrine_cache.abstract.mongodb"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "doctrine_cache.abstract.riak"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "doctrine_cache.abstract.couchbase"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "doctrine.dbal.logger.chain"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "doctrine.dbal.logger.profiling"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "doctrine.dbal.connection"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "doctrine.dbal.connection.event_manager"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "doctrine.dbal.connection.configuration"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "doctrine.orm.configuration"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "doctrine.orm.entity_manager.abstract"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "doctrine.orm.manager_configurator.abstract"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\RemoveAbstractDefinitionsPass: Removed service "doctrine.orm.security.user.provider"; reason: abstract
+Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "session" previously pointing to "session.storage.mock_file" to "session.storage.filesystem".
+Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "session.storage.native" previously pointing to "session.handler.native_file" to "session.handler".
+Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "session.storage.php_bridge" previously pointing to "session.handler.native_file" to "session.handler".
+Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "assetic.twig_directory_resource.kernel" previously pointing to "templating.loader.filesystem" to "templating.loader".
+Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "chill.custom_field.text" previously pointing to "templating.engine.twig" to "templating".
+Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "chill.custom_field.choice" previously pointing to "templating.engine.twig" to "templating".
+Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "chill.custom_field.title" previously pointing to "templating.engine.twig" to "templating".
+Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "translator_listener" previously pointing to "translator.data_collector" to "translator".
+Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "validator.builder" previously pointing to "translator.data_collector" to "translator".
+Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "data_collector.translation" previously pointing to "translator.data_collector" to "translator".
+Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "twig.extension.trans" previously pointing to "translator.data_collector" to "translator".
+Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "chill.custom_field.custom_fields_group_type" previously pointing to "translator.data_collector" to "translator".
+Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "locale_listener" previously pointing to "router.default" to "router".
+Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "templating.helper.router" previously pointing to "router.default" to "router".
+Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "router.cache_warmer" previously pointing to "router.default" to "router".
+Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "router_listener" previously pointing to "router.default" to "router".
+Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "security.logout_url_generator" previously pointing to "router.default" to "router".
+Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "security.http_utils" previously pointing to "router.default" to "router".
+Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "security.http_utils" previously pointing to "router.default" to "router".
+Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "twig.extension.routing" previously pointing to "router.default" to "router".
+Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "web_profiler.controller.profiler" previously pointing to "router.default" to "router".
+Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "web_profiler.controller.router" previously pointing to "router.default" to "router".
+Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "sensio_framework_extra.controller.listener" previously pointing to "annotations.file_cache_reader" to "annotation_reader".
+Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "sensio_framework_extra.routing.loader.annot_class" previously pointing to "annotations.file_cache_reader" to "annotation_reader".
+Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "security.user_password_encoder.generic" previously pointing to "security.encoder_factory.generic" to "security.encoder_factory".
+Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "security.validator.user_password" previously pointing to "security.encoder_factory.generic" to "security.encoder_factory".
+Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "security.authentication.provider.dao.default" previously pointing to "security.encoder_factory.generic" to "security.encoder_factory".
+Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "twig" previously pointing to "twig.loader.filesystem" to "twig.loader".
+Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "swiftmailer.email_sender.listener" previously pointing to "monolog.logger" to "logger".
+Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass: Changed reference of service "swiftmailer.mailer.default" previously pointing to "swiftmailer.mailer.default.transport.smtp" to "swiftmailer.mailer.default.transport".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "templating.cache_warmer.template_paths" to "cache_warmer".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "assetic.asset_manager_cache_warmer" to "cache_warmer".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "translation.warmer" to "cache_warmer".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "router.cache_warmer" to "cache_warmer".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "doctrine.orm.proxy_cache_warmer" to "cache_warmer".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "translator.selector" to "translator.default".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "test.client.history" to "test.client".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "test.client.cookiejar" to "test.client".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "session.attribute_bag" to "session".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "session.flash_bag" to "session".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "16f9ce82abe2adc8b44c9c8d29afbc93d322e7fad5e23fae42fb16c689658c58_1" to "form.resolved_type_factory".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "form.extension" to "form.registry".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "form.type_extension.form.request_handler" to "form.type_extension.form.http_foundation".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "form.server_params" to "form.type_extension.form.request_handler".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.csrf.token_generator" to "security.csrf.token_manager".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.csrf.token_storage" to "security.csrf.token_manager".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "assets._default_package" to "assets.packages".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "validator.validator_factory" to "validator.builder".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "profiler.storage" to "profiler".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "data_collector.config" to "profiler".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "data_collector.ajax" to "profiler".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "data_collector.exception" to "profiler".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "data_collector.events" to "profiler".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "data_collector.logger" to "profiler".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "data_collector.time" to "profiler".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "data_collector.memory" to "profiler".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "data_collector.twig" to "profiler".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "data_collector.security" to "profiler".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "swiftmailer.data_collector" to "profiler".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "data_collector.doctrine" to "profiler".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "routing.loader.xml" to "routing.resolver".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "routing.loader.yml" to "routing.resolver".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "routing.loader.php" to "routing.resolver".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "sensio_framework_extra.routing.loader.annot_dir" to "routing.resolver".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "sensio_framework_extra.routing.loader.annot_file" to "routing.resolver".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "routing.resolver" to "routing.loader".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "debug.event_dispatcher.parent" to "debug.event_dispatcher".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "controller_resolver" to "debug.controller_resolver".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.authentication.provider.dao.default" to "security.authentication.manager".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.authentication.provider.anonymous.default" to "security.authentication.manager".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.access.expression_voter" to "security.access.decision_manager".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.access.role_hierarchy_voter" to "security.access.decision_manager".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.access.authenticated_voter" to "security.access.decision_manager".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.expression_language" to "security.access.expression_voter".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.firewall.map" to "security.firewall".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.request_matcher.5314eeb91110adf24b9b678372bb11bbe00e8858c519c088bfb65f525181ad3bf573fd1d" to "security.firewall.map".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.authentication.retry_entry_point" to "security.channel_listener".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.user.provider.concrete.in_memory_admin" to "security.user.provider.concrete.in_memory".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.logout.success_handler.default" to "security.logout_listener.default".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.logout.handler.session" to "security.logout_listener.default".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.user_checker" to "security.authentication.provider.dao.default".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.authentication.session_strategy" to "security.authentication.listener.form.default".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.authentication.success_handler.default.form_login" to "security.authentication.listener.form.default".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.authentication.failure_handler.default.form_login" to "security.authentication.listener.form.default".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.authentication.form_entry_point.default" to "security.exception_listener.default".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.channel_listener" to "security.firewall.map.context.default".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.context_listener.0" to "security.firewall.map.context.default".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.logout_listener.default" to "security.firewall.map.context.default".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.authentication.listener.form.default" to "security.firewall.map.context.default".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.authentication.listener.anonymous.default" to "security.firewall.map.context.default".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.access_listener" to "security.firewall.map.context.default".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.exception_listener.default" to "security.firewall.map.context.default".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "twig.extension.logout_url" to "twig".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "twig.extension.security" to "twig".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "twig.extension.profiler" to "twig".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "twig.extension.trans" to "twig".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "twig.extension.assets" to "twig".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "twig.extension.actions" to "twig".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "twig.extension.code" to "twig".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "twig.extension.routing" to "twig".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "twig.extension.yaml" to "twig".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "twig.extension.debug.stopwatch" to "twig".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "twig.extension.expression" to "twig".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "twig.extension.httpkernel" to "twig".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "twig.extension.form" to "twig".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "twig.extension.debug" to "twig".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "assetic.twig_extension" to "twig".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "doctrine.twig.doctrine_extension" to "twig".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "twig.extension.dump" to "twig".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "twig.extension.webprofiler" to "twig".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "twig.app_variable" to "twig".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "twig.configurator.environment" to "twig".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "twig.form.renderer" to "twig.extension.form".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "twig.form.engine" to "twig.form.renderer".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "0ae0165e1c986a63ecc244514317fc4860d8c97fd0529833a00cfb95d75a4d92_1" to "swiftmailer.mailer.default.transport.authhandler".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "0ae0165e1c986a63ecc244514317fc4860d8c97fd0529833a00cfb95d75a4d92_2" to "swiftmailer.mailer.default.transport.authhandler".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "0ae0165e1c986a63ecc244514317fc4860d8c97fd0529833a00cfb95d75a4d92_3" to "swiftmailer.mailer.default.transport.authhandler".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "swiftmailer.transport.replacementfactory" to "swiftmailer.mailer.default.transport.buffer".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "assetic.twig_formula_loader" to "assetic.asset_manager".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "assetic.twig_directory_resource.chillpersonbundle" to "assetic.asset_manager".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "assetic.twig_directory_resource.chillmainbundle" to "assetic.asset_manager".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "assetic.twig_directory_resource.kernel" to "assetic.asset_manager".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "assetic.parameter_bag" to "assetic.asset_factory".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "assetic.value_supplier.default" to "assetic.twig_extension".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "assetic.twig_formula_loader.real" to "assetic.twig_formula_loader".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "assetic.config_cache" to "assetic.twig_formula_loader".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "doctrine.dbal.logger.chain.default" to "doctrine.dbal.default_connection.configuration".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "doctrine.dbal.logger" to "doctrine.dbal.logger.chain.default".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "doctrine.dbal.default_connection.configuration" to "doctrine.dbal.default_connection".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "doctrine.dbal.default_connection.event_manager" to "doctrine.dbal.default_connection".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "doctrine.orm.default_metadata_driver" to "doctrine.orm.default_configuration".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "doctrine.orm.naming_strategy.default" to "doctrine.orm.default_configuration".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "doctrine.orm.quote_strategy.default" to "doctrine.orm.default_configuration".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "doctrine.orm.default_yml_metadata_driver" to "doctrine.orm.default_metadata_driver".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "doctrine.orm.default_yml_metadata_driver" to "doctrine.orm.default_metadata_driver".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "doctrine.orm.default_yml_metadata_driver" to "doctrine.orm.default_metadata_driver".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "doctrine.orm.default_yml_metadata_driver" to "doctrine.orm.default_metadata_driver".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "doctrine.orm.default_configuration" to "doctrine.orm.default_entity_manager".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "sensio_framework_extra.security.expression_language.default" to "sensio_framework_extra.security.listener".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "sensio_distribution.webconfigurator.doctrine_step" to "sensio_distribution.webconfigurator".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "sensio_distribution.webconfigurator.secret_step" to "sensio_distribution.webconfigurator".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "translator.logging" to "translator".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "swiftmailer.mailer.default.transport.buffer" to "swiftmailer.mailer.default.transport".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "swiftmailer.mailer.default.transport.authhandler" to "swiftmailer.mailer.default.transport".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "swiftmailer.mailer.default.transport.eventdispatcher" to "swiftmailer.mailer.default.transport".
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "controller_resolver"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "translator.logging"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "translator.selector"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "translation.warmer"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "session.flash_bag"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "session.attribute_bag"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "session.handler.write_check"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "form.extension"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "form.type_extension.form.request_handler"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "form.server_params"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.csrf.token_generator"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.csrf.token_storage"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "assets.empty_package"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "assets._default_package"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "templating.engine.delegating"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "templating.cache_warmer.template_paths"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "templating.loader.cache"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "templating.loader.chain"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "validator.mapping.cache.apc"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "validator.validator_factory"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "profiler.storage"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "data_collector.config"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "data_collector.ajax"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "data_collector.exception"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "data_collector.events"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "data_collector.logger"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "data_collector.time"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "data_collector.memory"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "16f9ce82abe2adc8b44c9c8d29afbc93d322e7fad5e23fae42fb16c689658c58_1"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "routing.resolver"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "routing.loader.xml"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "routing.loader.yml"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "routing.loader.php"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "router.cache_warmer"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "annotations.cached_reader"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "debug.event_dispatcher.parent"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.authentication.session_strategy"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.user_checker"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.expression_language"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.access.authenticated_voter"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.access.role_hierarchy_voter"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.access.expression_voter"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.firewall.map"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.authentication.listener.anonymous"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.authentication.provider.anonymous"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.authentication.retry_entry_point"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.authentication.basic_entry_point"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.authentication.digest_entry_point"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.channel_listener"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.context_listener"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.logout.handler.session"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.access_listener"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.rememberme.token.provider.in_memory"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "twig.extension.logout_url"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "twig.extension.security"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "data_collector.security"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.user.provider.concrete.in_memory_admin"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.request_matcher.5314eeb91110adf24b9b678372bb11bbe00e8858c519c088bfb65f525181ad3bf573fd1d"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.context_listener.0"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.logout_listener.default"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.logout.success_handler.default"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.authentication.provider.dao.default"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.authentication.success_handler.default.form_login"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.authentication.failure_handler.default.form_login"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.authentication.listener.form.default"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.authentication.form_entry_point.default"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.authentication.listener.anonymous.default"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.authentication.provider.anonymous.default"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.exception_listener.default"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "twig.app_variable"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "twig.cache_warmer"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "twig.loader.native_filesystem"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "twig.loader.chain"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "twig.extension.profiler"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "data_collector.twig"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "twig.extension.trans"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "twig.extension.assets"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "twig.extension.actions"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "twig.extension.code"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "twig.extension.routing"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "twig.extension.yaml"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "twig.extension.debug.stopwatch"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "twig.extension.expression"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "twig.extension.httpkernel"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "twig.extension.form"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "twig.extension.debug"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "twig.form.engine"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "twig.form.renderer"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "twig.configurator.environment"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "monolog.formatter.chrome_php"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "monolog.formatter.gelf_message"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "monolog.formatter.html"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "monolog.formatter.json"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "monolog.formatter.line"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "monolog.formatter.loggly"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "monolog.formatter.normalizer"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "monolog.formatter.scalar"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "monolog.formatter.wildfire"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "0ae0165e1c986a63ecc244514317fc4860d8c97fd0529833a00cfb95d75a4d92_3"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "0ae0165e1c986a63ecc244514317fc4860d8c97fd0529833a00cfb95d75a4d92_2"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "0ae0165e1c986a63ecc244514317fc4860d8c97fd0529833a00cfb95d75a4d92_1"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "swiftmailer.transport.failover"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "swiftmailer.transport.mailinvoker"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "swiftmailer.transport.replacementfactory"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "swiftmailer.data_collector"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "swiftmailer.mailer.default.transport.eventdispatcher"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "swiftmailer.mailer.default.transport.authhandler"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "swiftmailer.mailer.default.transport.buffer"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "assetic.config_cache"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "assetic.asset_manager_cache_warmer"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "assetic.worker.cache_busting"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "assetic.parameter_bag"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "assetic.value_supplier.default"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "assetic.twig_extension"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "assetic.twig_formula_loader"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "assetic.twig_formula_loader.real"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "doctrine.dbal.logger"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "data_collector.doctrine"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "doctrine.twig.doctrine_extension"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "doctrine.dbal.default_connection.configuration"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "doctrine.dbal.logger.chain.default"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "doctrine.dbal.default_connection.event_manager"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "doctrine.orm.proxy_cache_warmer"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "doctrine.orm.listeners.resolve_target_entity"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "doctrine.orm.naming_strategy.default"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "doctrine.orm.naming_strategy.underscore"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "doctrine.orm.quote_strategy.default"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "doctrine.orm.quote_strategy.ansi"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "doctrine.orm.default_configuration"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "doctrine.orm.default_yml_metadata_driver"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "doctrine.orm.default_metadata_driver"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "sensio_framework_extra.routing.loader.annot_dir"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "sensio_framework_extra.routing.loader.annot_file"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "sensio_framework_extra.security.expression_language.default"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "twig.extension.dump"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "twig.extension.webprofiler"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "sensio_distribution.webconfigurator.doctrine_step"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "sensio_distribution.webconfigurator.secret_step"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "assetic.twig_directory_resource.chillpersonbundle"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "assetic.twig_directory_resource.chillmainbundle"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "assetic.twig_directory_resource.kernel"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "templating.finder" to "cache_warmer".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "assets.empty_version_strategy" to "assets.packages".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "sensio_framework_extra.routing.loader.annot_class" to "routing.loader".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "sensio_framework_extra.routing.loader.annot_class" to "routing.loader".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "sensio_framework_extra.routing.loader.annot_class" to "routing.loader".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.access_map" to "security.firewall.map.context.default".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.http_utils" to "security.firewall.map.context.default".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.http_utils" to "security.firewall.map.context.default".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.http_utils" to "security.firewall.map.context.default".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.http_utils" to "security.firewall.map.context.default".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.http_utils" to "security.firewall.map.context.default".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.access_map" to "security.firewall.map.context.default".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.http_utils" to "security.firewall.map.context.default".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "security.http_utils" to "security.firewall.map.context.default".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "twig.extension.httpfoundation" to "twig".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "twig.extension.httpfoundation" to "twig".
+Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass: Inlined service "annotations.reader" to "annotation_reader".
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "assets.empty_version_strategy"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "templating.finder"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "annotations.reader"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.http_utils"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "security.access_map"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "twig.extension.httpfoundation"; reason: unused
+Symfony\Component\DependencyInjection\Compiler\RemoveUnusedDefinitionsPass: Removed service "sensio_framework_extra.routing.loader.annot_class"; reason: unused
--- a/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/cache/dev/classes.map
+++ b/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/cache/dev/classes.map
@@ -0,0 +1,88 @@
+<?php return array (
+  0 => 'Symfony\\Bundle\\FrameworkBundle\\EventListener\\SessionListener',
+  1 => 'Symfony\\Component\\HttpFoundation\\Session\\Storage\\NativeSessionStorage',
+  2 => 'Symfony\\Component\\HttpFoundation\\Session\\Storage\\PhpBridgeSessionStorage',
+  3 => 'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\NativeFileSessionHandler',
+  4 => 'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Proxy\\AbstractProxy',
+  5 => 'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Proxy\\SessionHandlerProxy',
+  6 => 'Symfony\\Component\\HttpFoundation\\Session\\Session',
+  7 => 'Symfony\\Bundle\\FrameworkBundle\\Templating\\GlobalVariables',
+  8 => 'Symfony\\Bundle\\FrameworkBundle\\Templating\\TemplateReference',
+  9 => 'Symfony\\Bundle\\FrameworkBundle\\Templating\\TemplateNameParser',
+  10 => 'Symfony\\Bundle\\FrameworkBundle\\Templating\\Loader\\TemplateLocator',
+  11 => 'Symfony\\Component\\Routing\\Generator\\UrlGenerator',
+  12 => 'Symfony\\Component\\Routing\\RequestContext',
+  13 => 'Symfony\\Component\\Routing\\Router',
+  14 => 'Symfony\\Bundle\\FrameworkBundle\\Routing\\RedirectableUrlMatcher',
+  15 => 'Symfony\\Bundle\\FrameworkBundle\\Routing\\Router',
+  16 => 'Symfony\\Component\\Config\\FileLocator',
+  17 => 'Symfony\\Component\\Debug\\ErrorHandler',
+  18 => 'Symfony\\Component\\EventDispatcher\\Event',
+  19 => 'Symfony\\Component\\EventDispatcher\\ContainerAwareEventDispatcher',
+  20 => 'Symfony\\Component\\HttpKernel\\EventListener\\ResponseListener',
+  21 => 'Symfony\\Component\\HttpKernel\\EventListener\\RouterListener',
+  22 => 'Symfony\\Component\\HttpKernel\\Controller\\ControllerResolver',
+  23 => 'Symfony\\Component\\HttpKernel\\Event\\KernelEvent',
+  24 => 'Symfony\\Component\\HttpKernel\\Event\\FilterControllerEvent',
+  25 => 'Symfony\\Component\\HttpKernel\\Event\\FilterResponseEvent',
+  26 => 'Symfony\\Component\\HttpKernel\\Event\\GetResponseEvent',
+  27 => 'Symfony\\Component\\HttpKernel\\Event\\GetResponseForControllerResultEvent',
+  28 => 'Symfony\\Component\\HttpKernel\\Event\\GetResponseForExceptionEvent',
+  29 => 'Symfony\\Component\\HttpKernel\\KernelEvents',
+  30 => 'Symfony\\Component\\HttpKernel\\Config\\FileLocator',
+  31 => 'Symfony\\Bundle\\FrameworkBundle\\Controller\\ControllerNameParser',
+  32 => 'Symfony\\Bundle\\FrameworkBundle\\Controller\\ControllerResolver',
+  33 => 'Symfony\\Component\\Security\\Http\\Firewall',
+  34 => 'Symfony\\Component\\Security\\Core\\User\\UserProviderInterface',
+  35 => 'Symfony\\Component\\Security\\Core\\Authentication\\AuthenticationProviderManager',
+  36 => 'Symfony\\Component\\Security\\Core\\Authentication\\Token\\Storage\\TokenStorage',
+  37 => 'Symfony\\Component\\Security\\Core\\Authorization\\AccessDecisionManager',
+  38 => 'Symfony\\Component\\Security\\Core\\Authorization\\AuthorizationChecker',
+  39 => 'Symfony\\Component\\Security\\Core\\Authorization\\Voter\\VoterInterface',
+  40 => 'Symfony\\Bundle\\SecurityBundle\\Security\\FirewallMap',
+  41 => 'Symfony\\Bundle\\SecurityBundle\\Security\\FirewallContext',
+  42 => 'Symfony\\Component\\HttpFoundation\\RequestMatcher',
+  43 => 'Twig_Environment',
+  44 => 'Twig_Extension',
+  45 => 'Twig_Extension_Core',
+  46 => 'Twig_Extension_Escaper',
+  47 => 'Twig_Extension_Optimizer',
+  48 => 'Twig_LoaderInterface',
+  49 => 'Twig_Markup',
+  50 => 'Twig_Template',
+  51 => 'Monolog\\Formatter\\FormatterInterface',
+  52 => 'Monolog\\Formatter\\LineFormatter',
+  53 => 'Monolog\\Handler\\HandlerInterface',
+  54 => 'Monolog\\Handler\\AbstractHandler',
+  55 => 'Monolog\\Handler\\AbstractProcessingHandler',
+  56 => 'Monolog\\Handler\\StreamHandler',
+  57 => 'Monolog\\Handler\\FingersCrossedHandler',
+  58 => 'Monolog\\Handler\\FilterHandler',
+  59 => 'Monolog\\Handler\\TestHandler',
+  60 => 'Monolog\\Logger',
+  61 => 'Symfony\\Bridge\\Monolog\\Logger',
+  62 => 'Symfony\\Bridge\\Monolog\\Handler\\DebugHandler',
+  63 => 'Monolog\\Handler\\FingersCrossed\\ActivationStrategyInterface',
+  64 => 'Monolog\\Handler\\FingersCrossed\\ErrorLevelActivationStrategy',
+  65 => 'Symfony\\Bundle\\AsseticBundle\\DefaultValueSupplier',
+  66 => 'Symfony\\Bundle\\AsseticBundle\\Factory\\AssetFactory',
+  67 => 'Doctrine\\Common\\Annotations\\DocLexer',
+  68 => 'Doctrine\\Common\\Annotations\\FileCacheReader',
+  69 => 'Doctrine\\Common\\Annotations\\PhpParser',
+  70 => 'Doctrine\\Common\\Annotations\\Reader',
+  71 => 'Doctrine\\Common\\Lexer',
+  72 => 'Doctrine\\Common\\Persistence\\ConnectionRegistry',
+  73 => 'Doctrine\\Common\\Persistence\\Proxy',
+  74 => 'Doctrine\\Common\\Util\\ClassUtils',
+  75 => 'Doctrine\\Bundle\\DoctrineBundle\\Registry',
+  76 => 'Sensio\\Bundle\\FrameworkExtraBundle\\EventListener\\ControllerListener',
+  77 => 'Sensio\\Bundle\\FrameworkExtraBundle\\EventListener\\ParamConverterListener',
+  78 => 'Sensio\\Bundle\\FrameworkExtraBundle\\Request\\ParamConverter\\DateTimeParamConverter',
+  79 => 'Sensio\\Bundle\\FrameworkExtraBundle\\Request\\ParamConverter\\DoctrineParamConverter',
+  80 => 'Sensio\\Bundle\\FrameworkExtraBundle\\Request\\ParamConverter\\ParamConverterInterface',
+  81 => 'Sensio\\Bundle\\FrameworkExtraBundle\\Request\\ParamConverter\\ParamConverterManager',
+  82 => 'Sensio\\Bundle\\FrameworkExtraBundle\\EventListener\\TemplateListener',
+  83 => 'Sensio\\Bundle\\FrameworkExtraBundle\\EventListener\\HttpCacheListener',
+  84 => 'Sensio\\Bundle\\FrameworkExtraBundle\\EventListener\\SecurityListener',
+  85 => 'Sensio\\Bundle\\FrameworkExtraBundle\\Configuration\\ConfigurationAnnotation',
+);
--- a/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/config/config.yml
+++ b/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/config/config.yml
@@ -0,0 +1,77 @@
+imports:
+    - { resource: parameters.yml }
+
+framework:
+    secret:          Not very secret
+    router:          { resource: "%kernel.root_dir%/config/routing.yml" }
+    form:            true
+    csrf_protection: true
+    session:         ~
+    default_locale:  fr
+    translator:      { fallback: fr }
+    profiler:        { only_exceptions: false }
+    templating:
+        engines: ['twig']
+ 
+doctrine:
+    dbal:
+        driver:   pdo_pgsql
+        host:     "%database_host%"
+        port:     "%database_port%"
+        dbname:   "%database_name%"
+        user:     "%database_user%"
+        password: "%database_password%"
+        charset:  UTF8
+        mapping_types:
+            jsonb: json_array
+    orm:
+        auto_generate_proxy_classes: "%kernel.debug%"
+        auto_mapping: true
+        
+# Assetic Configuration
+assetic:
+    debug:          "%kernel.debug%"
+    use_controller: false
+    bundles:        [ ]
+    #java: /usr/bin/java
+    filters:
+        cssrewrite: ~
+        
+    
+security:
+    providers:
+        chain_provider:
+            chain :
+                providers: [in_memory, users]
+        in_memory:
+            memory:
+                users:
+                    admin: { password: olala, roles: 'ROLE_ADMIN' }
+        users:
+            entity:
+                class: Chill\MainBundle\Entity\User
+                property: username
+
+    encoders: 
+        Chill\MainBundle\Entity\User: 
+            algorithm: bcrypt
+        Symfony\Component\Security\Core\User\User: plaintext
+
+    firewalls:
+        dev:
+            pattern: ^/(_(profiler|wdt)|css|images|js)/
+            security: false
+
+        default:
+            anonymous: ~
+            form_login:
+                csrf_parameter: _csrf_token
+                csrf_token_id: authenticate
+                csrf_provider: form.csrf_provider
+            logout: ~
+            http_basic: 
+    access_control:
+        #disable authentication for tests
+        #- { path: ^/login, roles: IS_AUTHENTICATED_ANONYMOUSLY }
+        #- { path: ^/admin, roles: ROLE_ADMIN }
+        #- { path: ^/, roles: ROLE_USER }
--- a/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/config/config_dev.yml
+++ b/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/config/config_dev.yml
@@ -0,0 +1,7 @@
+imports:
+    - { resource: config.yml } #here we import a config.yml file, this is not required
+
+framework:
+    test: ~
+    session:
+        storage_id: session.storage.filesystem
--- a/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/config/config_test.yml
+++ b/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/config/config_test.yml
@@ -0,0 +1,8 @@
+# config/config_test.yml
+imports:
+    - { resource: config.yml } #here we import a config.yml file, this is not required
+
+framework:
+    test: ~
+    session:
+        storage_id: session.storage.filesystem
--- a/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/config/config_test_customizable_entities_test_not_empty_config.yml
+++ b/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/config/config_test_customizable_entities_test_not_empty_config.yml
@@ -0,0 +1,9 @@
+
+#required by ConfigCustomizablesEntitiesTest::testNotEmptyConfig
+
+imports:
+    - { resource: config_test.yml } 
+
+chill_custom_fields:
+    customizables_entities:
+        - { class: Test\With\A\Dummy\Entity, name: test }
--- a/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/config/parameters.gitlab-ci.yml
+++ b/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/config/parameters.gitlab-ci.yml
@@ -0,0 +1,7 @@
+parameters:
+    database_host: chill__database
+    database_port: 5432
+    database_name: postgres
+    database_user: postgres
+    database_password: postgres
+    locale: fr
--- a/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/config/parameters.travis.yml
+++ b/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/config/parameters.travis.yml
@@ -0,0 +1,7 @@
+parameters:
+    database_host: 127.0.0.1
+    database_port: 5432
+    database_name: test0
+    database_user: postgres
+    database_password: postgres
+    locale: fr
--- a/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/config/parameters.yml.dist
+++ b/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/config/parameters.yml.dist
@@ -0,0 +1,7 @@
+parameters:
+    database_host: 127.0.0.1
+    database_port: 5434
+    database_name: symfony
+    database_user: symfony
+    database_password: symfony
+    locale: fr
--- a/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/config/routing.yml
+++ b/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/config/routing.yml
@@ -0,0 +1,10 @@
+cl_custom_fields:
+    resource: .
+    type: chill_routes
+    
+chill_main:
+    resource: "@ChillMainBundle/Resources/config/routing.yml"
+
+test_custom_field_form_render:
+    path: /customfieldsgroup/test/render/{id}
+    defaults: { _controller: ChillCustomFieldsBundle:CustomFieldsGroup:renderForm }
--- a/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/console
+++ b/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/console
@@ -0,0 +1,28 @@
+#!/usr/bin/env php
+<?php
+
+use Symfony\Bundle\FrameworkBundle\Console\Application;
+use Symfony\Component\Console\Input\ArgvInput;
+use Symfony\Component\Debug\Debug;
+
+// if you don't want to setup permissions the proper way, just uncomment the following PHP line
+// read https://symfony.com/doc/current/setup.html#checking-symfony-application-configuration-and-setup
+// for more information
+//umask(0000);
+
+set_time_limit(0);
+
+/** @var \Composer\Autoload\ClassLoader $loader */
+$loader = require __DIR__.'/autoload.php';
+
+$input = new ArgvInput();
+$env = $input->getParameterOption(array('--env', '-e'), getenv('SYMFONY_ENV') ?: 'dev');
+$debug = getenv('SYMFONY_DEBUG') !== '0' && !$input->hasParameterOption(array('--no-debug', '')) && $env !== 'prod';
+
+if ($debug) {
+    Debug::enable();
+}
+
+$kernel = new AppKernel($env, $debug);
+$application = new Application($kernel);
+$application->run($input);
--- a/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/web/app_dev.php
+++ b/src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/web/app_dev.php
@@ -0,0 +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);
+
+use Symfony\Component\Debug\Debug;
+use Symfony\Component\HttpFoundation\Request;
+
+// If you don't want to setup permissions the proper way, just uncomment the following PHP line
+// read http://symfony.com/doc/current/book/installation.html#configuration-and-setup for more information
+//umask(0000);
+
+// This check prevents access to debug front controllers that are deployed by accident to production servers.
+// Feel free to remove this, extend it, or make something more sophisticated.
+if (isset($_SERVER['HTTP_CLIENT_IP'])
+    || isset($_SERVER['HTTP_X_FORWARDED_FOR'])
+    || !(in_array($_SERVER['REMOTE_ADDR'], ['127.0.0.1', 'fe80::1', '::1'], true) || \PHP_SAPI === 'cli-server')
+) {
+    header('HTTP/1.0 403 Forbidden');
+
+    exit('You are not allowed to access this file. Check ' . basename(__FILE__) . ' for more information.');
+}
+
+$loader = require_once __DIR__ . '/../app/bootstrap.php.cache';
+Debug::enable();
+
+require_once __DIR__ . '/../app/AppKernel.php';
+
+$kernel = new AppKernel('dev', true);
+$kernel->loadClassCache();
+$request = Request::createFromGlobals();
+$response = $kernel->handle($request);
+$response->send();
+$kernel->terminate($request, $response);
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/_list_item.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/_list_item.html.twig
@@ -1,170 +0,0 @@
-{% set t = activity.type %}
-<div class="item-bloc activity-item{% if itemBlocClass is defined %} {{ itemBlocClass }}{% endif %}">
-
-    <div class="item-row">
-        <div class="wrap-list">
-            <div class="wl-row">
-                <div class="wl-col title">
-                    {% if activity.date %}
-                        <p class="date-label">
-                            {{ activity.date|format_date('short') }}
-                        </p>
-                    {% endif %}
-                </div>
-                <div class="wl-col list">
-                    <h2 class="badge-title">
-                        <span class="title_label"></span>
-                        <span class="title_action">
-                            {{ activity.type.name | localize_translatable_string }}
-
-                            {% if activity.emergency %}
-                                <span class="badge bg-danger rounded-pill fs-6 float-end">{{ 'Emergency'|trans|upper }}</span>
-                            {% endif %}
-                        </span>
-                    </h2>
-                </div>
-            </div>
-        </div>
-    </div>
-
-    <div class="item-row column separator">
-        <div class="wrap-list">
-            {% if activity.location and t.locationVisible %}
-                <div class="wl-row">
-                    <div class="wl-col title"><h3>{{ 'location'|trans }}</h3></div>
-                    <div class="wl-col list">
-                        <p class="wl-item">
-                            {{ activity.location.name }}
-                            <span>({{ activity.location.locationType.title|localize_translatable_string }})</span>
-                        </p>
-                    </div>
-                </div>
-            {% endif %}
-
-            {% if activity.attendee and t.attendeeVisible %}
-                <div class="wl-row">
-                    <div class="wl-col title"><h3>{{ 'Attendee'|trans }}</h3></div>
-                    <div class="wl-col list">
-                        <p class="wl-item">
-                            {{ activity.attendee.name|localize_translatable_string }}
-                        </p>
-                    </div>
-                </div>
-            {% endif %}
-
-            {% if activity.sentReceived is not empty and t.sentReceivedVisible %}
-                <div class="wl-row">
-                    <div class="wl-col title"><h3>{{ 'Sent received'|trans }}</h3></div>
-                    <div class="wl-col list">
-                        <p class="wl-item">
-                            {{ activity.sentReceived|capitalize|trans }}
-                        </p>
-                    </div>
-                </div>
-            {% endif %}
-
-            {% if activity.user and t.userVisible %}
-                <div class="wl-row">
-                    <div class="wl-col title"><h3>{{ 'Referrer'|trans }}</h3></div>
-                    <div class="wl-col list">
-                        <p class="wl-item">
-                            {{ activity.user|chill_entity_render_box }}
-                        </p>
-                    </div>
-                </div>
-            {% endif %}
-        </div>
-
-        {% include 'ChillActivityBundle:Activity:concernedGroups.html.twig' with {
-            'context': context,
-            'render': 'wrap-list',
-            'entity': activity,
-            'badge_person': true
-        } %}
-
-        <div class="wrap-list">
-            {%- if activity.reasons is not empty and t.reasonsVisible -%}
-                <div class="wl-row">
-                    <div class="wl-col title">
-                        <h3>{{ 'Reasons'|trans }}</h3>
-                    </div>
-                    <div class="wl-col list">
-                        {% for r in activity.reasons %}
-                            <p class="wl-item reasons">
-                                {{ r|chill_entity_render_box }}
-                            </p>
-                        {% endfor %}
-                    </div>
-                </div>
-            {% endif %}
-
-            {%- if activity.socialIssues is not empty and t.socialIssuesVisible -%}
-                <div class="wl-row">
-                    <div class="wl-col title">
-                        <h3>{{ 'Social issues'|trans }}</h3>
-                    </div>
-                    <div class="wl-col list">
-                        {% for r in activity.socialIssues %}
-                            <p class="wl-item social-issues">
-                                {{ r|chill_entity_render_box }}
-                            </p>
-                        {% endfor %}
-                    </div>
-                </div>
-            {% endif %}
-
-            {%- if activity.socialActions is not empty and t.socialActionsVisible -%}
-                <div class="wl-row">
-                    <div class="wl-col title">
-                        <h3>{{ 'Social actions'|trans }}</h3>
-                    </div>
-                    <div class="wl-col list">
-                        {% for r in activity.socialActions %}
-                            <p class="wl-item social-actions">
-                                {{ r|chill_entity_render_box }}
-                            </p>
-                        {% endfor %}
-                    </div>
-                </div>
-            {% endif %}
-
-            {% if activity.comment.comment is not empty and is_granted('CHILL_ACTIVITY_SEE_DETAILS', activity) %}
-                <div class="wl-row">
-                    <div class="wl-col title">
-                        <h3>{{ 'Comment'|trans }}</h3>
-                    </div>
-                    <div class="wl-col list">
-                        {{ activity.comment|chill_entity_render_box({
-                            'disable_markdown': false,
-                            'limit_lines': 3,
-                            'metadata': false
-                        }) }}
-                    </div>
-                </div>
-            {% endif %}
-
-            {#  Only if ACL SEE_DETAILS AND/OR only on template SHOW ??
-                durationTime
-                travelTime
-                comment
-                documents
-                attendee
-            #}
-        </div>
-    </div>
-
-    <div class="item-row separator">
-        <div class="item-col item-meta">
-            {% set notif_counter = chill_count_notifications('Chill\\ActivityBundle\\Entity\\Activity', activity.id) %}
-            {% if notif_counter.total > 0 %}
-                {{ chill_counter_notifications('Chill\\ActivityBundle\\Entity\\Activity', activity.id) }}
-            {% endif %}
-        </div>
-        <div class="item-col">
-            <ul class="record_actions">
-                {{ recordAction }}
-            </ul>
-        </div>
-    </div>
-
-</div>
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/activity-badge-title.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/activity-badge-title.html.twig
@@ -0,0 +1,110 @@
+<h2 class="badge-title">
+    <span class="title_label">
+
+        {% if activity.date %}
+            <h3>{{ activity.date|format_date('short') }}</h3>
+        {% endif %}
+
+        <div class="duration">
+            {% if activity.durationTime and t.durationTimeVisible %}
+                <p>
+                    <abbr class="fa fa-fw fa-hourglass-end" title="{{ 'Duration Time'|trans }}"></abbr>
+                    {{ activity.durationTime|date('H:i') }}
+                </p>
+            {% endif %}
+
+            {% if activity.travelTime and t.travelTimeVisible %}
+                <p>
+                    <abbr class="fa fa-fw fa-car" title="{{ 'Travel time'|trans }}"></abbr>
+                    {{ activity.travelTime|date('H:i') }}
+                </p>
+            {% endif %}
+        </div>
+
+    </span>
+    <span class="title_action">
+
+        {{ activity.type.name | localize_translatable_string }}
+
+        {% if activity.emergency %}
+            <span class="badge bg-danger rounded-pill fs-6">{{ 'Emergency'|trans|upper }}</span>
+        {% endif %}
+
+        <ul class="small_in_title mt-3">
+
+            {% if activity.sentReceived is not empty and t.sentReceivedVisible %}
+                <li>
+                    <span class="item-key">{{ 'Sent received'|trans ~ ' : ' }}</span>
+                    <b>{{ activity.sentReceived|capitalize|trans }}</b>
+                </li>
+            {% endif %}
+
+            {% if activity.location and t.locationVisible %}
+                <li>
+                    <span class="item-key">{{ 'location'|trans ~ ': ' }}</span>
+                    <b>
+                        <span>{{ activity.location.locationType.title|localize_translatable_string }}</span>
+                        {{ activity.location.name }}
+                    </b>
+                </li>
+            {% endif %}
+
+            {% if activity.user and t.userVisible %}
+                <li>
+                    <span class="item-key">{{ 'Referrer'|trans ~ ': ' }}</span>
+                    <b>{{ activity.user.usernameCanonical }}</b>
+                </li>
+            {% endif %}
+
+            <li class="associated-persons">
+                <span class="item-key">{{ 'Participants'|trans ~ ' : ' }}</span>
+                {% for p in activity.personsAssociated %}
+                    <span class="badge-person">{{ p|chill_entity_render_box }}</span>
+                {% endfor %}
+            </li>
+        </ul>
+
+        <ul class="list-content my-3">
+            {%- if t.reasonsVisible -%}
+                {%- if activity.reasons is not empty -%}
+                    <li class="reasons">
+                        {% for r in activity.reasons %}
+                            {{ r|chill_entity_render_box }}
+                        {% endfor %}
+                    </li>
+                {%- endif -%}
+            {% endif %}
+            {%- if t.socialIssuesVisible %}
+                {%- if activity.socialIssues is not empty -%}
+                    <li class="social-issues">
+                        {% for r in activity.socialIssues %}
+                            {{ r|chill_entity_render_box }}
+                        {% endfor %}
+                    </li>
+                {%- endif -%}
+            {% endif %}
+            {%- if t.socialActionsVisible -%}
+                {%- if activity.socialActions is not empty -%}
+                    <li class="social-actions">
+                        {% for r in activity.socialActions %}
+                            {{ r|chill_entity_render_box }}
+                        {% endfor %}
+                    </li>
+                {%- endif -%}
+            {% endif %}
+        </ul>
+    </span>
+</h2>
+
+{% if context == 'person' and activity.accompanyingPeriod is not empty %}
+    <div class="mt-3">
+        <a class="btn btn-sm btn-outline-primary"
+           title="{{ 'Period number %number%'|trans({'%number%': activity.accompanyingPeriod.id}) }}"
+           href="{{ chill_path_add_return_path(
+               "chill_person_accompanying_course_index",
+               { 'accompanying_period_id': activity.accompanyingPeriod.id }
+           ) }}"><i class="fa fa-random"></i>
+        </a>
+    </div>
+{% endif %}
+
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/concernedGroups.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/concernedGroups.html.twig
@@ -3,16 +3,6 @@
    {{ path(pathname, parms) }}
 {% endmacro %}

-{% macro insert_onthefly(type, entity, parent = null) %}
-    {% include '@ChillMain/OnTheFly/_insert_vue_onthefly.html.twig' with {
-        action: 'show', displayBadge: true,
-        targetEntity: { name: type, id: entity.id },
-        buttonText: entity|chill_entity_render_string,
-        isDead: entity.deathdate is defined and entity.deathdate is not null,
-        parent: parent
-    } %}
-{% endmacro %}
-
 {% macro computeWidth(nbBlocks) %}
    {{ 'flex-basis: ' ~ (100 / nbBlocks)|round(1) ~ '%;' }}
 {% endmacro %}
@@ -23,7 +13,6 @@
        {% set blocks = blocks|merge([{
            'title': 'Others persons'|trans,
            'items': entity.persons,
-            'type': 'person',
            'path' : 'chill_person_view',
            'key'  : 'person_id'
        }]) %}
@@ -31,13 +20,11 @@
        {% set blocks = blocks|merge([{
            'title': 'Persons in accompanying course'|trans,
            'items': entity.personsAssociated,
-            'type': 'person',
            'path' : 'chill_person_view',
            'key'  : 'person_id'
        },{
            'title': 'Third persons'|trans,
            'items': entity.personsNotAssociated,
-            'type': 'person',
            'path' : 'chill_person_view',
            'key'  : 'person_id',
        }]) %}
@@ -47,7 +34,6 @@
    {% set blocks = blocks|merge([{
        'title': 'Third parties'|trans,
        'items': entity.thirdParties,
-        'type': 'thirdparty',
        'path' : 'chill_crud_3party_3party_view',
        'key'  : 'id',
    }]) %}
@@ -56,12 +42,11 @@
    {% set blocks = blocks|merge([{
        'title': 'Users concerned'|trans,
        'items': entity.users,
-        'type': 'user',
        'key'  : 'id',
    }]) %}
 {% endif %}

-{% if (render == 'bloc') %}
+{% if (with_display == 'bloc') %}
 <div class="{{ context }} flex-bloc concerned-groups">
    {% for bloc in blocks %}

@@ -74,12 +59,22 @@
                    <ul class="list-content">
                        {% for item in bloc.items %}
                            <li>
-                                {% if bloc.type == 'user' %}
-                                    <span class="badge-user">
-                                        {{ item|chill_entity_render_box({'render': 'raw', 'addAltNames': false }) }}
+                                {% if bloc.path is defined %}
+                                    <a href="{{ _self.href(bloc.path, bloc.key, item.id) }}">
+                                    <span class="{% if (badge_person is defined and badge_person == true) %}badge-person{% else %}badge bg-primary{% endif %}">
+                                        {{ item|chill_entity_render_box({
+                                            'render': 'raw',
+                                            'addAltNames': false
+                                        }) }}
                                    </span>
+                                    </a>
                                {% else %}
-                                    {{ _self.insert_onthefly(bloc.type, item) }}
+                                    <span class="{% if (badge_person is defined and badge_person == true) %}badge-person{% else %}badge bg-primary{% endif %}">
+                                        {{ item|chill_entity_render_box({
+                                            'render': 'raw',
+                                            'addAltNames': false
+                                        }) }}
+                                    </span>
                                {% endif %}
                            </li>
                        {% endfor %}
@@ -92,7 +87,7 @@
 </div>
 {% endif %}

-{% if (render == 'row') %}
+{% if (with_display == 'row') %}
 <div class="concerned-groups">
    {% for bloc in blocks %}
    <div class="group">
@@ -101,12 +96,20 @@
            <ul class="list-content">
                {% for item in bloc.items %}
                <li>
-                    {% if bloc.type == 'user' %}
-                        <span class="badge-user">
-                            {{ item|chill_entity_render_box({'render': 'raw', 'addAltNames': false }) }}
+                    {% if bloc.path is defined %}
+                    <a href="{{ _self.href(bloc.path, bloc.key, item.id) }}">
+                        <span class="{% if (badge_person is defined and badge_person == true) %}badge-person{% else %}badge bg-primary{% endif %}">
+                            {{ item|chill_entity_render_box({
+                                'render': 'raw',
+                                'addAltNames': false
+                            }) }}
                        </span>
+                    </a>
                    {% else %}
-                        {{ _self.insert_onthefly(bloc.type, item) }}
+                        {{ item|chill_entity_render_box({
+                            'render': 'raw',
+                            'addAltNames': false
+                        }) }}
                    {% endif %}
                </li>
                {% endfor %}
@@ -117,24 +120,30 @@
 </div>
 {% endif %}

-{% if (render == 'wrap-list') %}
+{% if (with_display == 'wrap-list') %}
 <div class="concerned-groups wrap-list">
    {% for bloc in blocks %}
        <div class="wl-row">
            {% if bloc.items|length > 0 %}
                <div class="wl-col title">
-                    <h3>{{ bloc.title }}</h3>
+                    <h4>{{ bloc.title }}</h4>
                </div>
                <div class="wl-col list">
                    {% for item in bloc.items %}

-                        <span class="wl-item">
-                            {% if bloc.type == 'user' %}
-                                <span class="badge-user">
-                                    {{ item|chill_entity_render_box({'render': 'raw', 'addAltNames': false }) }}
-                                </span>
+                        <span class="wl-item {% if (badge_person is defined and badge_person == true) %}badge-person{% else %}badge bg-primary{% endif %}">
+                            {% if bloc.path is defined %}
+                            <a href="{{ _self.href(bloc.path, bloc.key, item.id) }}">
+                                {{ item|chill_entity_render_box({
+                                    'render': 'raw',
+                                    'addAltNames': false
+                                }) }}
+                            </a>
                            {% else %}
-                                {{ _self.insert_onthefly(bloc.type, item) }}
+                                {{ item|chill_entity_render_box({
+                                    'render': 'raw',
+                                    'addAltNames': false
+                                }) }}
                            {% endif %}
                        </span>

--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/confirm_deletePerson.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/confirm_deletePerson.html.twig
@@ -5,7 +5,7 @@

 {% block title  'Remove activity'|trans %}

-{% block content %}
+{% block personcontent %}
 {{ include('@ChillMain/Util/confirmation_template.html.twig',
    {
        'title'             : 'Remove activity'|trans,
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/edit.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/edit.html.twig
@@ -1,12 +1,5 @@
-<h1>
-    {{ "Update activity"|trans }}
-</h1>
-<h2 class="badge-title mb-5">
-    <span class="title_label"></span>
-    <span class="title_action">
-        {{ entity.type.name | localize_translatable_string }}
-    </span>
-</h2>
+<h1>{{ "Update activity"|trans }}</h1>
+<h2 class="chill-green mb-4">{{ entity.type.name|localize_translatable_string }}</h2>

 {{ form_start(edit_form) }}
 {{ form_errors(edit_form) }}
@@ -35,7 +28,7 @@
    {{ form_row(edit_form.socialActions) }}
 {% endif %}

-{%- if edit_form.socialIssues is defined or edit_form.socialActions is defined -%}
+{%- if edit_form.socialIssues is defined or edit_form.socialIssues is defined -%}
 <div id="social-issues-acc"></div>
 {% endif %}

@@ -44,7 +37,7 @@
 {% endif %}

 {%- if edit_form.persons is defined or edit_form.thirdParties is defined or edit_form.users is defined -%}
-    <h2 class="chill-blue">{{ 'Concerned groups'|trans }}</h2>
+    <h2 class="chill-red">{{ 'Concerned groups'|trans }}</h2>

    {%- if edit_form.persons is defined -%}
        {{ form_widget(edit_form.persons) }}
@@ -60,7 +53,7 @@
 {% endif %}


-<h2 class="chill-blue">{{ 'Activity data'|trans }}</h2>
+<h2 class="chill-red">{{ 'Activity data'|trans }}</h2>

 {%- if edit_form.date is defined -%}
    {{ form_row(edit_form.date) }}
@@ -80,22 +73,19 @@
 {% endif %}

 {%- if edit_form.comment is defined -%}
+    {# TODO .. public and private #}
    {{ form_row(edit_form.comment) }}
 {% endif %}

-{%- if edit_form.privateComment is defined -%}
-    {{ form_row(edit_form.privateComment) }}
+{%- if edit_form.documents is defined -%}
+    {{ form_row(edit_form.documents) }}
 {% endif %}

 {%- if edit_form.attendee is defined -%}
    {{ form_row(edit_form.attendee) }}
 {% endif %}

-{%- if edit_form.documents is defined -%}
-    {{ form_row(edit_form.documents) }}
-    <div data-docgen-template-picker="data-docgen-template-picker" data-entity-class="Chill\ActivityBundle\Entity\Activity" data-entity-id="{{ entity.id }}"></div>
-{% endif %}
-
+{# TODO .. status #}

 {% set person_id = null %}
 {% if entity.person %}
@@ -107,16 +97,16 @@
    {% set accompanying_course_id = accompanyingCourse.id %}
 {% endif %}

-<ul class="record_actions sticky-form-buttons">
-    <li class="cancel">
-        <a href="{{ path('chill_activity_activity_show', { 'id': entity.id, 'person_id': person_id, 'accompanying_period_id': accompanying_course_id  } ) }}" class="btn btn-cancel">
-            {{ 'Cancel'|trans }}
-        </a>
-    </li>
-    <li>
-        <button class="btn btn-update" type="submit">{{ 'Save'|trans }}</button>
-    </li>
-</ul>
-
+    <ul class="record_actions sticky-form-buttons">
+        <li class="cancel">
+            <a href="{{ path('chill_activity_activity_show', { 'id': entity.id, 'person_id': person_id, 'accompanying_period_id': accompanying_course_id  } ) }}" class="btn btn-cancel">
+                {{ 'Cancel'|trans }}
+            </a>
+        </li>
+        <li>
+            <button class="btn btn-update" type="submit">{{ 'Save'|trans }}</button>
+        </li>
+    </ul>
 {{ form_end(edit_form) }}
+
 {# {{ form(delete_form) }} #}
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/editAccompanyingCourse.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/editAccompanyingCourse.html.twig
@@ -15,7 +15,7 @@

 {% block js %}
    {{ parent() }}
-    {{ encore_entry_script_tags('mod_async_upload') }}
+    {{ encore_entry_link_tags('mod_async_upload') }}
    <script type="text/javascript">
        window.addEventListener('DOMContentLoaded', function (e) {
            chill.displayAlertWhenLeavingModifiedForm('form[name="{{ edit_form.vars.form.vars.name }}"]',
@@ -30,5 +30,4 @@
    {{ parent() }}
    {{ encore_entry_link_tags('mod_async_upload') }}
    {{ encore_entry_link_tags('vue_activity') }}
-    {{ encore_entry_link_tags('page_edit_activity') }}
 {% endblock %}
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/editPerson.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/editPerson.html.twig
@@ -20,7 +20,7 @@

 {% block title  'Update activity'|trans %}

-{% block content %}
+{% block personcontent %}
 <div class="activity-edit">

    <div id="activity"></div> {# <=== vue component #}
@@ -30,7 +30,7 @@
 {% endblock %}

 {% block js %}
-    {{ encore_entry_script_tags('mod_async_upload') }}
+    {{ encore_entry_link_tags('mod_async_upload') }}
    <script type="text/javascript">
        window.addEventListener('DOMContentLoaded', function (e) {
            chill.displayAlertWhenLeavingModifiedForm('form[name="{{ edit_form.vars.form.vars.name }}"]',
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/list.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/list.html.twig
@@ -1,83 +1,3 @@
-{% macro recordAction(activity, context = null, person_id = null, accompanying_course_id = null) %}
-    {% if is_granted('CHILL_ACTIVITY_SEE_DETAILS', activity) %}
-        {% if no_action is not defined or no_action == false %}
-            <li>
-                {% set showGroup = activity.accompanyingPeriod is not null and activity.accompanyingPeriod.hasUser and activity.accompanyingPeriod.user is not same as(app.user)  %}
-                <div class="{% if showGroup %}btn-group{% endif %}" {% if showGroup %}role="group"{% endif %}>
-                    {% if showGroup %}
-                        <button id="btnGroupNotifyButtons" type="button" class="btn btn-notify dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false">
-                            {{ 'notification.Notify'|trans }}
-                        </button>
-                        <ul class="dropdown-menu" aria-labelledby="btnGroupNotifyButtons">
-                            <li>
-                                <a class="dropdown-item" href="{{ chill_path_add_return_path('chill_main_notification_create', {'entityClass': 'Chill\\ActivityBundle\\Entity\\Activity', 'entityId': activity.id, 'tos': [activity.accompanyingPeriod.user.id]}) }}">
-                                    {{ 'notification.Notify referrer'|trans }}
-                                </a>
-                            </li>
-                            <li>
-                                <a class="dropdown-item" href="{{ chill_path_add_return_path('chill_main_notification_create', {'entityClass': 'Chill\\ActivityBundle\\Entity\\Activity', 'entityId': activity.id}) }}">
-                                    {{ 'notification.Notify any'|trans }}
-                                </a>
-                            </li>
-                        </ul>
-                    {% else %}
-                        <a class="btn btn-notify" href="{{ chill_path_add_return_path('chill_main_notification_create', {'entityClass': 'Chill\\ActivityBundle\\Entity\\Activity', 'entityId': activity.id}) }}">
-                            {{ 'notification.Notify'|trans }}
-                        </a>
-                    {% endif %}
-                </div>
-            </li>
-        {% endif %}
-        {% if context == 'person' and activity.accompanyingPeriod is not empty %}
-            {#
-                Disable person_id in following links, for redirect to accompanyingCourse context
-            #}
-            {% set person_id = null %}
-            {% set accompanying_course_id = activity.accompanyingPeriod.id %}
-            <li>
-                <a href="{{ chill_path_add_return_path('chill_activity_activity_list',{
-                        'accompanying_period_id': accompanying_course_id
-                    }) }}"
-                    class="btn btn-primary"
-                    title="{{ 'See activity in accompanying course context'|trans }}">
-                    <i class="fa fa-random fa-fw"></i>
-                    {{ 'Period number %number%'|trans({'%number%': accompanying_course_id}) }}
-                </a>
-            </li>
-        {% endif %}
-        <li>
-            <a href="{{ path('chill_activity_activity_show', {'id': activity.id,
-                    'person_id': person_id,
-                    'accompanying_period_id': accompanying_course_id
-                }) }}"
-                class="btn btn-show"
-                title="{{ 'Show'|trans }}"></a>
-        </li>
-        {% if no_action is not defined or no_action == false %}
-            {% if is_granted('CHILL_ACTIVITY_UPDATE', activity) %}
-                <li>
-                    <a href="{{ path('chill_activity_activity_edit', {'id': activity.id,
-                            'person_id': person_id,
-                            'accompanying_period_id': accompanying_course_id
-                        }) }}"
-                        class="btn btn-update"
-                        title="{{ 'Edit'|trans }}"></a>
-                </li>
-            {% endif %}
-            {% if is_granted('CHILL_ACTIVITY_DELETE', activity) %}
-                <li>
-                    <a href="{{ path('chill_activity_activity_delete', {'id': activity.id,
-                            'person_id': person_id,
-                            'accompanying_period_id': accompanying_course_id
-                        }) }}"
-                        class="btn btn-delete"
-                        title="{{ 'Delete'|trans }}"></a>
-                </li>
-            {% endif %}
-        {% endif %}
-    {% endif %}
-{% endmacro %}
-
 <div class="context-{{ context }}">

    {% if activities|length == 0 %}
@@ -88,10 +8,56 @@
    {% else %}
        <div class="flex-table activity-list">
            {% for activity in activities %}
-                {% include 'ChillActivityBundle:Activity:_list_item.html.twig' with {
-                    'context': context,
-                    'recordAction': _self.recordAction(activity, context, person_id, accompanying_course_id)
-                } %}
+                {% set t = activity.type %}
+                <div class="item-bloc">
+                    <div class="item-row">
+                        {% include '@ChillActivity/Activity/activity-badge-title.html.twig' %}
+                    </div>
+
+                    {%  if activity.comment.comment is not empty
+                        or activity.persons|length > 0
+                        or activity.thirdParties|length > 0
+                        or activity.users|length > 0
+                    %}
+                    <div class="main">
+                        {% if activity.comment.comment is not empty %}
+                            {{ activity.comment|chill_entity_render_box({
+                                'disable_markdown': false,
+                                'limit_lines': 3,
+                                'metadata': false,
+                            }) }}
+                        {% endif %}
+
+                        {% include 'ChillActivityBundle:Activity:concernedGroups.html.twig' with {
+                            'context': context,
+                            'with_display': 'row',
+                            'entity': activity,
+                            'badge_person': true
+                        } %}
+                    </div>
+                    {% endif %}
+
+                    <div class="item-row separator">
+                        <div class="updatedBy"></div>
+                        <ul class="record_actions">
+                            <li>
+                                <a href="{{ path('chill_activity_activity_show', { 'id': activity.id, 'person_id': person_id, 'accompanying_period_id': accompanying_course_id }) }}"
+                                   class="btn btn-sm btn-show "></a>
+                            </li>
+                            {% if no_action is not defined or no_action == false %}
+                                <li>
+                                    <a href="{{ path('chill_activity_activity_edit', { 'id': activity.id, 'person_id': person_id, 'accompanying_period_id': accompanying_course_id }) }}"
+                                       class="btn btn-sm btn-update "></a>
+                                </li>
+                                <li>
+                                    <a href="{{ path('chill_activity_activity_delete', { 'id': activity.id, 'person_id' : person_id, 'accompanying_period_id': accompanying_course_id } ) }}"
+                                       class="btn btn-sm btn-delete "></a>
+                                </li>
+                            {% endif %}
+                        </ul>
+                    </div>
+
+                </div>
            {% endfor %}
        </div>
    {% endif %}
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/listAccompanyingCourse.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/listAccompanyingCourse.html.twig
@@ -4,17 +4,6 @@

 {% block title %}{{ 'Activity list' |trans }}{% endblock title %}

-
-{% block js %}
-    {{ parent() }}
-    {{ encore_entry_script_tags('mod_notification_toggle_read_status') }}
-{% endblock %}
-
-{% block css %}
-    {{ parent() }}
-    {{ encore_entry_link_tags('mod_notification_toggle_read_status') }}
-{% endblock %}
-
 {% block content %}

    {% set person_id = null %}
@@ -34,8 +23,8 @@
    {% if is_granted('CHILL_ACTIVITY_CREATE', accompanyingCourse) %}
    <ul class="record_actions sticky-form-buttons">
        <li>
-            <a href="{{ path('chill_activity_activity_new', {'person_id': person_id, 'accompanying_period_id': accompanying_course_id}) }}"
-               class="btn btn-create">{{ 'Create'|trans }}
+            <a href="{{ path('chill_activity_activity_new', {'person_id': person_id, 'accompanying_period_id': accompanying_course_id}) }}" class="btn btn-create">
+                {{ 'Create'|trans }}
            </a>
        </li>
    </ul>
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/listPerson.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/listPerson.html.twig
@@ -20,17 +20,7 @@

 {% block title %}{{ 'Activity list' |trans }}{% endblock title %}

-{% block js %}
-    {{ parent() }}
-    {{ encore_entry_script_tags('mod_notification_toggle_read_status') }}
-{% endblock %}
-
-{% block css %}
-    {{ parent() }}
-    {{ encore_entry_link_tags('mod_notification_toggle_read_status') }}
-{% endblock %}
-
-{% block content %}
+{% block personcontent %}

    {% set person_id = null %}
    {% if person %}
@@ -46,7 +36,7 @@

    {% include 'ChillActivityBundle:Activity:list.html.twig' with {'context': 'person'} %}

-    {% if is_granted('CHILL_ACTIVITY_CREATE_PERSON', person) %}
+    {% if is_granted('CHILL_ACTIVITY_CREATE', person) %}
    <ul class="record_actions sticky-form-buttons">
        <li>
            <a href="{{ path('chill_activity_activity_new', {'person_id': person_id, 'accompanying_period_id': accompanying_course_id}) }}"
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/list_recent.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/list_recent.html.twig
@@ -3,88 +3,10 @@
        {% set t = activity.type %}

        <a href="{{ path('chill_activity_activity_show', { 'id': activity.id, 'person_id': person_id, 'accompanying_period_id': accompanying_course_id }) }}"
-            class="dashboard-link" title="{{ 'Show the activity'|trans }}">
+            class="badge-link" title="{{ 'Show the activity'|trans }}">

-            <div class="dashboard">
-                <span class="title_label"></span>
-                <span class="title_action">
-
-                    {%- if activity.date -%}
-                        <p class="date-label">{{ activity.date|format_date('short') }}</p>
-                    {%- endif -%}
-
-                    <span class="like-h3">{{ activity.type.name|localize_translatable_string }}</span>
-
-                    {% if activity.emergency %}
-                        <span class="badge bg-danger rounded-pill fs-6">{{ 'Emergency'|trans|upper }}</span>
-                    {% endif %}
-
-                    <ul class="small_in_title mt-3">
-
-                        {% if activity.sentReceived is not empty and t.sentReceivedVisible %}
-                            <li>
-                                <span class="item-key">{{ 'Sent received'|trans ~ ' : ' }}</span>
-                                <b>{{ activity.sentReceived|capitalize|trans }}</b>
-                            </li>
-                        {% endif %}
-
-                        {% if activity.location and t.locationVisible %}
-                            <li>
-                                <span class="item-key">{{ 'location'|trans ~ ': ' }}</span>
-                                <b>
-                                    <span>{{ activity.location.locationType.title|localize_translatable_string }}</span>
-                                    {{ activity.location.name }}
-                                </b>
-                            </li>
-                        {% endif %}
-
-                        {% if activity.user and t.userVisible %}
-                            <li>
-                                <span class="item-key">{{ 'Referrer'|trans ~ ': ' }}</span>
-                                <b>{{ activity.user|chill_entity_render_box}}</b>
-                            </li>
-                        {% endif %}
-
-                        <li class="associated-persons">
-                            <span class="item-key">{{ 'Participants'|trans ~ ' : ' }}</span>
-                            {% for p in activity.personsAssociated %}
-                                <span class="badge-person">{{ p|chill_entity_render_box({'addAgeBadge': true}) }}</span>
-                            {% endfor %}
-                        </li>
-                    </ul>
-
-                    <ul class="list-content my-3">
-                        {%- if t.reasonsVisible -%}
-                            {%- if activity.reasons is not empty -%}
-                                <li class="reasons">
-                                    {% for r in activity.reasons %}
-                                        {{ r|chill_entity_render_box }}
-                                    {% endfor %}
-                                </li>
-                            {%- endif -%}
-                        {% endif %}
-                        {%- if t.socialIssuesVisible %}
-                            {%- if activity.socialIssues is not empty -%}
-                                <li class="social-issues">
-                                    {% for r in activity.socialIssues %}
-                                        {{ r|chill_entity_render_box }}
-                                    {% endfor %}
-                                </li>
-                            {%- endif -%}
-                        {% endif %}
-                        {%- if t.socialActionsVisible -%}
-                            {%- if activity.socialActions is not empty -%}
-                                <li class="social-actions">
-                                    {% for r in activity.socialActions %}
-                                        {{ r|chill_entity_render_box }}
-                                    {% endfor %}
-                                </li>
-                            {%- endif -%}
-                        {% endif %}
-                    </ul>
-
-                </span>
-            </div>
+            {% include '@ChillActivity/Activity/activity-badge-title.html.twig' %}
        </a>
+
    {% endfor %}
 </div>
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/new.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/new.html.twig
@@ -1,16 +1,10 @@
-<h1>
-    {{ "Activity creation"|trans }}
-</h1>
-<h2 class="badge-title mb-5">
-    <span class="title_label"></span>
-    <span class="title_action">
-        {{ entity.type.name | localize_translatable_string }}
-    </span>
-</h2>
+<h1>{{ "Activity creation"|trans ~ ' :' }}</h1>
+<h2 class="chill-green mb-4">{{ entity.type.name|localize_translatable_string }}</h2>

 {{ form_start(form) }}
 {{ form_errors(form) }}

+
 {%- if form.emergency is defined -%}
    {{ form_row(form.emergency) }}
 {% endif %}
@@ -35,7 +29,7 @@
    {{ form_row(form.socialActions) }}
 {% endif %}

-{%- if form.socialIssues is defined or form.socialActions is defined -%}
+{%- if form.socialIssues is defined or form.socialIssues is defined -%}
    <div id="social-issues-acc"></div>
 {% endif %}

@@ -45,7 +39,7 @@

 {%- if form.persons is defined or form.thirdParties is defined or form.users is defined -%}

-    <h2 class="chill-blue">{{ 'Concerned groups'|trans }}</h2>
+    <h2 class="chill-red">{{ 'Concerned groups'|trans }}</h2>

    {%- if form.persons is defined -%}
        {{ form_widget(form.persons) }}
@@ -61,7 +55,7 @@

 {% endif %}

-<h2 class="chill-blue">{{ 'Activity data'|trans }}</h2>
+<h2 class="chill-red">{{ 'Activity data'|trans }}</h2>

 {%- if form.date is defined -%}
    {{ form_row(form.date) }}
@@ -81,20 +75,16 @@
 {% endif %}

 {%- if form.comment is defined -%}
+    {# TODO .. public and private #}
    {{ form_row(form.comment) }}
 {% endif %}

-{%- if form.privateComment is defined -%}
-    {{ form_row(form.privateComment) }}
-{% endif %}
-
-{%- if form.attendee is defined -%}
-    {{ form_row(form.attendee) }}
-{% endif %}
-
 {%- if form.documents is defined -%}
    {{ form_row(form.documents) }}
-    <div data-docgen-template-picker="data-docgen-template-picker" data-entity-class="Chill\ActivityBundle\Entity\Activity" data-entity-id="{{ entity.id }}"></div>
+{% endif %}
+
+{%- if form.attendee is defined -%}
+    {{ form_row(form.attendee) }}
 {% endif %}

 {# TODO .. status #}
@@ -113,7 +103,7 @@
    </a>
  </li>
  <li>
-    <button class="btn btn-save" type="submit">
+    <button class="btn btn-create" type="submit">
      {{ 'Create'|trans }}
    </button>
  </li>
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/newAccompanyingCourse.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/newAccompanyingCourse.html.twig
@@ -17,6 +17,10 @@
    {{ parent() }}
    {{ encore_entry_script_tags('mod_async_upload') }}
    <script type="text/javascript">
+        window.addEventListener('DOMContentLoaded', function (e) {
+            chill.displayAlertWhenLeavingUnsubmittedForm('form[name="{{ form.vars.form.vars.name }}"]',
+            '{{ "You are going to leave a page with unsubmitted data. Are you sure you want to leave ?"|trans }}');
+        });
        window.activity = {{ activity_json|json_encode|raw }};
        {% if default_location is not null %}window.default_location_id = {{ default_location.id }}{% endif %};
    </script>
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/newPerson.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/newPerson.html.twig
@@ -4,7 +4,7 @@

 {% block title 'Activity creation' |trans %}

-{% block content %}
+{% block personcontent %}
 <div class="activity-new">

    <div id="activity"></div> {# <=== vue component #}
@@ -14,7 +14,7 @@
 {% endblock %}

 {% block js %}
-    {{ encore_entry_script_tags('mod_async_upload') }}
+    {{ encore_entry_link_tags('mod_async_upload') }}
    <script type="text/javascript">
        window.addEventListener('DOMContentLoaded', function (e) {
            chill.displayAlertWhenLeavingUnsubmittedForm('form[name="{{ form.vars.form.vars.name }}"]',
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/selectType.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/selectType.html.twig
@@ -25,7 +25,7 @@
                    'activityData': activityData
                }) }}">

-                    <div class="btn btn-primary">
+                    <div class="bloc btn btn-primary btn-lg btn-block">
                        {{ activityType.name|localize_translatable_string }}
                    </div>
                </a>
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/selectTypePerson.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/selectTypePerson.html.twig
@@ -4,6 +4,6 @@

 {% block title 'Activity creation'|trans %}

-{% block content %}
+{% block personcontent %}
    {% include 'ChillActivityBundle:Activity:selectType.html.twig' %}
 {% endblock %}
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig
@@ -1,204 +1,128 @@
 {%- set t = entity.type -%}
-{% set userId = app.user.id %}
 {%- import "@ChillDocStore/Macro/macro.html.twig" as m -%}

-<h1>{{ "Activity"|trans }}</h1>
+<h1>
+  {{ "Activity"|trans }}
+  {%- if t.emergencyVisible and entity.emergency -%}
+  <span class="badge bg-secondary">
+    {{- 'Emergency'|trans -}}
+  </span>
+{%- endif -%}
+</h1>

-<div class="flex-table">
-    <div class="item-bloc">
+<dl class="chill_view_data">

-        <div class="item-row">
-            <div class="wrap-list">
-                <div class="wl-row">
-                    <div class="wl-col title">
-                        {% if entity.date %}
-                            <p class="date-label">
-                                {{ entity.date|format_date('short') }}
-                            </p>
-                        {% endif %}
-                    </div>
-                    <div class="wl-col list">
-                        <h2 class="badge-title">
-                            <span class="title_label"></span>
-                            <span class="title_action">
-                                {{ entity.type.name | localize_translatable_string }}
-                                {% if entity.emergency %}
-                                    <span class="badge bg-danger rounded-pill fs-6 float-end">{{ 'Emergency'|trans|upper }}</span>
-                                {% endif %}
-                            </span>
-                        </h2>
-                    </div>
-                </div>
-            </div>
-        </div>
+    <dt class="inline">{{ 'by'|trans|capitalize }}</dt>
+    <dd>{{ entity.user }}</dd>

-        <div class="item-row separator">
-            <dl class="chill_view_data">
-                <dt class="inline">{{ 'Referrer'|trans|capitalize }}</dt>
-                <dd>{{ entity.user|chill_entity_render_box }}</dd>
+    <dt class="inline">{{ 'Type'|trans }}</dt>
+    <dd>{{ entity.type.name | localize_translatable_string }}</dd>

-                {%- if entity.scope -%}
-                    <dt class="inline">{{ 'Scope'|trans }}</dt>
-                    <dd>
-                        <span class="scope">{{ entity.scope.name|localize_translatable_string }}</span>
-                    </dd>
-                {% endif %}
-
-                {% if t.socialIssuesVisible %}
-                    <dt class="inline">{{ 'Social issues'|trans }}</dt>
-                    <dd>
-                        {% if entity.socialIssues|length == 0 %}
-                            <p class="chill-no-data-statement">{{ 'No social issues associated'|trans }}</p>
-                        {% else %}
-                            {% for si in entity.socialIssues %}{{ si|chill_entity_render_box }}{% endfor %}
-                        {% endif %}
-                    </dd>
-                {% endif %}
-
-                {% if t.socialActionsVisible %}
-                    <dt class="inline">{{ 'Social actions'|trans }}</dt>
-                    <dd>
-                        {% if entity.socialActions|length == 0 %}
-                            <span class="chill-no-data-statement">{{ 'No social actions associated'|trans }}</span>
-                        {% else %}
-                            {% for sa in entity.socialActions %}{{ sa|chill_entity_render_box }}{% endfor %}
-                        {% endif %}
-                    </dd>
-                {% endif %}
-
-                {% if t.reasonsVisible %}
-                    <dt class="inline">{{ 'Reasons'|trans }}</dt>
-                    <dd>
-                        {%- if entity.reasons is empty -%}
-                            <span class="chill-no-data-statement">{{ 'No reason associated'|trans }}</span>
-                        {%- else -%}
-                            {% for r in entity.reasons %}{{ r|chill_entity_render_box }}{% endfor %}
-                        {%- endif -%}
-                    </dd>
-                {% endif %}
-            </dl>
-        </div>
-
-    </div>
-</div>
-
-<h2 class="chill-blue">{{ 'Concerned groups'|trans }}</h2>
-
-{% include 'ChillActivityBundle:Activity:concernedGroups.html.twig' with {
-    'context': context,
-    'render': 'bloc',
-    'badge_person': true
-} %}
-
-<h2 class="chill-blue">{{ 'Activity data'|trans }}</h2>
-
-<div class="flex-table">
-    <div class="item-bloc">
-
-        <dl class="chill_view_data">
-            <dt class="inline">{{ 'Date'|trans }}</dt>
-            <dd>{{ entity.date|format_date('long') }}</dd>
-
-            {% if t.locationVisible %}
-                <dt class="inline">{{ 'Activity location'|trans }}</dt>
-                <dd>
-                    {% if entity.location is not null %}
-                        <p>
-                            {{ entity.location.name }}
-                            <span>({{ entity.location.locationType.title|localize_translatable_string }})</span>
-                        </p>
-                        <div class="ms-3">{{ entity.location.address|chill_entity_render_box }}</div>
-                    {% else %}
-                        <span class="chill-no-data-statement">{{ 'No address given'|trans }}</span>
-                    {% endif %}
-                </dd>
-            {% endif %}
-
-            {% if t.durationTimeVisible and is_granted('CHILL_ACTIVITY_SEE_DETAILS', entity) %}
-                <dt class="inline">{{ 'Duration Time'|trans }}</dt>
-                <dd>
-                    {% if entity.durationTime is not null %}
-                        {{ entity.durationTime|date('H:i') }}
-                    {% else %}
-                        <span class="chill-no-data-statement">{{ 'None'|trans|capitalize }}</span>
-                    {% endif %}
-                </dd>
-            {% endif %}
-
-            {% if t.travelTimeVisible and is_granted('CHILL_ACTIVITY_SEE_DETAILS', entity) %}
-                <dt class="inline">{{ 'Travel time'|trans }}</dt>
-                <dd>
-                    {% if entity.travelTime is not null %}
-                        {{ entity.travelTime|date('H:i') }}
-                    {% else %}
-                        <span class="chill-no-data-statement">{{ 'None'|trans|capitalize }}</span>
-                    {% endif %}
-                </dd>
-            {% endif %}
-
-            {% if t.commentVisible and is_granted('CHILL_ACTIVITY_SEE_DETAILS', entity) %}
-                <dt class="inline">{{ 'activity.comment'|trans }}</dt>
-                <dd>
-                    {%- if entity.comment.empty -%}
-                        <span class="chill-no-data-statement">{{ 'No comment associated'|trans }}</span>
-                    {%- else -%}
-                        {{ entity.comment|chill_entity_render_box }}
-                    {%- endif -%}
-                </dd>
-            {% endif %}
-
-            {% if t.privateCommentVisible and is_granted('CHILL_ACTIVITY_SEE_DETAILS', entity) and entity.privateComment.hasCommentForUser(app.user) %}
-                {% if t.privateCommentLabel is not empty %}
-                    <dt class="inline">{{ t.privateCommentLabel }}</dt>
-                {% else %}
-                    <dt class="inline">{{ 'Private comment'|trans }}</dt>
-                {% endif %}
-                <dd>
-                    <section class="chill-entity entity-comment-embeddable">
-                        <blockquote class="chill-user-quote private-quote">
-                            {{ entity.privateComment.comments[userId] }}
-                        </blockquote>
-                    </section>
-                </dd>
-            {% endif %}
-
-            {% if t.documentsVisible and is_granted('CHILL_ACTIVITY_SEE_DETAILS', entity) %}
-                <dt class="inline">{{ 'Documents'|trans }}</dt>
-                <dd>
-                    {% if entity.documents|length > 0 %}
-                        <ul>
-                            {% for d in entity.documents %}
-                                <li>{{ d.title }}{{ m.download_button(d) }}</li>
-                            {% endfor %}
-                        </ul>
-                    {% else %}
-                        <span class="chill-no-data-statement">{{ 'Any document found'|trans }}</span>
-                    {% endif %}
-                </dd>
-            {% endif %}
-
-            {% if t.attendeeVisible and is_granted('CHILL_ACTIVITY_SEE_DETAILS', entity) %}
-                <dt class="inline">{{ 'Attendee'|trans }}</dt>
-                <dd>
-                    {% if entity.attendee is not null %}
-                        {{ entity.attendee.name|localize_translatable_string }}
-                    {% else %}
-                        <span class="chill-no-data-statement">{{ 'None'|trans|capitalize }}</span>
-                    {% endif %}
-                </dd>
-            {% endif %}
-
-        </dl>
-
-    </div>
-</div>
-
-<div class="notification notification-list">
-    {% set notifications =  chill_list_notifications('Chill\\ActivityBundle\\Entity\\Activity', entity.id) %}
-    {% if notifications is not empty %}
-        {{ notifications|raw }}
+    {%- if entity.scope -%}
+        <dt class="inline">{{ 'Scope'|trans }}</dt>
+        <dd><span class="scope">{{ entity.scope.name|localize_translatable_string }}</span></dd>
    {% endif %}
-</div>
+
+    {% if t.socialIssuesVisible %}
+      <dt class="inline">{{ 'Social issues'|trans }}</dt>
+      <dd>
+        {% if entity.socialIssues|length == 0 %}
+          <p class="chill-no-data-statement">{{ 'No social issues associated'|trans }}</p>
+        {% else %}
+          {% for si in entity.socialIssues %}{{ si|chill_entity_render_box }}{% endfor %}
+        {% endif %}
+      </dd>
+    {% endif %}
+
+    {% if t.socialActionsVisible %}
+      <dt class="inline">{{ 'Social actions'|trans }}</dt>
+      <dd>
+        {% if entity.socialActions|length == 0 %}
+          <p class="chill-no-data-statement">{{ 'No social actions associated'|trans }}</p>
+        {% else %}
+          {% for sa in entity.socialActions %}{{ sa|chill_entity_render_box }}{% endfor %}
+        {% endif %}
+      </dd>
+    {% endif %}
+
+    {% if t.reasonsVisible %}
+    <dt class="inline">{{ 'Reasons'|trans }}</dt>
+    {%- if entity.reasons is empty -%}
+    <dd><span class="chill-no-data-statement">{{ 'No reason associated'|trans }}</span></dd>
+    {%- else -%}
+    <dd>{% for r in entity.reasons %}{{ r|chill_entity_render_box }} {% endfor %}</dd>
+    {%- endif -%}
+    {% endif %}
+
+<h2 class="chill-red">{{ 'Concerned groups'|trans }}</h2>
+{% include 'ChillActivityBundle:Activity:concernedGroups.html.twig' with {'context': context, 'with_display': 'bloc', 'badge_person': 'true' } %}
+
+<h2 class="chill-red">{{ 'Activity data'|trans }}</h2>
+
+    <dt class="inline">{{ 'Date'|trans }}</dt>
+    <dd>{{ entity.date|format_date('long') }}</dd>
+
+    {% if t.locationVisible %}
+        <dt class="inline">{{ 'Activity location'|trans }}</dt>
+        <dd>
+            {% if entity.location is not null %}
+                <p>
+                    {{ entity.location.name }}
+                    <span> ({{ entity.location.locationType.title|localize_translatable_string }})</span>
+                </p>
+                {{ entity.location.address|chill_entity_render_box }}
+            {% else %}
+                <span class="chill-no-data-statement">{{ 'No address given'|trans }}</span>
+            {% endif %}
+        </dd>
+    {% endif %}
+
+    {% if t.durationTimeVisible %}
+    <dt class="inline">{{ 'Duration Time'|trans }}</dt>
+    <dd>{% if entity.durationTime is not null %}
+            {{ entity.durationTime|date('H:i') }}
+        {% else %}
+            {{ 'None'|trans|capitalize }}
+        {% endif %}
+    </dd>
+    {% endif %}
+
+    {% if t.travelTimeVisible %}
+    <dt class="inline">{{ 'Travel time'|trans }}</dt>
+    <dd>{% if entity.travelTime is not null %}
+            {{ entity.travelTime|date('H:i') }}
+        {% else %}
+            {{ 'None'|trans|capitalize }}
+        {% endif %}
+    </dd>
+    {% endif %}
+
+    {% if t.commentVisible %}
+    <dt class="inline">{{ 'activity.comment'|trans }}</dt>
+      {%- if entity.comment.empty -%}
+          <dd><span class="chill-no-data-statement">{{ 'No comment associated'|trans }}</span></dd>
+      {%- else -%}
+          <dd>{{ entity.comment|chill_entity_render_box }}</dd>
+      {%- endif -%}
+    {% endif %}
+
+    {% if t.documentsVisible and entity.documents|length > 0 %}
+      <dt>{{ 'Documents'|trans }}</dt>
+      <dd>
+        <ul>
+        {% for d in entity.documents %}
+          <li>{{ m.download_button(d) }}</li>
+        {% endfor %}
+        </ul>
+      </dd>
+    {% endif %}
+
+    {% if t.attendeeVisible %}
+    <dt class="inline">{{ 'Attendee'|trans }}</dt>
+    <dd>{% if entity.attendee is not null %}{% if entity.attendee %}{{ 'present'|trans|capitalize }} {% else %} {{ 'not present'|trans|capitalize }}{% endif %}{% else %}{{ 'None'|trans|capitalize }}{% endif %}</dd>
+    {% endif %}
+
+</dl>

 {% set person_id = null %}
 {% if person %}
@@ -217,41 +141,22 @@
        </a>
    </li>
    <li>
-        {% set showGroup = entity.accompanyingPeriod is not null and entity.accompanyingPeriod.hasUser and entity.accompanyingPeriod.user is not same as(app.user)  %}
-        <div class="{% if showGroup %}btn-group{% endif %}" {% if showGroup %}role="group"{% endif %}>
-            {% if showGroup %}
-                <button id="btnGroupNotifyButtons" type="button" class="btn btn-notify dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false">
-                    {{ 'notification.Notify'|trans }}
-                </button>
-                <ul class="dropdown-menu" aria-labelledby="btnGroupNotifyButtons">
-                    <li>
-                        <a class="dropdown-item" href="{{ chill_path_add_return_path('chill_main_notification_create', {'entityClass': 'Chill\\ActivityBundle\\Entity\\Activity', 'entityId': entity.id, 'tos': [entity.accompanyingPeriod.user.id]}) }}">
-                            {{ 'notification.Notify referrer'|trans }}
-                        </a>
-                    </li>
-                    <li>
-                        <a class="dropdown-item" href="{{ chill_path_add_return_path('chill_main_notification_create', {'entityClass': 'Chill\\ActivityBundle\\Entity\\Activity', 'entityId': entity.id}) }}">
-                            {{ 'notification.Notify any'|trans }}
-                        </a>
-                    </li>
-                </ul>
-            {% else %}
-                <a class="btn btn-notify" href="{{ chill_path_add_return_path('chill_main_notification_create', {'entityClass': 'Chill\\ActivityBundle\\Entity\\Activity', 'entityId': entity.id}) }}">
-                    {{ 'notification.Notify'|trans }}
-                </a>
-            {% endif %}
-        </div>
+        <a class="btn btn-update" href="{{ path('chill_activity_activity_edit', { 'id': entity.id, 'person_id': person_id, 'accompanying_period_id': accompanying_course_id }) }}">
+            {{ 'Edit'|trans }}
+        </a>
    </li>
-    {% if is_granted('CHILL_ACTIVITY_UPDATE', entity) %}
-        <li>
-            <a href="{{ path('chill_activity_activity_edit', { 'id': entity.id, 'person_id': person_id, 'accompanying_period_id': accompanying_course_id }) }}"
-               class="btn btn-update">{{ 'Edit'|trans }}</a>
-        </li>
-    {% endif %}
+
+    {# TODO
    {% if is_granted('CHILL_ACTIVITY_DELETE', entity) %}
+    #}
+
    <li>
-        <a href="{{ path('chill_activity_activity_delete', { 'id': entity.id, 'person_id' : person_id, 'accompanying_period_id': accompanying_course_id } ) }}"
-           class="btn btn-delete" title="{{ 'Delete'|trans }}"></a>
+        <a href="{{ path('chill_activity_activity_delete', { 'id': entity.id, 'person_id' : person_id, 'accompanying_period_id': accompanying_course_id } ) }}" class="btn btn-delete">
+            {{ 'Delete'|trans }}
+        </a>
    </li>
+
+    {#
    {% endif %}
+    #}
 </ul>
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/showAccompanyingCourse.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/showAccompanyingCourse.html.twig
@@ -4,26 +4,12 @@

 {% block title 'Show the activity'|trans %}

-{% block js %}
-    {{ parent() }}
-    {{ encore_entry_script_tags('mod_notification_toggle_read_status') }}
-    {{ encore_entry_script_tags('mod_async_upload') }}
-{% endblock %}
-
-{% block css %}
-    {{ parent() }}
-    {{ encore_entry_link_tags('mod_notification_toggle_read_status') }}
-    {{ encore_entry_link_tags('mod_async_upload') }}
-{% endblock %}
-
 {% import 'ChillActivityBundle:ActivityReason:macro.html.twig' as m %}

 {% block content -%}
 <div class="activity-show">
+
    {% include 'ChillActivityBundle:Activity:show.html.twig' with {'context': 'accompanyingCourse'} %}
+
 </div>
 {% endblock content %}
-
-{% block block_post_menu %}
-<div class="post-menu pt-4"></div>
-{% endblock %}
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/showInNotification.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/showInNotification.html.twig
@@ -1,27 +1,2 @@
-{% macro recordAction(activity) %}
-    <li>
-        <a href="{{ path('chill_activity_activity_show', {'id': activity.id }) }}"
-           class="btn btn-show" title="{{ 'Show the activity'|trans }}"></a>
-    </li>
-{% endmacro %}

-{% if activity is not null %}
-    <div class="flex-table">
-        {% if is_granted('CHILL_ACTIVITY_SEE', activity) %}
-            {% include 'ChillActivityBundle:Activity:_list_item.html.twig' with {
-                'recordAction': _self.recordAction(activity),
-                'context': 'accompanyingCourse',
-                'itemBlocClass': 'bg-chill-llight-gray'
-            } %}
-        {% else %}
-            <div class="alert alert-warning border-warning border-1">
-                {{ 'This is the minimal activity data'|trans ~ ': ' ~ activity.id }}<br>
-                {{ 'you are not allowed to see it details'|trans }}
-            </div>
-        {% endif %}
-    </div>
-{% else %}
-    <div class="alert alert-warning border-warning border-1">
-        {{ 'You get notified of an activity which does not exists any more'|trans }}
-    </div>
-{% endif %}
+<a href="{{ path('chill_activity_activity_show', {'id': notification.relatedEntityId })  }}">Go to Activity</a>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Julie Lenaerts	85e1754af0	patchOnTheFly improved	2021-12-10 17:16:45 +01:00
Julie Lenaerts	e94bbc1271	further conversions to general makeFetch and toasts	2021-12-01 10:43:18 +01:00
Julie Lenaerts	fb9df1dba0	Merge branch 'convert_to_makeFetch' of gitlab.com:Chill-Projet/chill-bundles into convert_to_makeFetch	2021-11-30 15:03:01 +01:00
Julie Lenaerts	a579ff96a1	further transitioning to using the general makeFetch method everywhere + toasts	2021-11-30 14:51:20 +01:00
Julie Lenaerts	cb1002ca04	further transitioning to using the general makeFetch method everywhere + toasts	2021-11-30 11:31:20 +01:00