unresolved! temporary disable deprecated appendScopeChoices function in reportType form

Fix syntax in ReportController
resolve center in Report Controller
2026-05-05 20:13:50 +00:00 · 2023-03-29 13:49:10 +02:00 · 2023-03-29 13:48:24 +02:00 · 2023-03-29 13:47:34 +02:00 · 2023-03-23 12:48:37 +01:00 · 2023-03-23 11:23:14 +01:00
3126 changed files with 92629 additions and 68619 deletions
@@ -18,3 +18,8 @@ max_line_length = 80

 [COMMIT_EDITMSG]
 max_line_length = 0
+
+[*.{js, vue, ts}]
+indent_size = 2
+indent_style = space
+
@@ -1,64 +0,0 @@
-##
-##  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
@@ -1,8 +1,11 @@
 .composer/*
+composer
 composer.phar
 composer.lock
 docs/build/
+node_modules/*
 .php_cs.cache
+.cache/*

 ###> symfony/framework-bundle ###
 /.env.local
@@ -22,3 +25,6 @@ docs/build/

 /.php-cs-fixer.cache
 /.idea/
+/.psalm/
+
+node_modules/*
@@ -29,6 +29,7 @@ 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
@@ -78,6 +79,7 @@ psalm_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:
@@ -1,15 +1,14 @@
 <?php

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

-declare(strict_types=1);
-
-/** @var \drupol\PhpCsFixerConfigsPhp\Config\Php73 $config */
 $config = require __DIR__ . '/tests/app/vendor/drupol/php-conventions/config/php73/php_cs_fixer.config.php';

 $config
@@ -11,16 +11,291 @@ and this project adheres to
 ## Unreleased

 <!-- write down unreleased development here -->
-* renommer "dossier numéro" en "parcours numéro" dans les résultats de recherche
-* renomme date de début en date d'ouverture dans le formulaire parcours
-
+* [person][export] Fixed: rename the alias for `accompanying_period` to `acp` in filter associated with person
+* [activity][export] Feature: improve label for aliases in "Filter by activity type"
+* [activity][export] DX/Feature: use of an `ActivityTypeRepositoryInterface` instead of the old-style EntityRepository
+* [person][export] Fixed: some inconsistency with date filter on accompanying courses
+* [person][export] Fixed: use left join for related entities in accompanying course aggregators
+* [workflow] Feature: allow user to copy and send manually the access link for the workflow
+* [workflow] Feature: show the email addresses that received an access link for the workflow

 ## Test releases

+### 2.0.0-beta2
+
+* [workflow]: Fixed: the notification is sent when the user is added to the first step.
+* [budget] Feature: allow to desactivate some charges and resources, adding an `active` key in the configuration
+* [person] Feature: on Evaluation, allow to configure an URL from the admin
+
+### 2022-06
+
+* [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)
+* [social_action]: only show active objectives (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/625)
+* [household]: Reposition and cut button for enfant hors menage have been deleted (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/620)
+* [admin]: Add crud for composition type in admin (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/611)
+* [social_action]: only show active objectives (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/625)
+
+## 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)
+
+
+### 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

-[fast_actions] improve fast-actions buttons override mechanism, fix https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/413
-[homepage widget] add vue homepage_widget with asynchone loading, give a global view resume of the user concerned actions, notifications, etc.  
 * [person] accompanying course: optimisation: do not fetch some resources for the banner (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/409)
 * [person] accompanying course: close modal when edit participation (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/420)
 * [person] accompanying course: treat validation error when editing on-the-fly entities (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/420)
@@ -31,7 +306,6 @@ and this project adheres to
 * [user]: page with accompanying periods to which is user is referent (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/408)
 * [person] age added to renderstring + renderbox/ vue component created to display person text (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/389)
 * [household member editor] allow to push to existing household
-* [workflow][notification] improve how notifications and workflows are 'attached' to entities: contextual list, counter, buttons and vue modal


 ### test release 2021-01-28
@@ -67,7 +341,7 @@ and this project adheres to
 * [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] 
+* [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
@@ -225,6 +499,7 @@ 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
@@ -2,7 +2,14 @@

 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:
@@ -146,19 +153,20 @@ 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_bundle_entite_action`
+`chill_(api|crud)_bundle_(api)_entite_action`

 1. d'abord chill_ (pour tous les modules chill)
-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`, ...)
+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`, ...)

-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`)
+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`)

 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.

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

 Les URL respectent également une convention:

@@ -219,6 +227,14 @@ 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
@@ -9,31 +9,40 @@
    ],
    "require": {
        "php": "^7.4",
+        "ext-json": "*",
+        "ext-openssl": "*",
+        "ext-redis": "*",
        "champs-libres/async-uploader-bundle": "dev-sf4#d57134aee8e504a83c902ff0cf9f8d36ac418290",
-        "champs-libres/wopi-bundle": "dev-master#59b468503b9413f8d588ef9e626e7675560db3d8",
-        "champs-libres/wopi-lib": "dev-master#0e1da19bb6de820080b8651867a7e475be590060",
+        "champs-libres/wopi-bundle": "dev-master@dev",
+        "champs-libres/wopi-lib": "dev-master@dev",
        "doctrine/doctrine-bundle": "^2.1",
        "doctrine/doctrine-migrations-bundle": "^3.0",
-        "doctrine/orm": "^2.7",
+        "doctrine/orm": "^2.13.0",
        "erusev/parsedown": "^1.7",
        "graylog2/gelf-php": "^1.5",
        "knplabs/knp-menu-bundle": "^3.0",
        "knplabs/knp-time-bundle": "^1.12",
+        "knpuniversity/oauth2-client-bundle": "^2.10",
        "league/csv": "^9.7.1",
+        "lexik/jwt-authentication-bundle": "^2.16",
        "nyholm/psr7": "^1.4",
-        "ocramius/package-versions": "^1.10",
+        "ocramius/package-versions": "^1.10 || ^2",
+        "odolbeau/phone-number-bundle": "^3.6",
+        "ovh/ovh": "^3.0",
        "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-client": "^4.4 || ^5",
+        "symfony/http-foundation": "^4.4",
        "symfony/intl": "^4.4",
        "symfony/mailer": "^5.4",
+        "symfony/messenger": "^5.4",
        "symfony/mime": "^5.4",
        "symfony/monolog-bundle": "^3.5",
        "symfony/security-bundle": "^4.4",
@@ -46,6 +55,7 @@
        "symfony/webpack-encore-bundle": "^1.11",
        "symfony/workflow": "^4.4",
        "symfony/yaml": "^4.4",
+        "thenetworg/oauth2-azure": "^2.0",
        "twig/extra-bundle": "^3.0",
        "twig/intl-extra": "^3.0",
        "twig/markdown-extra": "^3.3",
@@ -65,8 +75,7 @@
        "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/var-dumper": "^4.4"
    },
    "conflict": {
        "symfony/symfony": "*"
@@ -93,7 +102,8 @@
    "autoload-dev": {
        "psr-4": {
            "App\\": "tests/app/src/",
-            "Chill\\DocGeneratorBundle\\Tests\\": "src/Bundle/ChillDocGeneratorBundle/tests"
+            "Chill\\DocGeneratorBundle\\Tests\\": "src/Bundle/ChillDocGeneratorBundle/tests",
+            "Chill\\WopiBundle\\Tests\\": "src/Bundle/ChillDocGeneratorBundle/tests"
        }
    },
    "config": {
@@ -102,7 +112,8 @@
            "ergebnis/composer-normalize": true,
            "ocramius/package-versions": true,
            "phpro/grumphp": true,
-            "phpstan/extension-installer": true
+            "phpstan/extension-installer": true,
+            "roave/you-are-using-it-wrong": true
        },
        "bin-dir": "bin",
        "optimize-autoloader": true,
@@ -1,14 +1,14 @@
 <?php

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

-declare(strict_types=1);
-
 namespace Chill\PersonBundle\Export\Filter;

 use Chill\MainBundle\Export\ExportElementValidatedInterface;
@@ -1,14 +1,14 @@
 <?php

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

-declare(strict_types=1);
-
 namespace Chill\PersonBundle\Export\Export;

 use Chill\MainBundle\Export\ExportInterface;
@@ -18,7 +18,6 @@ use Chill\PersonBundle\Security\Authorization\PersonVoter;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Query;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\Security\Core\Role\Role;

 class CountPerson implements ExportInterface
 {
@@ -73,9 +72,9 @@ class CountPerson implements ExportInterface
        return ['export_result'];
    }

-    public function getResult($qb, $data)
+    public function getResult($query, $data)
    {
-        return $qb->getQuery()->getResult(Query::HYDRATE_SCALAR);
+        return $query->getQuery()->getResult(Query::HYDRATE_SCALAR);
    }

    public function getTitle()
@@ -106,9 +105,9 @@ class CountPerson implements ExportInterface
        return $qb;
    }

-    public function requiredRole()
+    public function requiredRole(): string
    {
-        return new Role(PersonVoter::STATS);
+        return PersonVoter::STATS;
    }

    public function supportsModifiers()
@@ -0,0 +1,93 @@
+
+.. Copyright (C)  2014-2023 Champs Libres Cooperative SCRLFS
+    Permission is granted to copy, distribute and/or modify this document
+    under the terms of the GNU Free Documentation License, Version 1.3
+    or any later version published by the Free Software Foundation;
+    with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
+    A copy of the license is included in the section entitled "GNU
+    Free Documentation License".
+
+.. _cronjob:
+
+Cron jobs
+*********
+
+Some tasks must be executed regularly: refresh some materialized views, remove old data, ...
+
+For this purpose, one can programmatically implements a "cron job", which will be scheduled by a specific command.
+
+The command :code:`chill:cron-job:execute`
+==========================================
+
+The command :code:`chill:cron-job:execute` will schedule a task, one by one. In a classical implementation, it should
+be executed every 15 minutes (more or less), to ensure that every task can be executed.
+
+.. warning::
+
+   This command should not be executed in parallel. The installer should ensure that two job are executed concurrently.
+
+How to implements a cron job ?
+==============================
+
+Implements a :code:`Chill\MainBundle\Cron\CronJobInterface`. Here is an example:
+
+.. code-block:: php
+
+    namespace Chill\MainBundle\Service\Something;
+
+    use Chill\MainBundle\Cron\CronJobInterface;
+    use Chill\MainBundle\Entity\CronJobExecution;
+    use DateInterval;
+    use DateTimeImmutable;
+
+    class MyCronJob implements CronJobInterface
+    {
+        public function canRun(?CronJobExecution $cronJobExecution): bool
+        {
+            // the parameter $cronJobExecution contains data about the last execution of the cronjob
+            // if it is null, it should be executed immediatly
+            if (null === $cronJobExecution) {
+                return true;
+            }
+
+            if ($cronJobExecution->getKey() !== $this->getKey()) {
+                throw new UnexpectedValueException();
+            }
+
+            // this cron job should be executed if the last execution is greater than one day, but only during the night
+
+            $now = new DateTimeImmutable('now');
+
+            return $cronJobExecution->getLastStart() < $now->sub(new DateInterval('P1D'))
+                && in_array($now->format('H'), self::ACCEPTED_HOURS, true)
+                // introduce a random component to ensure a roll of task execution when multiple instances are hosted on same machines
+                && mt_rand(0, 5) === 0;
+        }
+
+        public function getKey(): string
+        {
+            return 'arbitrary-and-unique-key';
+        }
+
+        public function run(): void
+        {
+            // here, we execute the command
+        }
+    }
+
+How are cron job scheduled ?
+============================
+
+If the command :code:`chill:cron-job:execute` is run with one or more :code:`job` argument, those jobs are run, **without checking that the job can run** (the method :code:`canRun` is not executed).
+
+If any :code:`job` argument is given, the :code:`CronManager` schedule job with those steps:
+
+* the tasks are ordered, with:
+   * a priority is given for tasks that weren't never executed;
+   * then, the tasks are ordered, the last executed are the first in the list
+* then, for each tasks, and in the given order, the first task where :code:`canRun` return :code:`TRUE` will be executed.
+
+The command :code:`chill:cron-job:execute` execute **only one** task.
+
+
+
@@ -10,17 +10,17 @@
 Exports
 *******

-Export is an important issue for the Chill software : users should be able to :
+Export is an important issue within the Chill software : users should be able to :

 - compute statistics about their activity ;
- list "things" which make part of their activities.
+- list "things" which are a part of their activities.

 The `main bundle`_ provides a powerful framework to build custom queries with re-usable parts across differents bundles.

 .. contents:: Table of content
   :local:

-.. seealso:: 
+.. seealso::

   `The issue where this framework was discussed <https://git.framasoft.org/Chill-project/Chill-Main/issues/9>`_
      Provides some information about the pursued features and architecture.
@@ -32,37 +32,37 @@ Concepts
 Some vocabulary: 3 "Export elements"
 ------------------------------------

-Four terms are used for this framework : 
+Four terms are used for this framework :

-exports
-   provides some basic operation on the date. Two kind of exports are available : 
+Exports
+   provide some basic operation on the data. Two kinds of exports are available :

   - computed data : it may be "the number of people", "the number of activities", "the duration of activities", ...
-   - list data : it may be "the list of people", "the list of activity", ...
+   - list data : it may be "the list of people", "the list of activities", ...

-filters
-   The filters make a filter on the date: it removes some information the user doesn't want to introduce in the computation done by export. In other word, filters make a filter...
+Filters
+   The filters create a filter on the data: it removes some information the user doesn't want to introduce in the computation done by the export.

-   Example of filter: "people under 18 years olds", "activities between the 1st of June and the 31st December", ...
+   Example of a filter: "people under 18 years olds", "activities between the 1st of June and the 31st December", ...

-aggregators
-   The aggregator aggregates the data into some group (some software use the term 'bucket'). 
+Aggregators
+   The aggregator aggregates the data into some group (some software use the term 'bucket').

-   Example of aggregator : "group people by gender", "group people by nationality", "group activity by type", ...
+   Example of an aggregator : "group people by gender", "group people by nationality", "group activity by type", ...

-formatters
-   The formatters format the data into a :class:`Symfony\Component\HttpFoundation\Response`, which  will be returned "as is" by the controller to the web client. 
+Formatters
+   The formatters format the data into a :class:`Symfony\Component\HttpFoundation\Response`, which  will be returned "as is" by the controller to the web client.

-   Example of formatter: "format data as CSV", "format data as ods spreadsheet", ...
+   Example of a formatter: "format data as CSV", "format data as an ods spreadsheet", ...

 Anatomy of an export
 ---------------------

-An export may be explained as a sentence, where each part of this sentence refers to one or multiple exports element. Examples : 
+An export can be thought of as a sentence where each part of this sentence refers to one or multiple export elements. Examples :

 **Example 1**: Count the number of people having at least one activity in the last 12 month, and group them by nationality and gender, and format them in a CSV spreadsheet.

-Here : 
+Here :

 - *count the number of people* is the export part
 - *having at least one activity* is the filter part
@@ -72,10 +72,10 @@ Here :

 Note that :

- aggregators, filters, exports and aggregators are cross-bundle. Here the bundle *activity* provides a filter which apply on an export provided by the person bundle ;
- there may exists multiple aggregator or filter for one export. Currently, only one export is allowed.
+- Aggregators, filters, exports and formatters are cross-bundle. Here the bundle *activity* provides a filter which is applied on an export provided by the person bundle ;
+- Multiple aggregator or filter for one export may exist. Currently, only one export is allowed.

-The result might be : 
+The result might be :

 +-----------------------+----------------+---------------------------+
 | Nationality           | Gender         | Number of people          |
@@ -89,9 +89,9 @@ The result might be :
 | France                | Female         | 150                       |
 +-----------------------+----------------+---------------------------+

-**Example 2**: Count the average duration of an activity with type "meeting", which occurs between the 1st of June and the 31st of December, group them by week, and format the data in a OpenDocument spreadsheet.
+**Example 2**: Count the average duration of an activity with type "meeting", which occurs between the 1st of June and the 31st of December, group them by week, and format the data in an OpenDocument spreadsheet.

-Here : 
+Here :

 - *count the average duration of an activity* is the export part
 - *activity with type meeting* is a filter part
@@ -102,7 +102,7 @@ Here :
 The result might be :

 +-----------------------+----------------------+
-| Week                  | Number of activities | 
+| Week                  | Number of activities |
 +=======================+======================+
 | 2015-10               | 10                   |
 +-----------------------+----------------------+
@@ -116,77 +116,77 @@ The result might be :
 Authorization and exports
 -------------------------

-Exports, filters and aggregators should not make see data the user is not allowed to see.
+Exports, filters and aggregators should not show data the user is not allowed to see within the application.

 In other words, developers are required to take care of user authorization for each export.

-It should exists a special role that should be granted to users which are allowed to build exports. For more simplicity, this role should apply on center, and should not requires special circles.
+There should be a specific role that grants permission to users who are allowed to build exports. For more simplicity, this role should apply on a center, and should not require special circles.

-How does the magic works ?
+How does the magic work ?
 ===========================

 To build an export, we rely on the capacity of the database to execute queries with aggregate (i.e. GROUP BY) and filter (i.e. WHERE) instructions.

 An export is an SQL query which is initiated by an export, and modified by aggregators and filters.

-.. note:: 
+.. note::

   **Example**: Count the number of people having at least one activity in the last 12 month, and group them by nationality and gender

-   1. The report initiate the query 
+   1. The report initiates the query

   .. code-block:: SQL

      SELECT count(people.*) FROM people

-   2. The filter add a where and join clause : 
+   2. The filter adds a where and join clause :

   .. code-block:: SQL

-      SELECT count(people.*) FROM people 
-         RIGHT JOIN activity 
+      SELECT count(people.*) FROM people
+         RIGHT JOIN activity
         WHERE activity.date IS BETWEEN now AND 6 month ago

-   3. The aggregator "nationality" add a GROUP BY clause and a column in the SELECT statement: 
+   3. The aggregator "nationality" adds a GROUP BY clause and a column in the SELECT statement:

   .. code-block:: sql

-      SELECT people.nationality, count(people.*) FROM people 
-         RIGHT JOIN activity 
-         WHERE activity.date IS BETWEEN now AND 6 month ago 
+      SELECT people.nationality, count(people.*) FROM people
+         RIGHT JOIN activity
+         WHERE activity.date IS BETWEEN now AND 6 month ago
         GROUP BY nationality

-   4. The aggregator "gender" do the same job as the nationality aggregator : it adds a GROUP BY clause and a column in the SELECT statement : 
+   4. The aggregator "gender" does the same job as the nationality aggregator : it adds a GROUP BY clause and a column in the SELECT statement :

   .. code-block:: sql

-      SELECT people.nationality, people.gender, count(people.*) 
-         FROM people RIGHT JOIN activity 
-         WHERE activity.date IS BETWEEN now AND 6 month ago 
+      SELECT people.nationality, people.gender, count(people.*)
+         FROM people RIGHT JOIN activity
+         WHERE activity.date IS BETWEEN now AND 6 month ago
         GROUP BY nationality, gender

-Each filter, aggregator and filter may collect parameters from the user by providing a form. This form is appended to the export form. Here is an example.
+Each filter, aggregator and filter may collect parameters from the user through a form. This form is appended to the export form. Here is an example.

 .. figure:: /_static/screenshots/development/export_form-fullpage.png

-   The screenshot show the export form for ``CountPeople`` (Nombre de personnes). The filter by date of birth is checked (*Filtrer par date de naissance de la personne*), which allow to show a subform, which is provided by the :class:`Chill\PersonBundle\Export\Filter\BirthdateFilter`. The other filter, which are unchecked, does not show the subform.
+   The screenshot shows the export form for ``CountPeople`` (Nombre de personnes). The filter by date of birth is checked (*Filtrer par date de naissance de la personne*), which triggers a subform, which is provided by the :class:`Chill\PersonBundle\Export\Filter\BirthdateFilter`. The other unchecked filter does not show the subform.

-   Two aggregators are also checked : by Country of birth (*Aggréger les personnes par pays de naissance*, corresponding class is :class:`Chill\PersonBundle\Export\Aggregator\CountryOfBirthAggregator`, which also open a subform. The aggregator by gender (*Aggréger les personnes par genre*) is also checked, but there is no corresponding subform.
+   Two aggregators are also checked : by Country of birth (*Aggréger les personnes par pays de naissance*, the corresponding class is :class:`Chill\PersonBundle\Export\Aggregator\CountryOfBirthAggregator`, which also triggers a subform. The aggregator by gender (*Aggréger les personnes par genre*) is also checked, but there is no corresponding subform.

 The Export Manager
 ------------------

-The Export manager (:class:`Chill\MainBundle\Export\ExportManager` is the central class which register all exports, aggregators, filters and formatters.
+The Export manager (:class:`Chill\MainBundle\Export\ExportManager` is the central class which registers all exports, aggregators, filters and formatters.

-The export manager is also responsible for orchestrating the whole export process, producing a :class:`Symfony\FrameworkBundle\HttpFoundation\Request` to each export request.
+The export manager is also responsible for orchestrating the whole export process, producing a :class:`Symfony\FrameworkBundle\HttpFoundation\Request` for each export request.


 The export form step
 --------------------

-The form step allow to build a form, aggregating different parts of the module.
+The form step allows you to build a form, combining different parts of the module.

-The building of forms is separated between different subform, which are responsible for rendering their part of the form (aggregators, filters, and export). 
+The building of forms is split into different subforms, where each one is responsible for rendering their part of the form (aggregators, filters, and export).

 .. figure:: /_static/puml/exports/form_steps.png
   :scale: 40%
@@ -194,12 +194,12 @@ The building of forms is separated between different subform, which are responsi
 The formatter form step
 -----------------------

-The formatter form is processed *after* the user filled the export form. It is built the same way, but receive in parameters the data entered by the user on the previous step (i.e. export form). It may then adapt it accordingly (example: show a list of columns selected in aggregators).
+The formatter form is processed *after* the user filled the export form. It is built the same way, but receives the data entered by the user on the previous step as parameters (i.e. export form). It may then adapt it accordingly (example: show a list of columns selected in aggregators).

 Processing the export
 ---------------------

-The export process may be explained by this schema :
+The export process can be explained by this schema :

 .. figure:: /_static/puml/exports/processing_export.png
   :scale: 40%
@@ -219,20 +219,20 @@ This is an example of the ``CountPerson`` export :
   :language: php
   :linenos:

-* **Line 36**: the ``getType`` function return a string. This string will be used to find the aggregtors and filters which will apply to this export.
-* **Line 41**: a simple description to help user to understand what your export does.
+* **Line 36**: the ``getType`` function returns a string. This string will be used to find the aggregtors and filters which will apply to this export.
+* **Line 41**: a simple description to help users understand what your export does.
 * **Line 46**: The title of the export. A summary of what your export does.
-* **Line 51**: The list of roles requires to execute this export.
+* **Line 51**: The list of roles required to execute this export.
 * **Line 56**: We initiate the query here...
-* **Line 59**: We have to filter the query with centers the users checked in the form. We process the $acl variable to get all ``Center`` object in one array
-* **Line 63**: We create the query, with a query builder.
-* **Line 74**: We simply returns the result, but take care of hydrating the results as an array.
-* **Line 103**: return the list of formatters types which are allowed to apply on this filter
+* **Line 59**: We have to filter the query with centers the users checked in the form. We process the $acl variable to get all ``Center`` objects in one array
+* **Line 63**: We create the query with a query builder.
+* **Line 74**: We return the result, but make sure to hydrate the results as an array.
+* **Line 103**: return the list of formatter types which are allowed to be applied on this filter

 Filters
 -------

-This is an example of the *filter by birthdate*. This filter ask some information in a form (`buildForm` is not empty), and this form must be validated. To performs this validations, we implement a new Interface: :class:`Chill\MainBundle\Export\ExportElementValidatedInterface`:
+This is an example of the *filter by birthdate*. This filter asks some information through a form (`buildForm` is not empty), and this form must be validated. To perform this validation, we implement a new Interface: :class:`Chill\MainBundle\Export\ExportElementValidatedInterface`:

 .. literalinclude:: /_static/code/exports/BirthdateFilter.php
   :language: php
@@ -34,6 +34,7 @@ As Chill rely on the `symfony <http://symfony.com>`_ framework, reading the fram
    Useful snippets <useful-snippets.rst>
    manual/index.rst
    Assets <assets.rst>
+    Cron Jobs <cronjob.rst>

 Layout and UI
 **************
@@ -32,7 +32,7 @@ Then, render the pagination using the dedicated twig function.

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

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

   <table>

@@ -1,14 +1,14 @@
 <?php

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

-declare(strict_types=1);
-
 namespace Chill\MyBundle\Controller;

 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
@@ -1,14 +1,14 @@
 <?php

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

-declare(strict_types=1);
-
 namespace Chill\HealthBundle\Controller;

 use Chill\HealthBundle\Security\Authorization\ConsultationVoter;
@@ -156,7 +156,7 @@ This layout extend `ChillMainBundle::layoutWithVerticalMenu.html.twig` add the p

 It proposes 1 new block :

-* personcontent
+* content

  * where to display the information of the person

@@ -1,14 +1,14 @@
 <?php

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

-declare(strict_types=1);
-
 namespace Chill\MainBundle\DependencyInjection;

 use Chill\MainBundle\DependencyInjection\Widget\AddWidgetConfigurationTrait;
@@ -1,14 +1,14 @@
 <?php

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

-declare(strict_types=1);
-
 namespace Chill\MainBundle\DependencyInjection;

 use Chill\MainBundle\DependencyInjection\Widget\Factory\WidgetFactoryInterface;
@@ -1,14 +1,14 @@
 <?php

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

-declare(strict_types=1);
-
 namespace Chill\PersonBundle\Widget;

 use Chill\MainBundle\DependencyInjection\Widget\Factory\AbstractWidgetFactory;
@@ -1,14 +1,14 @@
 <?php

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

-declare(strict_types=1);
-
 namespace Chill\PersonBundle\Widget;

 use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
@@ -1,14 +1,14 @@
 <?php

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

-declare(strict_types=1);
-
 namespace Chill\PersonBundle\DependencyInjection;

 use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -14,6 +14,14 @@
 Installation & Usage
 ####################

+.. toctree::
+   :maxdepth: 2
+
+   prod.rst
+   load-addresses.rst
+   prod-calendar-sms-sending.rst
+   msgraph-configure.rst
+

 Requirements
 ************
@@ -21,31 +29,74 @@ Requirements
 - This project use `docker  <https://docker.com>`_ to be run. As a developer, use `docker-compose <https://docs.docker.com/compose/overview/>`_ to bootstrap a dev environment in a glance. You do not need any other dependencies ;
 - Make is used to automate scripts.

-Installation in development mode
-********************************
+Installation
+************
+
+If you plan to run chill in production:
+
+1. install it locally first, and check if everything is ok on your local machine;
+2. once ready, build the image from your local machine, and deploy them.
+
+If you want to develop some bundles, the first step is sufficient (until you deploy on production).
+

 1. Get the code
 ===============

-Clone or download the chill-app project and `cd` into the main directory.
+Clone or download the chill-skeleton project and `cd` into the main directory.


 .. code-block:: bash

-   git clone https://gitlab.com/Chill-Projet/chill-app.git
+   git clone https://gitlab.com/Chill-Projet/chill-skeleton-basic.git
   cd chill-app


 As a developer, the code will stay on your computer and will be executed in docker container. To avoid permission problem, the code should be run with the same uid/gid from your current user. This is why we get your current user id with the command ``id -u`` in each following scripts.

-2. Prepare your variables
-=========================
+2. Prepare composer to download the sources
+===========================================

-Have a look at the variable in ``.env.dist`` and in ``app/config/parameters.yml.dist`` and check if you need to adapt them. If they do not adapt with your need, or if some are missing: 
+As you are running in dev, you must configure an auth token for getting the source code.

-1. copy the file as ``.env``: ``cp .env.dist .env``
+.. warning
+
+   If you skip this part, the code will be downloaded from dist instead of source (with git repository). You will probably replace the source manually, but the next time you will run ```composer update```, your repository will be replaced and you might loose something.
+
+1. Create a personal access token from https://gitlab.com/-/profile/personal_access_tokens, with the `read_api` scope.
+2. add a file called ```.composer/auth.json``` with this content:
+
+   .. code-block:: json
+
+      {
+        "gitlab-token": {
+            "gitlab.com": "glXXX-XXXXXXXXXXXXXXXXXXXX"
+        }
+      }
+
+2. Prepare your variables and environment
+=========================================
+
+Copy ```docker-compose.override.dev.yml``` into ```docker-compose.override.yml```
+
+.. code-block:: bash
+
+   cp docker-compose.override.dev.template.yml docker-compose.override.yml
+
+2. Prepare your variables and docker-compose
+============================================
+
+Have a look at the variable in ``.env`` and check if you need to adapt them. If they do not adapt with your need, or if some are missing:
+
+1. copy the file as ``.env.local``: ``cp .env .env.local``
 2. you may replace some variables inside ``.env``

+Prepare also you docker-compose installation, and adapt it to your needs:
+
+1. If you plan to deploy on dev, copy the file ``docker-compose.override.dev.template.yml`` to ``docker-compose.override.yml``.
+2. adapt to your needs.
+
+
 **Note**: If you intend to use the bundle ``Chill-Doc-Store``, you will need to configure and install an openstack object storage container with temporary url middleware. You will have to configure `secret keys <https://docs.openstack.org/swift/latest/api/temporary_url_middleware.html#secret-keys>`_.

 3. Run the bootstrap script
@@ -60,10 +111,32 @@ This script can be run using `make`
 This script will :

 1. force docker-compose to, eventually, pull the base images and build the image used by this project ;
-2. run an install script to download `composer <https://getcomposer.org>`_ ; 
+2. run an install script to download `composer <https://getcomposer.org>`_ ;
 3. install the php dependencies
 4. build assets

+.. warning::
+
+   The script will work only if the binary ``docker-compose`` is located into your ``PATH``. If you use ``compose`` as a docker plugin,
+   you can simulate this binary by creating this file at (for instance), ``/usr/local/bin/docker-compose`` (and run ``chmod +x /usr/local/bin/docker-compose``):
+
+   .. code-block:: bash
+
+      #!/bin/bash
+
+      /usr/bin/docker compose "$@"
+
+
+.. note::
+
+   In some cases it can happen that an old image (chill_base_php or chill_php) stored in the docker cache will make the script fail. To solve this problem you have to delete the image and the container, before the make init :
+
+    .. code-block:: bash
+
+       docker-compose images php
+       docker rmi -f chill_php:prod
+       docker-compose rm php
+

 4. Start the project
 ====================
@@ -76,13 +149,20 @@ This script will :

 .. code-block:: bash

-   make migrate
+   # mount into to container
+   ./docker-php.sh
+   # and load fixtures
+   bin/console doctrine:migrations:migrate
+

 Chill will be available at ``http://localhost:8001.`` Currently, there isn't any user or data. To add fixtures, run

 .. code-block:: bash

-   docker-compose exec --user $(id -u) php bin/console doctrine:fixtures:load --purge-with-truncate
+   # mount into to container
+   ./docker-php.sh
+   # and load fixtures
+   bin/console doctrine:fixtures:load --purge-with-truncate

 There are several users available:

@@ -91,7 +171,8 @@ There are several users available:

 The password is always ``password``.

-Now, read `Operations` below.
+Now, read `Operations` below. For running in production, read `prod_`.
+

 Operations
 **********
@@ -99,7 +180,7 @@ Operations
 Build assets
 ============

-run those commands: 
+run those commands:

 .. code-block:: bash

@@ -111,8 +192,8 @@ How to execute the console ?
 .. code-block:: bash

   # if a container is running
-   docker-compose exec --user $(id -u) php bin/console
-   # if not 
+   ./docker-php.sh
+   # if not
   docker-compose run --user $(id -u) php bin/console

 How to create the database schema (= run migrations) ?
@@ -121,8 +202,9 @@ How to create the database schema (= run migrations) ?
 .. code-block:: bash

   # if a container is running
-   docker-compose exec --user $(id -u) php bin/console doctrine:migrations:migrate
-   # if not 
+   ./docker-php.sh
+   bin/console doctrine:migrations:migrate
+   # if not
   docker-compose run --user $(id -u) php bin/console doctrine:migrations:migrate


@@ -139,8 +221,9 @@ How to load fixtures ? (development mode only)
 .. code-block:: bash

   # if a container is running
-   docker-compose exec --user $(id -u) php bin/console doctrine:fixtures:load
-   # if not 
+   ./docker-php.sh
+   bin/console doctrine:fixtures:load
+   # if not
   docker-compose run --user $(id -u) php bin/console doctrine:fixtures:load

 How to open a terminal in the project
@@ -149,8 +232,8 @@ How to open a terminal in the project
 .. code-block:: bash

   # if a container is running
-   docker-compose exec --user $(id -u) php /bin/bash
-   # if not 
+   ./docker-php.sh
+   # if not
   docker-compose run --user $(id -u) php /bin/bash

 How to run composer ?
@@ -159,21 +242,22 @@ How to run composer ?
 .. code-block:: bash

   # if a container is running
-   docker-compose exec --user $(id -u) php ./composer.phar
-   # if not 
-   docker-compose run --user $(id -u) php ./composer.phar
+   ./docker-php.sh
+   composer
+   # if not
+   docker-compose run --user $(id -u) php composer

 How to access to PGADMIN ?
 ==========================

-Pgadmin is installed with docker-compose.
+Pgadmin is installed with docker-compose, and is available **only if you uncomment the appropriate lines into ``docker-compose.override.yml``.

 You can access it at ``http://localhost:8002``.

 Credentials:

- login: admin@chill.social
- password: password
+- login: from the variable you set into ``docker-composer.override.yml``
+- password: same :-)

 How to run tests ?
 ==================
@@ -182,30 +266,72 @@ Tests reside inside the installed bundles. You must `cd` into that directory, do

 **Note**: some bundle require the fixture to be executed. See the dedicated _how-tos_.

-Exemple, for running test inside `main` bundle: 
+Exemple, for running unit test inside `main` bundle:

 .. code-block:: bash

   # mount into the php image
-   docker-compose run --user $(id -u) php /bin/bash
+   ./docker-php.sh
   # cd into main directory
-   cd vendor/chill-project/main
+   cd vendor/chill-project/chill-bundles
   # download deps
-   php ../../../composer.phar install
+   git submodule init
+   git submodule update
+   composer install
   # run tests
-   /vendor/bin/phpunit
+   bin/phpunit src/Bundle/path/to/your/test
+
+Or for running tests to check code style and php conventions with csfixer and phpstan:
+
+.. code-block:: bash
+
+    # run code style fixer
+    bin/grumphp run --tasks=phpcsfixer
+    # run phpstan
+    bin/grumphp run --tasks=phpstan
+
+
+.. note::
+
+    To avoid phpstan block your commits:
+
+    .. code-block:: bash
+
+        git commit -n ...
+
+    To avoid phpstan block your commits permanently:
+
+    .. code-block:: bash
+
+        ./bin/grumphp git:deinit

 How to run webpack interactively
 ================================

 Executing :code:`bash docker-node.sh` will open a terminal in a node container, with volumes mounted.

-Build the documentation API
-===========================
+How to switch the branch for chill-bundles, and get new dependencies
+====================================================================

-A basic configuration of `sami <https://github.com/FriendsOfPhp/Sami>`_ is embedded within the project. 
+During development, you will switch to new branches for chill-bundles. As long as the dependencies are equals, this does not cause any problem. But sometimes, a new branch introduces a new dependency, and you must download it.

-A configuration file for `phpDocumentor <https://www.phpdoc.org>`_ is present.
+.. warning::
+
+   Ensure that you have gitlab-token ready before updating your branches. See above.
+
+In order to do that without pain, use those steps:
+
+0. Ensuire you have a token, set
+1. at the app's root, update the ``composer.json`` to your current branch:
+
+.. code-block:: json
+
+   {
+      "require": {
+          "chill-bundles": "dev-<my-branch>@dev"
+   }
+
+2. mount into the php container (``./docker-php.sh``), and run ``composer update``

 Error `An exception has been thrown during the rendering of a template ("Asset manifest file "/var/www/app/web/build/manifest.json" does not exist.").` on first run
 ====================================================================================================================================================================
@@ -219,8 +345,9 @@ Currently, to run this software in production, the *state of the art* is the fol

 1. Run the software locally and tweak the configuration to your needs ;
 2. Build the image and store them into a private container registry. This can be done using :code:`make build-and-push-image`.
-   
-   To be sure to target the correct container registry, you have to adapt the values ``IMAGE_NGINX`` and ``IMAGE_PHP`` date in the ``.env`` file.
+
+   To be sure to target the correct container registry, you have to adapt the image names into your ``docker-compose.override.yml`` file.
+3. Push the image on your registry, or upload them to the destination machine using ``docker image save`` and ``docker image load``.
 3. Run the image on your production server, using docker-compose or eventually docker stack. You have to customize the variable set in docker-compose.

   See also the :ref:`running-production-tips-and-tricks` below.
@@ -252,7 +379,7 @@ It is worth having an eye on the configuration of logstash container.
 Design principles
 *****************

-Why the DB URL is set in environment, and not in parameters.yml ?
+Why the DB URL is also set in environment, and not in .env file ?
 =================================================================

 Because, at startup, a script does check the db is up and, if not, wait for a couple of seconds before running ``entrypoint.sh``. For avoiding double configuration, the configuration of the PHP app takes his configuration from environment also (and it will be standard in future releases, with symfony 4.0).
@@ -0,0 +1,50 @@
+
+.. _addresses:
+
+Addresses
+*********
+
+Chill can store a list of geolocated address references, which are used to suggest address and ensure that the data is correctly stored.
+
+Those addresses may be load from a dedicated source.
+
+In France
+=========
+
+The address are loaded from the `BANO <https://bano.openstreetmap.fr/>`_. The postal codes are loaded from `the official list of
+postal codes <https://datanova.laposte.fr/explore/dataset/laposte_hexasmal/information/>`_
+
+.. code-block:: bash
+
+   # first, load postal codes
+   bin/console chill:main:postal-code:load:FR
+   # then, load all addresses, by departement (multiple departement can be loaded by repeating the departement code
+   bin/console chill:main:address-ref-from-bano 57 54 51
+
+In Belgium
+==========
+
+Addresses are prepared from the `BeST Address data <https://www.geo.be/catalog/details/ca0fd5c0-8146-11e9-9012-482ae30f98d9>`_.
+
+Postal code are loaded from this database. There is no need to load postal codes from another source (actually, this is strongly discouraged).
+
+The data are prepared for Chill (`See this repository <https://gitea.champs-libres.be/Chill-project/belgian-bestaddresses-transform/releases>`_).
+One can select postal code by his first number (:code:`1xxx` for postal codes from 1000 to 1999), or a limited list for development purpose.
+
+.. code-block:: bash
+
+   # load postal code from 1000 to 3999:
+   bin/console chill:main:address-ref-from-best-addresse 1xxx 2xxx 3xxx
+
+   # load only an extract (for dev purposes)
+   bin/console chill:main:address-ref-from-best-addresse extract
+
+   # load full addresses (discouraged)
+   bin/console chill:main:address-ref-from-best-addresse full
+
+.. note::
+
+   There is a possibility to load the full list of addresses is discouraged: the loading is optimized with smaller extracts.
+
+   Once you load the full list, it is not possible to load smaller extract: each extract loaded **after** will not
+   delete the addresses loaded with the full extract (and some addresses will be present twice).
@@ -0,0 +1,320 @@
+
+Configure Chill for calendar sync and SSO with Microsoft Graph (Outlook)
+========================================================================
+
+Chill offers the possibility to:
+
+* authenticate users using Microsoft Graph, with relatively small adaptations;
+* synchronize calendar in both ways (`see the user manual for a large description of the feature <https://gitea.champs-libres.be/Chill-project/manuals>`_).
+
+Both can be configured separately (synchronising calendars without SSO, or SSO without calendar). When calendar sync is configured without SSL, the user's email address is the key to associate Chill's users with Microsoft's ones.
+
+Configure SSO
+-------------
+
+On Azure side
+*************
+
+Configure an app with the Azure interface, and give it the name of your choice.
+
+Grab the tenant's ID for your app, which is visible on the main tab "Vue d'ensemble":
+
+.. figure:: ./saml_login_id_general.png
+
+This the variable which will be named :code:`SAML_IDP_APP_UUID`.
+
+Go to the "Single sign-on" ("Authentication unique") section. Choose "SAML" as protocol, and fill those values:
+
+.. figure:: ./saml_login_1.png
+
+1. The :code:`entityId` seems to be arbitrary. This will be your variable :code:`SAML_ENTITY_ID`;
+2. The url response must be your Chill's URL appended by :code:`/saml/acs`
+3. The only used attributes is :code:`emailaddress`, which must match the user's email one.
+
+.. figure:: ./saml_login_2.png
+
+You must download the certificate, as base64. The format for the download is :code:`cer`: you will remove the first and last line (the ones with :code:`-----BEGIN CERTIFICATE-----` and :code:`-----END CERTIFICATE-----`), and remove all the return line. The final result should be something as :code:`MIIAbcdef...XyZA=`.
+
+This certificat will be your :code:`SAML_IDP_X509_CERT` variable.
+
+The url login will be filled automatically with your tenant id.
+
+Do not forget to provider user's accesses to your app, using the "Utilisateurs et groupes" tab:
+
+.. figure:: ./saml_login_appro.png
+
+
+You must know have gathered all the required variables for SSO:
+
+.. code-block:: 
+
+   SAML_BASE_URL=https://test.chill.be # must be
+   SAML_ENTITY_ID=https://test.chill.be # must match the one entered
+   SAML_IDP_APP_UUID=42XXXXXX-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+   SAML_IDP_X509_CERT: MIIC...E8u3bk # truncated
+
+Configure chill app
+*******************
+
+* add the bundle :code:`hslavich/oneloginsaml-bundle`
+* add the configuration file (see example above)
+* configure the security part (see example above)
+* add a user SAML factory into your src, and register it
+
+
+.. code-block:: yaml
+
+   # config/packages/hslavich_onelogin.yaml
+
+   parameters:
+     saml_base_url: '%env(resolve:SAML_BASE_URL)%'
+     saml_entity_id: '%env(resolve:SAML_ENTITY_ID)%'
+     saml_idp_x509cert: '%env(resolve:SAML_IDP_X509_CERT)%'
+     saml_idp_app_uuid: '%env(resolve:SAML_IDP_APP_UUID)%'
+
+
+   hslavich_onelogin_saml:
+     # Basic settings
+     idp:
+       entityId: 'https://sts.windows.net/%saml_idp_app_uuid%/'
+       singleSignOnService:
+         url: 'https://login.microsoftonline.com/%saml_idp_app_uuid%/saml2'
+         binding: 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect'
+       singleLogoutService:
+         url: 'https://login.microsoftonline.com/%saml_idp_app_uuid%/saml2'
+         binding: 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect'
+       x509cert: '%saml_idp_x509cert%'
+     sp:
+       entityId: '%saml_entity_id%'
+       assertionConsumerService:
+         url: '%saml_base_url%/saml/acs'
+         binding: 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST'
+       singleLogoutService:
+         url: '%saml_base_url%/saml/'
+         binding: 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect'
+       privateKey: ''
+     # Optional settings.
+     baseurl: '%saml_base_url%/saml'
+     strict: true
+     debug: true
+     security:
+       nameIdEncrypted:       false
+       authnRequestsSigned:   false
+       logoutRequestSigned:   false
+       logoutResponseSigned:  false
+       wantMessagesSigned:    false
+       wantAssertionsSigned:  false
+       wantNameIdEncrypted:   false
+       requestedAuthnContext: true
+       signMetadata: false
+       wantXMLValidation: true
+       signatureAlgorithm: 'http://www.w3.org/2001/04/xmldsig-more#rsa-sha256'
+       digestAlgorithm: 'http://www.w3.org/2001/04/xmlenc#sha256'
+     contactPerson:
+       technical:
+         givenName: 'Tech User'
+         emailAddress: 'techuser@example.com'
+       support:
+         givenName: 'Support User'
+         emailAddress: 'supportuser@example.com'
+     organization:
+       en:
+         name: 'Example'
+         displayname: 'Example'
+         url: 'http://example.com'
+
+
+.. code-block:: yaml
+
+   # config/security.yaml
+   # merge this with other existing configurations
+
+   security:
+
+
+       providers:
+           saml_provider:
+               # Loads user from user repository
+               entity:
+                   class: Chill\MainBundle\Entity\User
+                   property: username
+
+       firewalls:
+
+
+           default:
+               # saml part:
+               saml:
+                   username_attribute: http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress
+                   # weird behaviour in dev environment... configuration seems different
+                   # username_attribute: http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name
+                   # Use the attribute's friendlyName instead of the name
+                   use_attribute_friendly_name: false
+                   user_factory: user_from_saml_factory
+                   persist_user: true
+                   check_path: saml_acs
+                   login_path: saml_login
+               logout:
+                   path: /saml/logout
+
+
+.. code-block:: php
+
+   // src/Security/SamlFactory.php
+
+   namespace App\Security;
+
+   use Chill\MainBundle\Entity\User;
+   use Hslavich\OneloginSamlBundle\Security\Authentication\Token\SamlTokenInterface;
+   use Hslavich\OneloginSamlBundle\Security\User\SamlUserFactoryInterface;
+
+   class UserSamlFactory implements SamlUserFactoryInterface
+   {
+       public function createUser(SamlTokenInterface $token)
+       {
+           $attributes = $token->getAttributes();
+           $user = new User();
+           $user->setUsername($attributes['http://schemas.microsoft.com/identity/claims/displayname'][0]);
+           $user->setLabel($attributes['http://schemas.microsoft.com/identity/claims/displayname'][0]);
+           $user->setPassword('');
+           $user->setEmail($attributes['http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress'][0]);
+           $user->setAttributes($attributes);
+
+           return $user;
+       }
+   }
+
+
+
+Configure sync
+--------------
+
+The sync processe might be configured in the same app, or into a different app.
+
+The synchronization processes use Oauth2.0 for authentication and authorization.
+
+.. note::
+
+   Two flows are in use:
+
+   * we authenticate "on behalf of a user", to allow users to see their own calendar or other user's calendar into the web interface. 
+
+     Typically, when the page is loaded, Chill first check that an authorization token exists. If not, the user is redirected to Microsoft Azure for authentification and a new token is grabbed (most of the times, this is transparent for users). 
+
+   * Chill also acts "as a machine", to synchronize calendars with a daemon background.
+
+One can access the configuration using this screen (it is quite well hidden into the multiple of tabs):
+
+.. figure:: ./oauth_app_registration.png
+
+   You can find the oauth configuration on the "Securité > Autorisations" tab, and click on "application registration" (not translated).
+
+Add a redirection URI for you authentification:
+
+.. figure:: ./oauth_api_authentification.png
+
+   The URI must be "your chill public url" with :code:`/connect/azure/check` at the end.
+
+Allow some authorizations for your app:
+
+.. figure:: ./oauth_api_autorisees.png
+
+Take care of the separation between autorization "on behalf of a user" (déléguée), or "for a machine" (application).
+
+Some explanation:
+
+* Users must be allowed to read their user profile (:code:`User.Read`), and the profile of other users (:code:`User.ReadBasicAll`);
+* They must be allowed to read their calendar (:code:`Calendars.Read`), and the calendars shared with them (:code:`Calendars.Read.Shared`);
+
+The sync daemon must have write access:
+
+* the daemon must be allowed to read all users and their profile, to establish a link between them and the Chill's users: (:code:`Users.Read.All`);
+* it must also be allowed to read and write into the calendars (:code:`Calendars.ReadWrite.All`)
+* for sending invitation to other users, the permission (:code:`Mail.Send`) must be granted.
+
+At this step, you might choose to accept those permissions for all users, or let them do it by yourself.
+
+Grab your client id:
+
+.. figure:: ./oauth_api_client_id.png
+
+This will be your :code:`OAUTH_AZURE_CLIENT_ID` variable.
+
+
+Generate a secret:
+
+.. figure:: ./oauth_api_secret.png
+
+This will be your :code:`OAUTH_AZURE_CLIENT_SECRET` variable.
+
+And get you azure's tenant id, which is the same as the :code:`SAML_IDP_APP_UUID` (see above).
+
+Your variables will be:
+
+.. code-block::
+
+   OAUTH_AZURE_CLIENT_ID=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+   OAUTH_AZURE_CLIENT_TENANT=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+   OAUTH_AZURE_CLIENT_SECRET: 3-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+
+Then, configure chill:
+
+Enable the calendar sync with microsoft azure:
+
+.. code-block:: yaml
+
+   # config/packages/chill_calendar.yaml
+
+   chill_calendar:
+       remote_calendars_sync:
+           microsoft_graph:
+               enabled: true
+
+and configure the oauth client:
+
+.. code-block:: yaml
+
+   # config/packages/knp_oauth2_client.yaml
+   knpu_oauth2_client:
+       clients:
+           azure:
+               type: azure
+               client_id: '%env(OAUTH_AZURE_CLIENT_ID)%'
+               client_secret: '%env(OAUTH_AZURE_CLIENT_SECRET)%'
+               redirect_route: chill_calendar_remote_connect_azure_check
+               redirect_params: { }
+               tenant: '%env(OAUTH_AZURE_CLIENT_TENANT)%'
+               url_api: 'https://graph.microsoft.com/'
+               default_end_point_version: '2.0'
+
+
+You can now process for the first api authorization on the application side, (unless you did it in the Azure interface), and get a first token, by using :
+
+:code:`bin/console chill:calendar:msgraph-grant-admin-consent`
+
+This will generate a url that you can use to grant your app for your tenant. The redirection may fails in the browser, but this is not relevant: if you get an authorization token in the CLI, the authentication works.
+
+Run the processes to synchronize
+--------------------------------
+
+The calendar synchronization is processed using symfony messenger. It seems to be intersting to configure a queue (in the postgresql database it is the most simple way), and to run a worker for synchronization, at least in production.
+
+The association between chill's users and Microsoft's users is done by this cli command:
+
+.. code-block:: 
+
+   bin/console chill:calendar:msgraph-user-map-subscribe
+
+This command:
+
+* will associate the Microsoft's user metadata in our database;
+* and, most important, create a subscription to get notification when the user alter his calendar, to sync chill's event and ranges in sync.
+
+The subscription least at most 3 days. This command should be runned:
+
+* at least each time a user is added;
+* and, at least, every three days.
+
+In production, we advise to run it at least every day to get the sync working.
+
+
@@ -0,0 +1,27 @@
+
+Send short messages (SMS) with calendar bundle
+==============================================
+
+To activate the sending of messages, you should run this command on a regularly basis (using, for instance, a cronjob):
+
+.. code-block:: bash
+
+   bin/console chill:calendar:send-short-messages
+
+A transporter must be configured for the message to be effectively sent. 
+
+Configure OVH Transporter
+-------------------------
+
+Currently, this is the only one transporter available.
+
+For configuring this, simply add this config variable in your environment:
+
+```env
+SHORT_MESSAGE_DSN=ovh://applicationKey:applicationSecret@endpoint?consumerKey=xxxx&sender=yyyy&service_name=zzzz
+```
+
+In order to generate the application key, secret, and consumerKey, refers to their `documentation <https://docs.ovh.com/gb/en/api/first-steps-with-ovh-api/>`_.
+
+Before to be able to send your first sms, you must enable your account, grab some credits, and configure a sender. The service_name is an internal configuration generated by OVH.
+
@@ -0,0 +1,63 @@
+.. Copyright (C)  2014-2019 Champs Libres Cooperative SCRLFS
+    Permission is granted to copy, distribute and/or modify this document
+    under the terms of the GNU Free Documentation License, Version 1.3
+    or any later version published by the Free Software Foundation;
+    with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
+    A copy of the license is included in the section entitled "GNU
+    Free Documentation License".
+
+.. _prod:
+
+Installation for production
+###########################
+
+An installation use these services, which are deployed using docker containers:
+
+* a php-fpm image, which run the Php and Symfony code for Chill;
+* a nginx image, which serves the assets, and usually proxy the php requests to the fpm image;
+* a redis server, which stores the cache, sessions (this is currently hardcoded in the php image), and some useful keys (like wopi locks);
+* a postgresql database. The use of postgresql is mandatory;
+* a relatorio service, which transform odt templates to full documents (replacing the placeholders);
+
+Some external services:
+
+* (required) an openstack object store, configured with `temporary url <https://docs.openstack.org/swift/latest/api/temporary_url_middleware.html>` configured (no openstack users is required). This is currently the only way to store documents from chill;
+* a mailer service (SMTP)
+* (optional) a service for verifying phone number. Currently, only Twilio is possible;
+* (optional) a service for sending Short Messages (SMS). Currently, only Ovh is possible;
+
+The `docker-compose.yaml` file of chill app is a basis for a production install. The environment variable in the ```.env``` and ```.env.prod``` should be overriden by environment variables, or ```.env.local``` files.
+
+This should be adapted to your needs:
+
+* The image for php and nginx apps are pre-compiled images, with the default configuration and bundle. If they do not fullfill your needs, you should compile your own images.
+
+   .. TODO:
+
+      As the time of writing (2022-07-03) those images are not published yet.
+
+* Think about how you will backup your database. Some adminsys find easier to store database outside of docker, which might be easier to administrate or replicate.
+
+Cron jobs
+=========
+
+The command :code:`chill:cron-job:execute` should be executed every 15 minutes (more or less).
+
+This command should never be executed concurrently. It should be not have more than one process for a single instance.
+
+Post-install tasks
+==================
+
+- import addresses. See :ref:`addresses`.
+
+
+Tweak symfony messenger
+=======================
+
+Calendar sync is processed using symfony messenger.
+
+You can tweak the configuration
+
+Going further:
+
+* Configure the saml login and synchronisation with Outlook api
@@ -0,0 +1,63 @@
+Entity,Join,Attribute,Alias
+AccompanyingPeriod::class,,,acp
+,AccompanyingPeriodWork::class,acp.works,acpw
+,AccompanyingPeriodParticipation::class,acp.participations,acppart
+,Location::class,acp.administrativeLocation,acploc
+,ClosingMotive::class,acp.closingMotive,acpmotive
+,UserJob::class,acp.job,acpjob
+,Origin::class,acp.origin,acporigin
+,Scope::class,acp.scopes,acpscope
+,SocialIssue::class,acp.socialIssues,acpsocialissue
+,User::class,acp.user,acpuser
+AccompanyingPeriodWork::class,,,acpw
+,AccompanyingPeriodWorkEvaluation::class,acpw.accompanyingPeriodWorkEvaluations,workeval
+,User::class,acpw.referrers,acpwuser
+,SocialAction::class,acpw.socialAction,acpwsocialaction
+,Goal::class,acpw.goals,goal
+,Result::class,acpw.results,result
+AccompanyingPeriodParticipation::class,,,acppart
+,Person::class,acppart.person,partperson
+AccompanyingPeriodWorkEvaluation::class,,,workeval
+,Evaluation::class,workeval.evaluation,eval
+Goal::class,,,goal
+,Result::class,goal.results,goalresult
+Person::class,,,person
+,Center::class,person.center,center
+,HouseholdMember::class,partperson.householdParticipations,householdmember
+,MaritalStatus::class,person.maritalStatus,personmarital
+,VendeePerson::class,,vp
+,VendeePersonMineur::class,,vpm
+ResidentialAddress::class,,,resaddr
+,ThirdParty::class,resaddr.hostThirdParty,tparty
+ThirdParty::class,,,tparty
+,ThirdPartyCategory::class,tparty.categories,tpartycat
+HouseholdMember::class,,,householdmember
+,Household::class,householdmember.household,household
+,Person::class,householdmember.person,memberperson
+,,memberperson.center,membercenter
+Household::class,,,household
+,HouseholdComposition::class,household.compositions,composition
+Activity::class,,,activity
+,Person::class,activity.person,actperson
+,AccompanyingPeriod::class,activity.accompanyingPeriod,acp
+,Person::class,activity_person_having_activity.person,person_person_having_activity
+,ActivityReason::class,activity_person_having_activity.reasons,reasons_person_having_activity
+,ActivityType::class,activity.activityType,acttype
+,Location::class,activity.location,actloc
+,SocialAction::class,activity.socialActions,actsocialaction
+,SocialIssue::class,activity.socialIssues,actsocialssue
+,ThirdParty::class,activity.thirdParties,acttparty
+,User::class,activity.user,actuser
+,User::class,activity.users,actusers
+,ActivityReason::class,activity.reasons,actreasons
+,Center::class,actperson.center,actcenter
+ActivityReason::class,,,actreasons
+,ActivityReasonCategory::class,actreason.category,actreasoncat
+Calendar::class,,,cal
+,CancelReason::class,cal.cancelReason,calcancel
+,Location::class,cal.location,calloc
+,User::class,cal.user,caluser
+VendeePerson::class,,,vp
+,SituationProfessionelle::class,vp.situationProfessionelle,vpprof
+,StatutLogement::class,vp.statutLogement,vplog
+,TempsDeTravail::class,vp.tempsDeTravail,vptt
@@ -0,0 +1,74 @@
+# Export conventions
+
+
+Add condition with distinct alias on each export join clauses (Indicators + Filters + Aggregators)
+
+These are alias conventions :
+
+| Entity                                  | Join                                    | Attribute                                  | Alias                                  |
+|:----------------------------------------|:----------------------------------------|:-------------------------------------------|:---------------------------------------|
+| AccompanyingPeriod::class               |                                         |                                            | acp                                    |
+|                                         | AccompanyingPeriodWork::class           | acp.works                                  | acpw                                   |
+|                                         | AccompanyingPeriodParticipation::class  | acp.participations                         | acppart                                |
+|                                         | Location::class                         | acp.administrativeLocation                 | acploc                                 |
+|                                         | ClosingMotive::class                    | acp.closingMotive                          | acpmotive                              |
+|                                         | UserJob::class                          | acp.job                                    | acpjob                                 |
+|                                         | Origin::class                           | acp.origin                                 | acporigin                              |
+|                                         | Scope::class                            | acp.scopes                                 | acpscope                               |
+|                                         | SocialIssue::class                      | acp.socialIssues                           | acpsocialissue                         |
+|                                         | User::class                             | acp.user                                   | acpuser                                |
+|                                         | AccompanyingPeriopStepHistory::class    | acp.stepHistories                          | acpstephistories                       |
+| AccompanyingPeriodWork::class           |                                         |                                            | acpw                                   |
+|                                         | AccompanyingPeriodWorkEvaluation::class | acpw.accompanyingPeriodWorkEvaluations     | workeval                               |
+|                                         | User::class                             | acpw.referrers                             | acpwuser                               |
+|                                         | SocialAction::class                     | acpw.socialAction                          | acpwsocialaction                       |
+|                                         | Goal::class                             | acpw.goals                                 | goal                                   |
+|                                         | Result::class                           | acpw.results                               | result                                 |
+| AccompanyingPeriodParticipation::class  |                                         |                                            | acppart                                |
+|                                         | Person::class                           | acppart.person                             | partperson                             |
+| AccompanyingPeriodWorkEvaluation::class |                                         |                                            | workeval                               |
+|                                         | Evaluation::class                       | workeval.evaluation                        | eval                                   |
+| Goal::class                             |                                         |                                            | goal                                   |
+|                                         | Result::class                           | goal.results                               | goalresult                             |
+| Person::class                           |                                         |                                            | person                                 |
+|                                         | Center::class                           | person.center                              | center                                 |
+|                                         | HouseholdMember::class                  | partperson.householdParticipations         | householdmember                        |
+|                                         | MaritalStatus::class                    | person.maritalStatus                       | personmarital                          |
+|                                         | VendeePerson::class                     |                                            | vp                                     |
+|                                         | VendeePersonMineur::class               |                                            | vpm                                    |
+|                                         | CurrentPersonAddress::class             | person.currentPersonAddress                | currentPersonAddress (on a given date) |
+| ResidentialAddress::class               |                                         |                                            | resaddr                                |
+|                                         | ThirdParty::class                       | resaddr.hostThirdParty                     | tparty                                 |
+| ThirdParty::class                       |                                         |                                            | tparty                                 |
+|                                         | ThirdPartyCategory::class               | tparty.categories                          | tpartycat                              |
+| HouseholdMember::class                  |                                         |                                            | householdmember                        |
+|                                         | Household::class                        | householdmember.household                  | household                              |
+|                                         | Person::class                           | householdmember.person                     | memberperson                           |
+|                                         |                                         | memberperson.center                        | membercenter                           |
+| Household::class                        |                                         |                                            | household                              |
+|                                         | HouseholdComposition::class             | household.compositions                     | composition                            |
+| Activity::class                         |                                         |                                            | activity                               |
+|                                         | Person::class                           | activity.person                            | actperson                              |
+|                                         | AccompanyingPeriod::class               | activity.accompanyingPeriod                | acp                                    |
+|                                         | Person::class                           | activity\_person\_having\_activity.person  | person\_person\_having\_activity       |
+|                                         | ActivityReason::class                   | activity\_person\_having\_activity.reasons | reasons\_person\_having\_activity      |
+|                                         | ActivityType::class                     | activity.activityType                      | acttype                                |
+|                                         | Location::class                         | activity.location                          | actloc                                 |
+|                                         | SocialAction::class                     | activity.socialActions                     | actsocialaction                        |
+|                                         | SocialIssue::class                      | activity.socialIssues                      | actsocialssue                          |
+|                                         | ThirdParty::class                       | activity.thirdParties                      | acttparty                              |
+|                                         | User::class                             | activity.user                              | actuser                                |
+|                                         | User::class                             | activity.users                             | actusers                               |
+|                                         | ActivityReason::class                   | activity.reasons                           | actreasons                             |
+|                                         | Center::class                           | actperson.center                           | actcenter                              |
+|                                         | Person::class                           | activity.createdBy                         | actcreator                             |
+| ActivityReason::class                   |                                         |                                            | actreasons                             |
+|                                         | ActivityReasonCategory::class           | actreason.category                         | actreasoncat                           |
+| Calendar::class                         |                                         |                                            | cal                                    |
+|                                         | CancelReason::class                     | cal.cancelReason                           | calcancel                              |
+|                                         | Location::class                         | cal.location                               | calloc                                 |
+|                                         | User::class                             | cal.user                                   | caluser                                |
+| VendeePerson::class                     |                                         |                                            | vp                                     |
+|                                         | SituationProfessionelle::class          | vp.situationProfessionelle                 | vpprof                                 |
+|                                         | StatutLogement::class                   | vp.statutLogement                          | vplog                                  |
+|                                         | TempsDeTravail::class                   | vp.tempsDeTravail                          | vptt                                   |
@@ -24,6 +24,7 @@ parameters:
        - "/spec/"
        - "/var/"
        - "/vendor/"
+        - "/tests/app"

    # Psalm
    tasks.psalm.blocking: true
@@ -0,0 +1,67 @@
+{
+    "name": "chill",
+    "version": "2.0.0",
+    "devDependencies": {
+    "@alexlafroscia/yaml-merge": "^4.0.0",
+    "@apidevtools/swagger-cli": "^4.0.4",
+    "@babel/core": "^7.20.5",
+    "@babel/preset-env": "^7.20.2",
+    "@ckeditor/ckeditor5-build-classic": "^35.3.2",
+    "@ckeditor/ckeditor5-dev-utils": "^31.1.13",
+    "@ckeditor/ckeditor5-dev-webpack-plugin": "^31.1.13",
+    "@ckeditor/ckeditor5-markdown-gfm": "^35.3.2",
+    "@ckeditor/ckeditor5-theme-lark": "^35.3.2",
+    "@ckeditor/ckeditor5-vue": "^4.0.1",
+    "@symfony/webpack-encore": "^4.1.0",
+    "@tsconfig/node14": "^1.0.1",
+    "bindings": "^1.5.0",
+    "bootstrap": "^5.0.1",
+    "chokidar": "^3.5.1",
+    "fork-awesome": "^1.1.7",
+    "jquery": "^3.6.0",
+    "node-sass": "^8.0.0",
+    "popper.js": "^1.16.1",
+    "postcss-loader": "^7.0.2",
+    "raw-loader": "^4.0.2",
+    "sass-loader": "^13.0.0",
+    "select2": "^4.0.13",
+    "select2-bootstrap-theme": "0.1.0-beta.10",
+    "style-loader": "^3.3.1",
+    "ts-loader": "^9.3.1",
+    "typescript": "^4.7.2",
+    "vue-loader": "^17.0.0",
+    "webpack": "^5.75.0",
+    "webpack-cli": "^5.0.1"
+  },
+  "dependencies": {
+    "@fullcalendar/core": "^5.11.0",
+    "@fullcalendar/daygrid": "^5.11.0",
+    "@fullcalendar/interaction": "^5.11.0",
+    "@fullcalendar/list": "^5.11.0",
+    "@fullcalendar/timegrid": "^5.11.0",
+    "@fullcalendar/vue3": "^5.11.1",
+    "@popperjs/core": "^2.9.2",
+    "dropzone": "^5.7.6",
+    "es6-promise": "^4.2.8",
+    "leaflet": "^1.7.1",
+    "masonry-layout": "^4.2.2",
+    "mime": "^3.0.0",
+    "swagger-ui": "^4.15.5",
+    "vis-network": "^9.1.0",
+    "vue": "^3.2.37",
+    "vue-i18n": "^9.1.6",
+    "vue-multiselect": "3.0.0-alpha.2",
+    "vue-toast-notification": "^2.0",
+    "vuex": "^4.0.0"
+  },
+  "browserslist": [
+    "Firefox ESR"
+  ],
+  "scripts": {
+    "dev-server": "encore dev-server",
+    "dev": "encore dev",
+    "watch": "encore dev --watch",
+    "build": "encore production --progress"
+  },
+  "private": true
+}
@@ -5,16 +5,6 @@ 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
-            path: src/Bundle/ChillPersonBundle/Entity/Household/PersonHouseholdAddress.php
-
        -
            message: "#^Access to an undefined property Chill\\\\PersonBundle\\\\Entity\\\\AccompanyingPeriod\\:\\:\\$work\\.$#"
            count: 1
@@ -25,11 +15,6 @@ 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: "#^Variable variables are not allowed\\.$#"
            count: 4
@@ -40,11 +25,6 @@ parameters:
            count: 1
            path: src/Bundle/ChillPersonBundle/Serializer/Normalizer/MembersEditorNormalizer.php

-        -
-            message: "#^Undefined variable\\: \\$choiceSlug$#"
-            count: 1
-            path: src/Bundle/ChillPersonBundle/Export/Export/ListPerson.php
-
        -
            message: "#^Undefined variable\\: \\$choiceSlug$#"
            count: 1
@@ -10,31 +10,11 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillActivityBundle/Entity/ActivityReasonCategory.php

-		-
-			message: "#^Method Chill\\\\ActivityBundle\\\\Export\\\\Export\\\\StatActivityDuration\\:\\:getDescription\\(\\) should return string but return statement is missing\\.$#"
-			count: 1
-			path: src/Bundle/ChillActivityBundle/Export/Export/StatActivityDuration.php
-
-		-
-			message: "#^Method Chill\\\\ActivityBundle\\\\Export\\\\Export\\\\StatActivityDuration\\:\\:getTitle\\(\\) should return string but return statement is missing\\.$#"
-			count: 1
-			path: src/Bundle/ChillActivityBundle/Export/Export/StatActivityDuration.php
-
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
 			count: 1
 			path: src/Bundle/ChillActivityBundle/Form/ActivityType.php

-		-
-			message: "#^Only booleans are allowed in &&, mixed given on the right side\\.$#"
-			count: 3
-			path: src/Bundle/ChillActivityBundle/Form/ActivityType.php
-
-		-
-			message: "#^Only booleans are allowed in an if condition, mixed given\\.$#"
-			count: 2
-			path: src/Bundle/ChillActivityBundle/Form/ActivityType.php
-
 		-
 			message: "#^Only booleans are allowed in an if condition, mixed given\\.$#"
 			count: 3
@@ -250,21 +230,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
 			path: src/Bundle/ChillMainBundle/Entity/User.php

-		-
-			message: "#^Only booleans are allowed in a ternary operator condition, mixed given\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Export/Formatter/SpreadsheetListFormatter.php
-
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
 			count: 1
@@ -295,11 +265,6 @@ 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
@@ -325,11 +290,6 @@ 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
@@ -360,26 +320,6 @@ 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
-			path: src/Bundle/ChillPersonBundle/Export/Aggregator/CountryOfBirthAggregator.php
-
-		-
-			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Export/Aggregator/NationalityAggregator.php
-
-		-
-			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
-			count: 2
-			path: src/Bundle/ChillPersonBundle/Export/Export/ListPerson.php
-
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
 			count: 1
@@ -400,11 +340,6 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillPersonBundle/Form/Type/PersonPhoneType.php

-		-
-			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
-			count: 3
-			path: src/Bundle/ChillPersonBundle/Search/PersonSearch.php
-
 		-
 			message: "#^Method Chill\\\\PersonBundle\\\\Search\\\\PersonSearch\\:\\:renderResult\\(\\) should return string but return statement is missing\\.$#"
 			count: 1
@@ -470,18 +405,8 @@ 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
-
@@ -3,6 +3,7 @@ parameters:
    paths:
        - src/
    excludePaths:
+        - .php_cs*
        - docs/
        - src/Bundle/*/Tests/*
        - src/Bundle/*/tests/*
@@ -40,6 +40,9 @@
        <testsuite name="DocGeneratorBundle">
            <directory suffix="Test.php">src/Bundle/ChillDocGeneratorBundle/tests/</directory>
        </testsuite>
+        <testsuite name="WopiBundle">
+            <directory suffix="Test.php">src/Bundle/ChillWopiBundle/tests/</directory>
+        </testsuite>
    </testsuites>

    <listeners>
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="v4.15.0@a1b5e489e6fcebe40cb804793d964e99fc347820">
+<files psalm-version="4.18.0.0">
  <file src="src/Bundle/ChillActivityBundle/Controller/ActivityReasonCategoryController.php">
    <UndefinedClass occurrences="4">
      <code>'ChillActivityBundle:ActivityReasonCategory'</code>
@@ -47,6 +47,11 @@
      <code>Activity[]|array</code>
    </UndefinedDocblockClass>
  </file>
+  <file src="src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/AppKernel.php">
+    <DuplicateClass occurrences="1">
+      <code>AppKernel</code>
+    </DuplicateClass>
+  </file>
  <file src="src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/autoload.php">
    <MissingFile occurrences="1">
      <code>require __DIR__ . '/../../../../../vendor/autoload.php'</code>
@@ -164,72 +169,18 @@
      <code>type</code>
    </UndefinedDocblockClass>
  </file>
-  <file src="src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ActivityReasonAggregatorTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>public function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
-  <file src="src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ActivityTypeAggregatorTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>public function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
-  <file src="src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ActivityUserAggregatorTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>public function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
-  <file src="src/Bundle/ChillActivityBundle/Tests/Export/Export/CountActivityTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>public function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
-  <file src="src/Bundle/ChillActivityBundle/Tests/Export/Export/ListActivityTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>public function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
-  <file src="src/Bundle/ChillActivityBundle/Tests/Export/Export/StatActivityDurationSumTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>public function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
-  <file src="src/Bundle/ChillActivityBundle/Tests/Export/Filter/ActivityReasonFilterTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>public function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
  <file src="src/Bundle/ChillActivityBundle/Tests/Export/Filter/PersonHavingActivityBetweenDateFilterTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>public function setUp()</code>
-    </MethodSignatureMismatch>
    <UndefinedDocblockClass occurrences="1">
      <code>\Chill\PersonBundle\Export\Filter\PersonHavingActivityBetweenDateFilter</code>
    </UndefinedDocblockClass>
  </file>
-  <file src="src/Bundle/ChillActivityBundle/Tests/Form/ActivityTypeTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>public function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
  <file src="src/Bundle/ChillActivityBundle/Tests/Form/Type/TranslatableActivityReasonTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>public function setUp()</code>
-    </MethodSignatureMismatch>
    <TooFewArguments occurrences="2"/>
    <UndefinedDocblockClass occurrences="1">
      <code>Prophecy\Prophet</code>
    </UndefinedDocblockClass>
  </file>
-  <file src="src/Bundle/ChillActivityBundle/Tests/Form/Type/TranslatableActivityTypeTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>public function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
  <file src="src/Bundle/ChillActivityBundle/Tests/Security/Authorization/ActivityVoterTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>public function setUp()</code>
-    </MethodSignatureMismatch>
    <UndefinedDocblockClass occurrences="1">
      <code>type</code>
    </UndefinedDocblockClass>
@@ -254,11 +205,6 @@
      <code>$asideActivityCategory</code>
    </ParamNameMismatch>
  </file>
-  <file src="src/Bundle/ChillAsideActivityBundle/src/Tests/Controller/AsideActivityControllerTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>public function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
  <file src="src/Bundle/ChillBudgetBundle/Calculator/CalculatorManager.php">
    <InvalidStaticInvocation occurrences="3">
      <code>$calculator::getAlias()</code>
@@ -288,11 +234,6 @@
      <code>'ChillCalendarBundle:Calendar'</code>
    </UndefinedClass>
  </file>
-  <file src="src/Bundle/ChillCalendarBundle/Tests/Controller/CalendarControllerTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>public function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
  <file src="src/Bundle/ChillCustomFieldsBundle/Command/CreateFieldsOnGroupCommand.php">
    <UndefinedClass occurrences="1">
      <code>'ChillCustomFieldsBundle:CustomFieldsGroup'</code>
@@ -397,10 +338,6 @@
    </UndefinedDocblockClass>
  </file>
  <file src="src/Bundle/ChillCustomFieldsBundle/Tests/CustomFields/CustomFieldsChoiceTest.php">
-    <MethodSignatureMismatch occurrences="2">
-      <code>public function setUp()</code>
-      <code>public function tearDown()</code>
-    </MethodSignatureMismatch>
    <UndefinedDocblockClass occurrences="4">
      <code>type</code>
      <code>type</code>
@@ -408,61 +345,6 @@
      <code>type</code>
    </UndefinedDocblockClass>
  </file>
-  <file src="src/Bundle/ChillCustomFieldsBundle/Tests/CustomFields/CustomFieldsNumberTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>public function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
-  <file src="src/Bundle/ChillCustomFieldsBundle/Tests/CustomFields/CustomFieldsTextTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>public function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
-  <file src="src/Bundle/ChillCustomFieldsBundle/Tests/Form/Extension/PostTextIntegerExtensionTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>public function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
-  <file src="src/Bundle/ChillCustomFieldsBundle/Tests/Form/Extension/PostTextNumberExtensionTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>public function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
-  <file src="src/Bundle/ChillCustomFieldsBundle/Tests/Service/CustomFieldsHelperTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>public function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
-  <file src="src/Bundle/ChillCustomFieldsBundle/Tests/Templating/Twig/CustomFieldRenderingTwigTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>public function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
-  <file src="src/Bundle/ChillCustomFieldsBundle/Tests/Templating/Twig/CustomFieldsGroupRenderingTwigTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>public function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
-  <file src="src/Bundle/ChillDocGeneratorBundle/tests/Serializer/Encoder/DocGenEncoderTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>protected function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
-  <file src="src/Bundle/ChillDocGeneratorBundle/tests/Serializer/Normalizer/DocGenObjectNormalizerTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>protected function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
-  <file src="src/Bundle/ChillDocGeneratorBundle/tests/Service/Context/BaseContextDataTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>protected function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
-  <file src="src/Bundle/ChillDocStoreBundle/Controller/DocumentAccompanyingCourseController.php">
-    <UndefinedClass occurrences="1">
-      <code>'ChillDocStoreBundle:AccompanyingCourseDocument'</code>
-    </UndefinedClass>
-  </file>
  <file src="src/Bundle/ChillDocStoreBundle/Controller/DocumentCategoryController.php">
    <UndefinedClass occurrences="3">
      <code>'ChillDocStoreBundle:DocumentCategory'</code>
@@ -470,11 +352,6 @@
      <code>'ChillDocStoreBundle:DocumentCategory'</code>
    </UndefinedClass>
  </file>
-  <file src="src/Bundle/ChillDocStoreBundle/Controller/DocumentPersonController.php">
-    <UndefinedClass occurrences="1">
-      <code>'ChillDocStoreBundle:PersonDocument'</code>
-    </UndefinedClass>
-  </file>
  <file src="src/Bundle/ChillDocStoreBundle/Entity/Document.php">
    <UndefinedDocblockClass occurrences="1">
      <code>\Chill\PersonBundle\Entity\user</code>
@@ -570,9 +447,6 @@
    <InvalidParamDefault occurrences="1">
      <code>type</code>
    </InvalidParamDefault>
-    <MethodSignatureMismatch occurrences="1">
-      <code>public function setUp()</code>
-    </MethodSignatureMismatch>
    <UndefinedClass occurrences="8">
      <code>'ChillEventBundle:Event'</code>
      <code>'ChillEventBundle:Event'</code>
@@ -588,10 +462,6 @@
    </UndefinedDocblockClass>
  </file>
  <file src="src/Bundle/ChillEventBundle/Tests/Search/EventSearchTest.php">
-    <MethodSignatureMismatch occurrences="2">
-      <code>public function setUp()</code>
-      <code>public function tearDown()</code>
-    </MethodSignatureMismatch>
    <UndefinedClass occurrences="1">
      <code>'ChillMainBundle:Scope'</code>
    </UndefinedClass>
@@ -891,11 +761,6 @@
      <code>OptionsResolverInterface</code>
    </UndefinedDocblockClass>
  </file>
-  <file src="src/Bundle/ChillMainBundle/Notification/Mailer.php">
-    <UndefinedDocblockClass occurrences="1">
-      <code>\Symfony\Component\Mailer\Exception\TransportExceptionInterface</code>
-    </UndefinedDocblockClass>
-  </file>
  <file src="src/Bundle/ChillMainBundle/Pagination/PageGenerator.php">
    <UndefinedVariable occurrences="1">
      <code>$current</code>
@@ -924,11 +789,6 @@
      <code>$onlyEnabled</code>
    </ParamNameMismatch>
  </file>
-  <file src="src/Bundle/ChillMainBundle/Resources/test/Fixtures/App/app/AppKernel.php">
-    <DuplicateClass occurrences="1">
-      <code>AppKernel</code>
-    </DuplicateClass>
-  </file>
  <file src="src/Bundle/ChillMainBundle/Resources/test/Fixtures/App/app/autoload.php">
    <MissingFile occurrences="1">
      <code>require __DIR__ . '/../../../../../vendor/autoload.php'</code>
@@ -1056,158 +916,15 @@
    </UndefinedClass>
  </file>
  <file src="src/Bundle/ChillMainBundle/Test/Export/AbstractFilterTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>public function setUp()</code>
-    </MethodSignatureMismatch>
    <UndefinedDocblockClass occurrences="1">
      <code>type</code>
    </UndefinedDocblockClass>
  </file>
-  <file src="src/Bundle/ChillMainBundle/Tests/Authorization/ParentRoleHelperTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>public function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
-  <file src="src/Bundle/ChillMainBundle/Tests/Controller/AddressControllerTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>public function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
-  <file src="src/Bundle/ChillMainBundle/Tests/Controller/UserControllerTest.php">
-    <MethodSignatureMismatch occurrences="2">
-      <code>protected function tearDown()</code>
-      <code>public function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
-  <file src="src/Bundle/ChillMainBundle/Tests/Export/ExportManagerTest.php">
-    <MethodSignatureMismatch occurrences="2">
-      <code>public function setUp()</code>
-      <code>public function tearDown()</code>
-    </MethodSignatureMismatch>
-    <UndefinedDocblockClass occurrences="40">
-      <code>$this-&gt;prophet</code>
-      <code>$this-&gt;prophet</code>
-      <code>$this-&gt;prophet</code>
-      <code>$this-&gt;prophet</code>
-      <code>$this-&gt;prophet</code>
-      <code>$this-&gt;prophet</code>
-      <code>$this-&gt;prophet</code>
-      <code>$this-&gt;prophet</code>
-      <code>$this-&gt;prophet</code>
-      <code>$this-&gt;prophet</code>
-      <code>$this-&gt;prophet</code>
-      <code>$this-&gt;prophet</code>
-      <code>$this-&gt;prophet</code>
-      <code>$this-&gt;prophet</code>
-      <code>$this-&gt;prophet</code>
-      <code>$this-&gt;prophet</code>
-      <code>$this-&gt;prophet</code>
-      <code>$this-&gt;prophet</code>
-      <code>$this-&gt;prophet</code>
-      <code>$this-&gt;prophet</code>
-      <code>$this-&gt;prophet</code>
-      <code>$this-&gt;prophet</code>
-      <code>$this-&gt;prophet</code>
-      <code>$this-&gt;prophet</code>
-      <code>$this-&gt;prophet</code>
-      <code>$this-&gt;prophet</code>
-      <code>$this-&gt;prophet</code>
-      <code>$this-&gt;prophet</code>
-      <code>$this-&gt;prophet</code>
-      <code>$this-&gt;prophet</code>
-      <code>$this-&gt;prophet</code>
-      <code>$this-&gt;prophet</code>
-      <code>$this-&gt;prophet</code>
-      <code>$this-&gt;prophet</code>
-      <code>$this-&gt;prophet</code>
-      <code>$this-&gt;prophet</code>
-      <code>$this-&gt;prophet</code>
-      <code>$this-&gt;prophet</code>
-      <code>$this-&gt;prophet</code>
-      <code>Prophecy\Prophet</code>
-    </UndefinedDocblockClass>
-  </file>
-  <file src="src/Bundle/ChillMainBundle/Tests/Form/Type/PickCenterTypeTest.php">
-    <UndefinedClass occurrences="1">
-      <code>CenterType</code>
-    </UndefinedClass>
-    <UndefinedDocblockClass occurrences="1">
-      <code>CenterType</code>
-    </UndefinedDocblockClass>
-  </file>
-  <file src="src/Bundle/ChillMainBundle/Tests/Pagination/PageTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>public function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
-  <file src="src/Bundle/ChillMainBundle/Tests/Pagination/PaginatorTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>public function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
-  <file src="src/Bundle/ChillMainBundle/Tests/Routing/Loader/RouteLoaderTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>public function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
-  <file src="src/Bundle/ChillMainBundle/Tests/Search/AbstractSearchTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>public function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
  <file src="src/Bundle/ChillMainBundle/Tests/Search/SearchProviderTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>public function setUp()</code>
-    </MethodSignatureMismatch>
    <UndefinedDocblockClass occurrences="1">
      <code>unknown</code>
    </UndefinedDocblockClass>
  </file>
-  <file src="src/Bundle/ChillMainBundle/Tests/Security/Authorization/AuthorizationHelperTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>public function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
-  <file src="src/Bundle/ChillMainBundle/Tests/Security/PasswordRecover/TokenManagerTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>public function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
-  <file src="src/Bundle/ChillMainBundle/Tests/Security/Resolver/CenterResolverDispatcherTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>protected function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
-  <file src="src/Bundle/ChillMainBundle/Tests/Security/Resolver/DefaultScopeResolverTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>public function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
-  <file src="src/Bundle/ChillMainBundle/Tests/Security/Resolver/ScopeResolverDispatcherTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>public function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
-  <file src="src/Bundle/ChillMainBundle/Tests/Serializer/Normalizer/DateNormalizerTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>public function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
-  <file src="src/Bundle/ChillMainBundle/Tests/Serializer/Normalizer/DoctrineExistingEntityNormalizerTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>protected function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
-  <file src="src/Bundle/ChillMainBundle/Tests/Services/MenuComposerTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>public function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
-  <file src="src/Bundle/ChillMainBundle/Tests/Templating/Entity/AddressRenderTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>protected function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
  <file src="src/Bundle/ChillMainBundle/Timeline/TimelineBuilder.php">
    <UndefinedDocblockClass occurrences="1">
      <code>unknown</code>
@@ -1412,20 +1129,6 @@
      <code>OptionsResolverInterface</code>
    </UndefinedDocblockClass>
  </file>
-  <file src="src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkRepository.php">
-    <UndefinedClass occurrences="6">
-      <code>$qb</code>
-      <code>$qb</code>
-      <code>$qb</code>
-      <code>QueryBuilder</code>
-      <code>SocialAction</code>
-      <code>SocialAction</code>
-    </UndefinedClass>
-    <UndefinedVariable occurrences="2">
-      <code>$action</code>
-      <code>$orderBy</code>
-    </UndefinedVariable>
-  </file>
  <file src="src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/app/AppKernel.php">
    <DuplicateClass occurrences="1">
      <code>AppKernel</code>
@@ -1505,33 +1208,13 @@
    </ParamNameMismatch>
  </file>
  <file src="src/Bundle/ChillPersonBundle/Tests/AccompanyingPeriod/AccompanyingPeriodConfidentialTest.php">
-    <MethodSignatureMismatch occurrences="2">
-      <code>public function setUp()</code>
-      <code>public static function setUpBeforeClass()</code>
-    </MethodSignatureMismatch>
    <UndefinedClass occurrences="2">
      <code>AccompanyingPeriodRepository</code>
      <code>stdClass</code>
    </UndefinedClass>
  </file>
-  <file src="src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingCourseApiControllerTest.php">
-    <MethodSignatureMismatch occurrences="2">
-      <code>public function setUp()</code>
-      <code>public static function setUpBeforeClass()</code>
-    </MethodSignatureMismatch>
-  </file>
-  <file src="src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingCourseControllerTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>public function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
  <file src="src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingPeriodControllerTest.php">
    <InvalidThrow occurrences="1"/>
-    <MethodSignatureMismatch occurrences="3">
-      <code>public function setUp()</code>
-      <code>public function tearDown()</code>
-      <code>public static function setUpBeforeClass()</code>
-    </MethodSignatureMismatch>
    <UndefinedClass occurrences="3">
      <code>'ChillMainBundle:Center'</code>
      <code>'ChillPersonBundle:AccompanyingPeriod\ClosingMotive'</code>
@@ -1543,40 +1226,19 @@
    </UndefinedDocblockClass>
  </file>
  <file src="src/Bundle/ChillPersonBundle/Tests/Controller/HouseholdApiControllerTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>protected function tearDown()</code>
-    </MethodSignatureMismatch>
    <UndefinedClass occurrences="1">
      <code>User</code>
    </UndefinedClass>
  </file>
-  <file src="src/Bundle/ChillPersonBundle/Tests/Controller/HouseholdControllerTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>protected function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
  <file src="src/Bundle/ChillPersonBundle/Tests/Controller/PersonAddressControllerTest.php">
    <InvalidScope occurrences="1">
      <code>$this</code>
    </InvalidScope>
-    <MethodSignatureMismatch occurrences="2">
-      <code>public function setUp()</code>
-      <code>public static function setUpBeforeClass()</code>
-    </MethodSignatureMismatch>
    <UndefinedClass occurrences="1">
      <code>'ChillPersonBundle:Person'</code>
    </UndefinedClass>
  </file>
-  <file src="src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerCreateTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>public static function tearDownAfterClass()</code>
-    </MethodSignatureMismatch>
-  </file>
  <file src="src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerUpdateTest.php">
-    <MethodSignatureMismatch occurrences="2">
-      <code>public function setUp()</code>
-      <code>public function tearDown()</code>
-    </MethodSignatureMismatch>
    <UndefinedClass occurrences="2">
      <code>'ChillMainBundle:Country'</code>
      <code>'ChillPersonBundle:Person'</code>
@@ -1586,140 +1248,25 @@
    </UndefinedDocblockClass>
  </file>
  <file src="src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerUpdateWithHiddenFieldsTest.php">
-    <MethodSignatureMismatch occurrences="2">
-      <code>public function setUp()</code>
-      <code>public function tearDown()</code>
-    </MethodSignatureMismatch>
    <UndefinedClass occurrences="2">
      <code>'ChillMainBundle:Country'</code>
      <code>'ChillPersonBundle:Person'</code>
    </UndefinedClass>
  </file>
  <file src="src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerViewTest.php">
-    <MethodSignatureMismatch occurrences="2">
-      <code>public function setUp()</code>
-      <code>public function tearDown()</code>
-    </MethodSignatureMismatch>
    <UndefinedClass occurrences="1">
      <code>'ChillPersonBundle:Person'</code>
    </UndefinedClass>
  </file>
  <file src="src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerViewWithHiddenFieldsTest.php">
-    <MethodSignatureMismatch occurrences="2">
-      <code>public function setUp()</code>
-      <code>public function tearDown()</code>
-    </MethodSignatureMismatch>
    <UndefinedClass occurrences="1">
      <code>'ChillPersonBundle:Person'</code>
    </UndefinedClass>
  </file>
-  <file src="src/Bundle/ChillPersonBundle/Tests/Controller/PersonDuplicateControllerViewTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>public function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
-  <file src="src/Bundle/ChillPersonBundle/Tests/Controller/RelationshipApiControllerTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>public function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
-  <file src="src/Bundle/ChillPersonBundle/Tests/Controller/SocialIssueApiControllerTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>public function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
  <file src="src/Bundle/ChillPersonBundle/Tests/Entity/AccompanyingPeriodTest.php">
    <AssignmentToVoid occurrences="1">
      <code>$participationL</code>
    </AssignmentToVoid>
-    <NullReference occurrences="1">
-      <code>getEndDate</code>
-    </NullReference>
-  </file>
-  <file src="src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AgeAggregatorTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>public function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
-  <file src="src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/GenderAggregatorTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>public function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
-  <file src="src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/NationalityAggregatorTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>public function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
-  <file src="src/Bundle/ChillPersonBundle/Tests/Export/Export/CountPersonTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>public function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
-  <file src="src/Bundle/ChillPersonBundle/Tests/Export/Export/ListPersonTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>public function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
-  <file src="src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingPeriodFilterTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>public function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
-  <file src="src/Bundle/ChillPersonBundle/Tests/Export/Filter/BirthdayFilterTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>public function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
-  <file src="src/Bundle/ChillPersonBundle/Tests/Export/Filter/GenderFilterTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>public function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
-  <file src="src/Bundle/ChillPersonBundle/Tests/Form/Type/PickPersonTypeTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>public function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
-  <file src="src/Bundle/ChillPersonBundle/Tests/Household/MembersEditorTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>protected function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
-  <file src="src/Bundle/ChillPersonBundle/Tests/Security/Authorization/PersonVoterTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>public function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
-  <file src="src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/AccompanyingPeriodWorkDocGenNormalizerTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>protected function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
-  <file src="src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/HouseholdNormalizerTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>protected function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
-  <file src="src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/PersonDocGenNormalizerTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>protected function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
-  <file src="src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/PersonJsonNormalizerTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>protected function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
-  <file src="src/Bundle/ChillPersonBundle/Tests/Validator/Person/PersonValidationTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>protected function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
-  <file src="src/Bundle/ChillPersonBundle/Tests/Workflows/AccompanyingPeriodLifecycle.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>protected function setUp()</code>
-    </MethodSignatureMismatch>
  </file>
  <file src="src/Bundle/ChillPersonBundle/Timeline/AbstractTimelineAccompanyingPeriod.php">
    <UndefinedClass occurrences="1">
@@ -1820,20 +1367,13 @@
      <code>require __DIR__ . '/../../../../../vendor/autoload.php'</code>
    </MissingFile>
  </file>
-  <file src="src/Bundle/ChillReportBundle/Tests/Controller/ReportControllerNextTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>public function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
  <file src="src/Bundle/ChillReportBundle/Tests/Controller/ReportControllerTest.php">
    <InvalidParamDefault occurrences="1">
      <code>type</code>
    </InvalidParamDefault>
-    <MethodSignatureMismatch occurrences="2">
-      <code>public function setUp()</code>
-      <code>public static function setUpBeforeClass()</code>
-    </MethodSignatureMismatch>
-    <UndefinedDocblockClass occurrences="29">
+    <UndefinedDocblockClass occurrences="31">
+      <code>$client</code>
+      <code>$client</code>
      <code>$client</code>
      <code>$client</code>
      <code>$client</code>
@@ -1865,16 +1405,7 @@
      <code>type</code>
    </UndefinedDocblockClass>
  </file>
-  <file src="src/Bundle/ChillReportBundle/Tests/DependencyInjection/ChillReportExtensionTest.php">
-    <UndefinedClass occurrences="1">
-      <code>Exception</code>
-    </UndefinedClass>
-  </file>
  <file src="src/Bundle/ChillReportBundle/Tests/Security/Authorization/ReportVoterTest.php">
-    <MethodSignatureMismatch occurrences="2">
-      <code>public function setUp()</code>
-      <code>public static function setUpBeforeClass()</code>
-    </MethodSignatureMismatch>
    <UndefinedDocblockClass occurrences="3">
      <code>type</code>
      <code>type</code>
@@ -1882,10 +1413,6 @@
    </UndefinedDocblockClass>
  </file>
  <file src="src/Bundle/ChillReportBundle/Tests/Timeline/TimelineProviderTest.php">
-    <MethodSignatureMismatch occurrences="2">
-      <code>public function setUp()</code>
-      <code>public function tearDown()</code>
-    </MethodSignatureMismatch>
    <UndefinedClass occurrences="1">
      <code>'ChillCustomFieldsBundle:CustomFieldsGroup'</code>
    </UndefinedClass>
@@ -1958,11 +1485,6 @@
      <code>CacheItempPoolInterface</code>
    </UndefinedDocblockClass>
  </file>
-  <file src="src/Bundle/ChillTaskBundle/Tests/Controller/SingleTaskControllerTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>protected function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
  <file src="src/Bundle/ChillThirdPartyBundle/DependencyInjection/CompilerPass/ThirdPartyTypeCompilerPass.php">
    <UndefinedClass occurrences="1">
      <code>$taggedService-&gt;getClass()::getKey()</code>
@@ -1988,11 +1510,6 @@
      <code>$thirdParty</code>
    </ParamNameMismatch>
  </file>
-  <file src="src/Bundle/ChillThirdPartyBundle/Tests/Serializer/Normalizer/ThirdPartyJsonDenormalizerTest.php">
-    <MethodSignatureMismatch occurrences="1">
-      <code>protected function setUp()</code>
-    </MethodSignatureMismatch>
-  </file>
  <file src="src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillDocumentManager.php">
    <UndefinedDocblockClass occurrences="6">
      <code>$object</code>
@@ -6,6 +6,7 @@
    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" />
@@ -13,4 +14,15 @@
            <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>
@@ -1,14 +1,14 @@
 <?php

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

-declare(strict_types=1);
-
 namespace Chill\ActivityBundle;

 use Symfony\Component\HttpKernel\Bundle\Bundle;
@@ -1,14 +1,14 @@
 <?php

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

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

 use Chill\ActivityBundle\Entity\Activity;
@@ -17,10 +17,12 @@ use Chill\ActivityBundle\Form\ActivityType;
 use Chill\ActivityBundle\Repository\ActivityACLAwareRepositoryInterface;
 use Chill\ActivityBundle\Repository\ActivityRepository;
 use Chill\ActivityBundle\Repository\ActivityTypeCategoryRepository;
-use Chill\ActivityBundle\Repository\ActivityTypeRepository;
+use Chill\ActivityBundle\Repository\ActivityTypeRepositoryInterface;
 use Chill\ActivityBundle\Security\Authorization\ActivityVoter;
 use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable;
 use Chill\MainBundle\Repository\LocationRepository;
+use Chill\MainBundle\Repository\UserRepositoryInterface;
+use Chill\MainBundle\Security\Resolver\CenterResolverManagerInterface;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Privacy\PrivacyEvent;
@@ -34,13 +36,14 @@ 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 Symfony\Contracts\Translation\TranslatorInterface;
 use function array_key_exists;

 final class ActivityController extends AbstractController
@@ -53,7 +56,9 @@ final class ActivityController extends AbstractController

    private ActivityTypeCategoryRepository $activityTypeCategoryRepository;

-    private ActivityTypeRepository $activityTypeRepository;
+    private ActivityTypeRepositoryInterface $activityTypeRepository;
+
+    private CenterResolverManagerInterface $centerResolver;

    private EntityManagerInterface $entityManager;

@@ -69,9 +74,13 @@ final class ActivityController extends AbstractController

    private ThirdPartyRepository $thirdPartyRepository;

+    private TranslatorInterface $translator;
+
+    private UserRepositoryInterface $userRepository;
+
    public function __construct(
        ActivityACLAwareRepositoryInterface $activityACLAwareRepository,
-        ActivityTypeRepository $activityTypeRepository,
+        ActivityTypeRepositoryInterface $activityTypeRepository,
        ActivityTypeCategoryRepository $activityTypeCategoryRepository,
        PersonRepository $personRepository,
        ThirdPartyRepository $thirdPartyRepository,
@@ -81,7 +90,10 @@ final class ActivityController extends AbstractController
        EntityManagerInterface $entityManager,
        EventDispatcherInterface $eventDispatcher,
        LoggerInterface $logger,
-        SerializerInterface $serializer
+        SerializerInterface $serializer,
+        UserRepositoryInterface $userRepository,
+        CenterResolverManagerInterface $centerResolver,
+        TranslatorInterface $translator
    ) {
        $this->activityACLAwareRepository = $activityACLAwareRepository;
        $this->activityTypeRepository = $activityTypeRepository;
@@ -95,6 +107,9 @@ final class ActivityController extends AbstractController
        $this->eventDispatcher = $eventDispatcher;
        $this->logger = $logger;
        $this->serializer = $serializer;
+        $this->userRepository = $userRepository;
+        $this->centerResolver = $centerResolver;
+        $this->translator = $translator;
    }

    /**
@@ -150,7 +165,7 @@ final class ActivityController extends AbstractController
                $this->entityManager->remove($activity);
                $this->entityManager->flush();

-                $this->addFlash('success', $this->get('translator')
+                $this->addFlash('success', $this->translator
                    ->trans('The activity has been successfully removed.'));

                $params = $this->buildParamsToUrl($person, $accompanyingPeriod);
@@ -178,14 +193,15 @@ 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();
@@ -196,21 +212,46 @@ final class ActivityController extends AbstractController
        // $this->denyAccessUnlessGranted('CHILL_ACTIVITY_UPDATE', $entity);

        $form = $this->createForm(ActivityType::class, $entity, [
-            'center' => $entity->getCenter(),
+            'center' => $this->centerResolver->resolveCenters($entity)[0] ?? null,
            'role' => new Role('CHILL_ACTIVITY_UPDATE'),
            'activityType' => $entity->getActivityType(),
            'accompanyingPeriod' => $accompanyingPeriod,
-        ])->handleRequest($request);
+        ]);
+
+        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);

        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->translator->trans('Success : activity updated!'));
+
            return $this->redirectToRoute('chill_activity_activity_show', $params);
        }

@@ -327,6 +368,7 @@ final class ActivityController extends AbstractController

        if ($person instanceof Person) {
            $entity->setPerson($person);
+            $entity->getPersons()->add($person);
        }

        if ($accompanyingPeriod instanceof AccompanyingPeriod) {
@@ -339,7 +381,7 @@ final class ActivityController extends AbstractController
        if ($request->query->has('activityData')) {
            $activityData = $request->query->get('activityData');

-            if (array_key_exists('durationTime', $activityData)) {
+            if (array_key_exists('durationTime', $activityData) && $activityType->getDurationTimeVisible() > 0) {
                $durationTimeInMinutes = $activityData['durationTime'];
                $hours = floor($durationTimeInMinutes / 60);
                $minutes = $durationTimeInMinutes % 60;
@@ -358,26 +400,36 @@ final class ActivityController extends AbstractController
                }
            }

-            if (array_key_exists('personsId', $activityData)) {
+            if (array_key_exists('personsId', $activityData) && $activityType->getPersonsVisible() > 0) {
                foreach ($activityData['personsId'] as $personId) {
                    $concernedPerson = $this->personRepository->find($personId);
                    $entity->addPerson($concernedPerson);
                }
            }

-            if (array_key_exists('professionalsId', $activityData)) {
+            if (array_key_exists('professionalsId', $activityData) && $activityType->getThirdPartiesVisible() > 0) {
                foreach ($activityData['professionalsId'] as $professionalsId) {
                    $professional = $this->thirdPartyRepository->find($professionalsId);
                    $entity->addThirdParty($professional);
                }
            }

-            if (array_key_exists('location', $activityData)) {
+            if (array_key_exists('usersId', $activityData) && $activityType->getUsersVisible() > 0) {
+                foreach ($activityData['usersId'] as $userId) {
+                    $user = $this->userRepository->find($userId);
+
+                    if (null !== $user) {
+                        $entity->addUser($user);
+                    }
+                }
+            }
+
+            if (array_key_exists('location', $activityData) && $activityType->getLocationVisible() > 0) {
                $location = $this->locationRepository->find($activityData['location']);
                $entity->setLocation($location);
            }

-            if (array_key_exists('comment', $activityData)) {
+            if (array_key_exists('comment', $activityData) && $activityType->getCommentVisible() > 0) {
                $comment = new CommentEmbeddable();
                $comment->setComment($activityData['comment']);
                $comment->setUserId($this->getUser()->getid());
@@ -389,17 +441,44 @@ final class ActivityController extends AbstractController
        $this->denyAccessUnlessGranted(ActivityVoter::CREATE, $entity);

        $form = $this->createForm(ActivityType::class, $entity, [
-            'center' => $entity->getCenter(),
+            'center' => $this->centerResolver->resolveCenters($entity)[0] ?? null,
            'role' => new Role('CHILL_ACTIVITY_CREATE'),
            'activityType' => $entity->getActivityType(),
            'accompanyingPeriod' => $accompanyingPeriod,
-        ])->handleRequest($request);
+        ]);
+
+        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);

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

-            $this->addFlash('success', $this->get('translator')->trans('Success : activity created!'));
+            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->translator->trans('Success : activity created!'));

            $params = $this->buildParamsToUrl($person, $accompanyingPeriod);

@@ -1,14 +1,14 @@
 <?php

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

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

 use Chill\ActivityBundle\Entity\ActivityReasonCategory;
@@ -54,7 +54,7 @@ class ActivityReasonCategoryController extends AbstractController
    {
        $em = $this->getDoctrine()->getManager();

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

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

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

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

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

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

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

        if (!$entity) {
            throw $this->createNotFoundException('Unable to find ActivityReasonCategory entity.');
@@ -1,27 +1,36 @@
 <?php

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

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

 use Chill\ActivityBundle\Entity\ActivityReason;
 use Chill\ActivityBundle\Form\ActivityReasonType;
+use Chill\ActivityBundle\Repository\ActivityReasonRepository;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;

 /**
 * ActivityReason controller.
 */
 class ActivityReasonController extends AbstractController
 {
+    private ActivityReasonRepository $activityReasonRepository;
+
+    public function __construct(ActivityReasonRepository $activityReasonRepository)
+    {
+        $this->activityReasonRepository = $activityReasonRepository;
+    }
+
    /**
     * Creates a new ActivityReason entity.
     */
@@ -54,10 +63,10 @@ class ActivityReasonController extends AbstractController
    {
        $em = $this->getDoctrine()->getManager();

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

-        if (!$entity) {
-            throw $this->createNotFoundException('Unable to find ActivityReason entity.');
+        if (null === $entity) {
+            throw new NotFoundHttpException('Unable to find ActivityReason entity.');
        }

        $editForm = $this->createEditForm($entity);
@@ -75,7 +84,7 @@ class ActivityReasonController extends AbstractController
    {
        $em = $this->getDoctrine()->getManager();

-        $entities = $em->getRepository('ChillActivityBundle:ActivityReason')->findAll();
+        $entities = $this->activityReasonRepository->findAll();

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

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

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

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

        if (!$entity) {
            throw $this->createNotFoundException('Unable to find ActivityReason entity.');
@@ -1,14 +1,14 @@
 <?php

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

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

 use Chill\MainBundle\CRUD\Controller\CRUDController;
@@ -1,14 +1,14 @@
 <?php

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

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

 use Chill\MainBundle\CRUD\Controller\CRUDController;
@@ -1,14 +1,14 @@
 <?php

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

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

 use Chill\MainBundle\CRUD\Controller\CRUDController;
@@ -1,14 +1,14 @@
 <?php

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

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

 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
@@ -1,14 +1,14 @@
 <?php

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

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

 use Chill\ActivityBundle\Entity\Activity;
@@ -1,14 +1,14 @@
 <?php

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

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

 use Chill\ActivityBundle\Entity\Activity;
@@ -1,14 +1,14 @@
 <?php

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

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

 use Chill\ActivityBundle\Entity\ActivityReason;
@@ -1,14 +1,14 @@
 <?php

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

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

 use Chill\ActivityBundle\Entity\ActivityReasonCategory;
@@ -1,14 +1,14 @@
 <?php

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

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

 use Chill\ActivityBundle\Entity\ActivityType;
@@ -1,14 +1,14 @@
 <?php

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

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

 use Chill\ActivityBundle\Entity\ActivityTypeCategory;
@@ -1,14 +1,14 @@
 <?php

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

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

 use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
@@ -1,14 +1,14 @@
 <?php

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

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

 use Chill\ActivityBundle\Security\Authorization\ActivityVoter;
@@ -61,8 +61,6 @@ class ChillActivityExtension extends Extension implements PrependExtensionInterf
                ActivityVoter::DELETE => [ActivityVoter::SEE_DETAILS],
                ActivityVoter::SEE_DETAILS => [ActivityVoter::SEE],
                ActivityVoter::FULL => [
-                    ActivityVoter::CREATE_PERSON,
-                    ActivityVoter::CREATE_ACCOMPANYING_COURSE,
                    ActivityVoter::DELETE,
                    ActivityVoter::UPDATE,
                ],
@@ -1,14 +1,14 @@
 <?php

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

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

 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
@@ -1,22 +1,27 @@
 <?php

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

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

 use Chill\ActivityBundle\Validator\Constraints as ActivityValidator;
 use Chill\DocStoreBundle\Entity\StoredObject;
+use Chill\MainBundle\Doctrine\Model\TrackCreationInterface;
+use Chill\MainBundle\Doctrine\Model\TrackCreationTrait;
+use Chill\MainBundle\Doctrine\Model\TrackUpdateInterface;
+use Chill\MainBundle\Doctrine\Model\TrackUpdateTrait;
 use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable;
-use Chill\MainBundle\Entity\HasCenterInterface;
-use Chill\MainBundle\Entity\HasScopeInterface;
+use Chill\MainBundle\Entity\Embeddable\PrivateCommentEmbeddable;
+use Chill\MainBundle\Entity\HasCentersInterface;
+use Chill\MainBundle\Entity\HasScopesInterface;
 use Chill\MainBundle\Entity\Location;
 use Chill\MainBundle\Entity\Scope;
 use Chill\MainBundle\Entity\User;
@@ -35,6 +40,7 @@ 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.
@@ -53,8 +59,12 @@ use Symfony\Component\Serializer\Annotation\SerializedName;
 *     getUserFunction="getUser",
 * path="scope")
 */
-class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterface, HasCenterInterface, HasScopeInterface
+class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterface, HasCentersInterface, HasScopesInterface, TrackCreationInterface, TrackUpdateInterface
 {
+    use TrackCreationTrait;
+
+    use TrackUpdateTrait;
+
    public const SENTRECEIVED_RECEIVED = 'received';

    public const SENTRECEIVED_SENT = 'sent';
@@ -93,6 +103,7 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac

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

@@ -132,6 +143,11 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
     */
    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"})
@@ -191,6 +207,7 @@ 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();
@@ -231,17 +248,30 @@ 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 youngest social issues
+     * are kept) is processed by an entity listener:
+     *
+     * @see{\Chill\PersonBundle\AccompanyingPeriod\SocialIssueConsistency\AccompanyingPeriodSocialIssueConsistencyEntityListener}
+     */
    public function addSocialIssue(SocialIssue $socialIssue): self
    {
        if (!$this->socialIssues->contains($socialIssue)) {
            $this->socialIssues[] = $socialIssue;
        }

+        if ($this->getAccompanyingPeriod() !== null) {
+            $this->getAccompanyingPeriod()->addSocialIssue($socialIssue);
+        }
+
        return $this;
    }

@@ -286,13 +316,17 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
     * get the center
     * center is extracted from person.
     */
-    public function getCenter(): ?Center
+    public function getCenters(): iterable
    {
        if ($this->person instanceof Person) {
-            return $this->person->getCenter();
+            return [$this->person->getCenter()];
        }

-        return null;
+        if ($this->getAccompanyingPeriod() instanceof AccompanyingPeriod) {
+            return $this->getAccompanyingPeriod()->getCenters() ?? [];
+        }
+
+        return [];
    }

    public function getComment(): CommentEmbeddable
@@ -357,7 +391,7 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
        if (null !== $this->accompanyingPeriod) {
            $personsAssociated = [];

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

+    public function getPrivateComment(): PrivateCommentEmbeddable
+    {
+        return $this->privateComment;
+    }
+
    public function getReasons(): Collection
    {
        return $this->reasons;
@@ -397,6 +436,19 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
        return $this->scope;
    }

+    public function getScopes(): iterable
+    {
+        if (null !== $this->getAccompanyingPeriod()) {
+            return $this->getAccompanyingPeriod()->getScopes();
+        }
+
+        if (null !== $this->getPerson()) {
+            return [$this->scope];
+        }
+
+        return [];
+    }
+
    public function getSentReceived(): string
    {
        return $this->sentReceived;
@@ -500,6 +552,10 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
    {
        $this->accompanyingPeriod = $accompanyingPeriod;

+        foreach ($this->getSocialIssues() as $issue) {
+            $this->accompanyingPeriod->addSocialIssue($issue);
+        }
+
        return $this;
    }

@@ -573,6 +629,13 @@ 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;
@@ -631,4 +694,13 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac

        return $this;
    }
+
+    private function ensureSocialActionConsistency(): void
+    {
+        $ancestors = SocialAction::findAncestorSocialActions($this->getSocialActions());
+
+        foreach ($ancestors as $ancestor) {
+            $this->removeSocialAction($ancestor);
+        }
+    }
 }
@@ -1,14 +1,14 @@
 <?php

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

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

 use Doctrine\ORM\Mapping as ORM;
@@ -1,14 +1,14 @@
 <?php

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

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

 use Doctrine\ORM\Mapping as ORM;
@@ -63,10 +63,8 @@ class ActivityReason

    /**
     * Get category.
-     *
-     * @return ActivityReasonCategory
     */
-    public function getCategory()
+    public function getCategory(): ?ActivityReasonCategory
    {
        return $this->category;
    }
@@ -107,6 +105,11 @@ class ActivityReason
        return $this->name;
    }

+    public function isActiveAndParentActive(): bool
+    {
+        return $this->active && null !== $this->getCategory() && $this->getCategory()->getActive();
+    }
+
    /**
     * Set active.
     *
@@ -1,14 +1,14 @@
 <?php

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

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

 use Doctrine\Common\Collections\ArrayCollection;
@@ -1,14 +1,14 @@
 <?php

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

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

 use Doctrine\ORM\Mapping as ORM;
@@ -167,6 +167,16 @@ class ActivityType
     */
    private int $personVisible = self::FIELD_REQUIRED;

+    /**
+     * @ORM\Column(type="string", nullable=false, options={"default": ""})
+     */
+    private string $privateCommentLabel = '';
+
+    /**
+     * @ORM\Column(type="smallint", nullable=false, options={"default": 1})
+     */
+    private int $privateCommentVisible = self::FIELD_OPTIONAL;
+
    /**
     * @ORM\Column(type="string", nullable=false, options={"default": ""})
     */
@@ -271,7 +281,7 @@ class ActivityType
    public function checkSocialActionsVisibility(ExecutionContextInterface $context, $payload)
    {
        if ($this->socialIssuesVisible !== $this->socialActionsVisible) {
-            if (!($this->socialIssuesVisible === 2 && $this->socialActionsVisible === 1)) {
+            if (!(2 === $this->socialIssuesVisible && 1 === $this->socialActionsVisible)) {
                $context
                    ->buildViolation('The socialActionsVisible value is not compatible with the socialIssuesVisible value')
                    ->atPath('socialActionsVisible')
@@ -416,6 +426,16 @@ class ActivityType
        return $this->personVisible;
    }

+    public function getPrivateCommentLabel(): string
+    {
+        return $this->privateCommentLabel;
+    }
+
+    public function getPrivateCommentVisible(): int
+    {
+        return $this->privateCommentVisible;
+    }
+
    public function getReasonsLabel(): string
    {
        return $this->reasonsLabel;
@@ -496,6 +516,11 @@ class ActivityType
        return $this->userVisible;
    }

+    public function hasCategory(): bool
+    {
+        return null !== $this->getCategory();
+    }
+
    /**
     * Is active
     * return true if the type is active.
@@ -688,6 +713,20 @@ class ActivityType
        return $this;
    }

+    public function setPrivateCommentLabel(string $privateCommentLabel): self
+    {
+        $this->privateCommentLabel = $privateCommentLabel;
+
+        return $this;
+    }
+
+    public function setPrivateCommentVisible(int $privateCommentVisible): self
+    {
+        $this->privateCommentVisible = $privateCommentVisible;
+
+        return $this;
+    }
+
    public function setReasonsLabel(string $reasonsLabel): self
    {
        $this->reasonsLabel = $reasonsLabel;
@@ -1,14 +1,14 @@
 <?php

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

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

 use Doctrine\ORM\Mapping as ORM;
@@ -1,14 +1,14 @@
 <?php

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

-declare(strict_types=1);
-
 namespace Chill\ActivityBundle\EntityListener;

 use Chill\ActivityBundle\Entity\Activity;
@@ -66,9 +66,6 @@ class ActivityEntityListener
                    $newAction->addPerson($person);
                }

-                foreach ($associatedThirdparties as $thirdparty) {
-                    $newAction->setHandlingThierparty($thirdparty);
-                }
                $this->em->persist($newAction);
                $this->em->flush();
            }
@@ -0,0 +1,68 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\ActivityBundle\Export\Aggregator\ACPAggregators;
+
+use Chill\ActivityBundle\Entity\Activity;
+use Chill\MainBundle\Export\AggregatorInterface;
+use Chill\PersonBundle\Export\Declarations;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\FormBuilderInterface;
+
+class ByActivityNumberAggregator implements AggregatorInterface
+{
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data): void
+    {
+        $qb
+            ->addSelect('(SELECT COUNT(activity.id) FROM ' . Activity::class . ' activity WHERE activity.accompanyingPeriod = acp) AS activity_by_number_aggregator')
+            ->addGroupBy('activity_by_number_aggregator');
+    }
+
+    public function applyOn(): string
+    {
+        return Declarations::ACP_TYPE;
+    }
+
+    public function buildForm(FormBuilderInterface $builder): void
+    {
+        // No form needed
+    }
+
+    public function getLabels($key, array $values, $data)
+    {
+        return static function ($value) {
+            if ('_header' === $value) {
+                return '';
+            }
+
+            if (null === $value) {
+                return '';
+            }
+
+            return $value;
+        };
+    }
+
+    public function getQueryKeys($data): array
+    {
+        return ['activity_by_number_aggregator'];
+    }
+
+    public function getTitle(): string
+    {
+        return 'Group acp by activity number';
+    }
+}
@@ -0,0 +1,82 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\ActivityBundle\Export\Aggregator\ACPAggregators;
+
+use Chill\ActivityBundle\Export\Declarations;
+use Chill\MainBundle\Export\AggregatorInterface;
+use Chill\MainBundle\Repository\UserRepositoryInterface;
+use Chill\MainBundle\Templating\Entity\UserRender;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\FormBuilderInterface;
+
+class ByCreatorAggregator implements AggregatorInterface
+{
+    private UserRender $userRender;
+
+    private UserRepositoryInterface $userRepository;
+
+    public function __construct(
+        UserRepositoryInterface $userRepository,
+        UserRender $userRender
+    ) {
+        $this->userRepository = $userRepository;
+        $this->userRender = $userRender;
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        $qb->addSelect('IDENTITY(activity.createdBy) AS creator_aggregator');
+        $qb->addGroupBy('creator_aggregator');
+    }
+
+    public function applyOn(): string
+    {
+        return Declarations::ACTIVITY_ACP;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        // no form
+    }
+
+    public function getLabels($key, array $values, $data)
+    {
+        return function ($value): string {
+            if ('_header' === $value) {
+                return 'Created by';
+            }
+
+            if (null === $value || '' === $value) {
+                return '';
+            }
+
+            $u = $this->userRepository->find($value);
+
+            return $this->userRender->renderString($u, []);
+        };
+    }
+
+    public function getQueryKeys($data): array
+    {
+        return ['creator_aggregator'];
+    }
+
+    public function getTitle(): string
+    {
+        return 'Group activity by creator';
+    }
+}
@@ -0,0 +1,87 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\ActivityBundle\Export\Aggregator\ACPAggregators;
+
+use Chill\ActivityBundle\Export\Declarations;
+use Chill\MainBundle\Export\AggregatorInterface;
+use Chill\PersonBundle\Repository\SocialWork\SocialActionRepository;
+use Chill\PersonBundle\Templating\Entity\SocialActionRender;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\FormBuilderInterface;
+use function in_array;
+
+class BySocialActionAggregator implements AggregatorInterface
+{
+    private SocialActionRender $actionRender;
+
+    private SocialActionRepository $actionRepository;
+
+    public function __construct(
+        SocialActionRender $actionRender,
+        SocialActionRepository $actionRepository
+    ) {
+        $this->actionRender = $actionRender;
+        $this->actionRepository = $actionRepository;
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        if (!in_array('actsocialaction', $qb->getAllAliases(), true)) {
+            $qb->leftJoin('activity.socialActions', 'actsocialaction');
+        }
+
+        $qb->addSelect('actsocialaction.id AS socialaction_aggregator');
+        $qb->addGroupBy('socialaction_aggregator');
+    }
+
+    public function applyOn(): string
+    {
+        return Declarations::ACTIVITY_ACP;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        // no form
+    }
+
+    public function getLabels($key, array $values, $data)
+    {
+        return function ($value) {
+            if ('_header' === $value) {
+                return 'Social action';
+            }
+
+            if (null === $value || '' === $value) {
+                return '';
+            }
+
+            $sa = $this->actionRepository->find($value);
+
+            return $this->actionRender->renderString($sa, []);
+        };
+    }
+
+    public function getQueryKeys($data): array
+    {
+        return ['socialaction_aggregator'];
+    }
+
+    public function getTitle(): string
+    {
+        return 'Group activity by linked socialaction';
+    }
+}
@@ -0,0 +1,87 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\ActivityBundle\Export\Aggregator\ACPAggregators;
+
+use Chill\ActivityBundle\Export\Declarations;
+use Chill\MainBundle\Export\AggregatorInterface;
+use Chill\PersonBundle\Repository\SocialWork\SocialIssueRepository;
+use Chill\PersonBundle\Templating\Entity\SocialIssueRender;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\FormBuilderInterface;
+use function in_array;
+
+class BySocialIssueAggregator implements AggregatorInterface
+{
+    private SocialIssueRender $issueRender;
+
+    private SocialIssueRepository $issueRepository;
+
+    public function __construct(
+        SocialIssueRepository $issueRepository,
+        SocialIssueRender $issueRender
+    ) {
+        $this->issueRepository = $issueRepository;
+        $this->issueRender = $issueRender;
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        if (!in_array('actsocialissue', $qb->getAllAliases(), true)) {
+            $qb->leftJoin('activity.socialIssues', 'actsocialissue');
+        }
+
+        $qb->addSelect('actsocialissue.id AS socialissue_aggregator');
+        $qb->addGroupBy('socialissue_aggregator');
+    }
+
+    public function applyOn(): string
+    {
+        return Declarations::ACTIVITY_ACP;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        // no form
+    }
+
+    public function getLabels($key, array $values, $data)
+    {
+        return function ($value): string {
+            if ('_header' === $value) {
+                return 'Social issues';
+            }
+
+            if (null === $value || '' === $value) {
+                return '';
+            }
+
+            $i = $this->issueRepository->find($value);
+
+            return $this->issueRender->renderString($i, []);
+        };
+    }
+
+    public function getQueryKeys($data): array
+    {
+        return ['socialissue_aggregator'];
+    }
+
+    public function getTitle(): string
+    {
+        return 'Group activity by linked socialissue';
+    }
+}
@@ -0,0 +1,87 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\ActivityBundle\Export\Aggregator\ACPAggregators;
+
+use Chill\ActivityBundle\Export\Declarations;
+use Chill\MainBundle\Export\AggregatorInterface;
+use Chill\ThirdPartyBundle\Repository\ThirdPartyRepository;
+use Chill\ThirdPartyBundle\Templating\Entity\ThirdPartyRender;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\FormBuilderInterface;
+use function in_array;
+
+class ByThirdpartyAggregator implements AggregatorInterface
+{
+    private ThirdPartyRender $thirdPartyRender;
+
+    private ThirdPartyRepository $thirdPartyRepository;
+
+    public function __construct(
+        ThirdPartyRepository $thirdPartyRepository,
+        ThirdPartyRender $thirdPartyRender
+    ) {
+        $this->thirdPartyRepository = $thirdPartyRepository;
+        $this->thirdPartyRender = $thirdPartyRender;
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        if (!in_array('acttparty', $qb->getAllAliases(), true)) {
+            $qb->leftJoin('activity.thirdParties', 'acttparty');
+        }
+
+        $qb->addSelect('acttparty.id AS thirdparty_aggregator');
+        $qb->addGroupBy('thirdparty_aggregator');
+    }
+
+    public function applyOn(): string
+    {
+        return Declarations::ACTIVITY_ACP;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        // no form
+    }
+
+    public function getLabels($key, array $values, $data)
+    {
+        return function ($value): string {
+            if ('_header' === $value) {
+                return 'Accepted thirdparty';
+            }
+
+            if (null === $value || '' === $value) {
+                return '';
+            }
+
+            $tp = $this->thirdPartyRepository->find($value);
+
+            return $this->thirdPartyRender->renderString($tp, []);
+        };
+    }
+
+    public function getQueryKeys($data): array
+    {
+        return ['thirdparty_aggregator'];
+    }
+
+    public function getTitle(): string
+    {
+        return 'Group activity by linked thirdparties';
+    }
+}
@@ -0,0 +1,89 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\ActivityBundle\Export\Aggregator\ACPAggregators;
+
+use Chill\ActivityBundle\Export\Declarations;
+use Chill\MainBundle\Export\AggregatorInterface;
+use Chill\MainBundle\Repository\ScopeRepository;
+use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\FormBuilderInterface;
+use function in_array;
+
+class CreatorScopeAggregator implements AggregatorInterface
+{
+    private ScopeRepository $scopeRepository;
+
+    private TranslatableStringHelper $translatableStringHelper;
+
+    public function __construct(
+        ScopeRepository $scopeRepository,
+        TranslatableStringHelper $translatableStringHelper
+    ) {
+        $this->scopeRepository = $scopeRepository;
+        $this->translatableStringHelper = $translatableStringHelper;
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        if (!in_array('actcreator', $qb->getAllAliases(), true)) {
+            $qb->leftJoin('activity.createdBy', 'actcreator');
+        }
+
+        $qb->addSelect('IDENTITY(actcreator.mainScope) AS creatorscope_aggregator');
+        $qb->addGroupBy('creatorscope_aggregator');
+    }
+
+    public function applyOn(): string
+    {
+        return Declarations::ACTIVITY_ACP;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        // no form
+    }
+
+    public function getLabels($key, array $values, $data)
+    {
+        return function ($value): string {
+            if ('_header' === $value) {
+                return 'Scope';
+            }
+
+            if (null === $value || '' === $value) {
+                return '';
+            }
+
+            $s = $this->scopeRepository->find($value);
+
+            return $this->translatableStringHelper->localize(
+                $s->getName()
+            );
+        };
+    }
+
+    public function getQueryKeys($data): array
+    {
+        return ['creatorscope_aggregator'];
+    }
+
+    public function getTitle(): string
+    {
+        return 'Group activity by creator scope';
+    }
+}
@@ -0,0 +1,124 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\ActivityBundle\Export\Aggregator\ACPAggregators;
+
+use Chill\ActivityBundle\Export\Declarations;
+use Chill\MainBundle\Export\AggregatorInterface;
+use Doctrine\ORM\QueryBuilder;
+use RuntimeException;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
+
+class DateAggregator implements AggregatorInterface
+{
+    private const CHOICES = [
+        'by month' => 'month',
+        'by week' => 'week',
+        'by year' => 'year',
+    ];
+
+    private const DEFAULT_CHOICE = 'year';
+
+    private TranslatorInterface $translator;
+
+    public function __construct(
+        TranslatorInterface $translator
+    ) {
+        $this->translator = $translator;
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        $order = null;
+
+        switch ($data['frequency']) {
+            case 'month':
+                $fmt = 'YYYY-MM';
+
+                break;
+
+            case 'week':
+                $fmt = 'YYYY-IW';
+
+                break;
+
+            case 'year':
+                $fmt = 'YYYY'; $order = 'DESC';
+
+                break; // order DESC does not works !
+
+            default:
+                throw new RuntimeException(sprintf("The frequency data '%s' is invalid.", $data['frequency']));
+        }
+
+        $qb->addSelect(sprintf("TO_CHAR(activity.date, '%s') AS date_aggregator", $fmt));
+        $qb->addGroupBy('date_aggregator');
+        $qb->addOrderBy('date_aggregator', $order);
+    }
+
+    public function applyOn(): string
+    {
+        return Declarations::ACTIVITY_ACP;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        $builder->add('frequency', ChoiceType::class, [
+            'choices' => self::CHOICES,
+            'multiple' => false,
+            'expanded' => true,
+            'empty_data' => self::DEFAULT_CHOICE,
+            'data' => self::DEFAULT_CHOICE,
+        ]);
+    }
+
+    public function getLabels($key, array $values, $data)
+    {
+        return static function ($value) use ($data): string {
+            if ('_header' === $value) {
+                return 'by ' . $data['frequency'];
+            }
+
+            if (null === $value) {
+                return '';
+            }
+
+            switch ($data['frequency']) {
+                case 'month':
+                case 'week':
+                    //return $this->translator->trans('for week') .' '. $value ;
+
+                case 'year':
+                    //return $this->translator->trans('in year') .' '. $value ;
+
+                default:
+                    return $value;
+            }
+        };
+    }
+
+    public function getQueryKeys($data): array
+    {
+        return ['date_aggregator'];
+    }
+
+    public function getTitle(): string
+    {
+        return 'Group activity by date';
+    }
+}
@@ -0,0 +1,91 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\ActivityBundle\Export\Aggregator\ACPAggregators;
+
+use Chill\ActivityBundle\Export\Declarations;
+use Chill\MainBundle\Export\AggregatorInterface;
+use Chill\MainBundle\Repository\LocationTypeRepository;
+use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\FormBuilderInterface;
+use function in_array;
+
+class LocationTypeAggregator implements AggregatorInterface
+{
+    private LocationTypeRepository $locationTypeRepository;
+
+    private TranslatableStringHelper $translatableStringHelper;
+
+    public function __construct(
+        LocationTypeRepository $locationTypeRepository,
+        TranslatableStringHelper $translatableStringHelper
+    ) {
+        $this->locationTypeRepository = $locationTypeRepository;
+        $this->translatableStringHelper = $translatableStringHelper;
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        if (!in_array('actloc', $qb->getAllAliases(), true)) {
+            $qb->leftJoin('activity.location', 'actloc');
+        }
+
+        $qb->addSelect('IDENTITY(actloc.locationType) AS locationtype_aggregator');
+        $qb->addGroupBy('locationtype_aggregator');
+    }
+
+    public function applyOn(): string
+    {
+        return Declarations::ACTIVITY_ACP;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        // no form
+    }
+
+    public function getLabels($key, array $values, $data)
+    {
+        return function ($value): string {
+            if ('_header' === $value) {
+                return 'Accepted locationtype';
+            }
+
+            if (null === $value || '' === $value) {
+                return '';
+            }
+
+            if (null === $lt = $this->locationTypeRepository->find($value)) {
+                return '';
+            }
+
+            return $this->translatableStringHelper->localize(
+                $lt->getTitle()
+            );
+        };
+    }
+
+    public function getQueryKeys($data): array
+    {
+        return ['locationtype_aggregator'];
+    }
+
+    public function getTitle(): string
+    {
+        return 'Group activity by locationtype';
+    }
+}
@@ -1,59 +1,59 @@
 <?php

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

-declare(strict_types=1);
-
 namespace Chill\ActivityBundle\Export\Aggregator;

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

 class ActivityTypeAggregator implements AggregatorInterface
 {
    public const KEY = 'activity_type_aggregator';

-    protected ActivityTypeRepository $activityTypeRepository;
+    protected ActivityTypeRepositoryInterface $activityTypeRepository;

    protected TranslatableStringHelperInterface $translatableStringHelper;

    public function __construct(
-        ActivityTypeRepository $activityTypeRepository,
+        ActivityTypeRepositoryInterface $activityTypeRepository,
        TranslatableStringHelperInterface $translatableStringHelper
    ) {
        $this->activityTypeRepository = $activityTypeRepository;
        $this->translatableStringHelper = $translatableStringHelper;
    }

-    public function addRole()
+    public function addRole(): ?string
    {
-        return new Role(ActivityStatsVoter::STATS);
+        return null;
    }

    public function alterQuery(QueryBuilder $qb, $data)
    {
-        // add select element
-        $qb->addSelect(sprintf('IDENTITY(activity.type) AS %s', self::KEY));
+        if (!in_array('acttype', $qb->getAllAliases(), true)) {
+            $qb->leftJoin('activity.activityType', 'acttype');
+        }

-        // add the "group by" part
+        $qb->addSelect(sprintf('IDENTITY(activity.activityType) AS %s', self::KEY));
        $qb->addGroupBy(self::KEY);
    }

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

    public function buildForm(FormBuilderInterface $builder)
@@ -71,6 +71,10 @@ class ActivityTypeAggregator implements AggregatorInterface
                return 'Activity type';
            }

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

            return $this->translatableStringHelper->localize($t->getName());
@@ -86,23 +90,4 @@ class ActivityTypeAggregator implements AggregatorInterface
    {
        return 'Aggregate by activity type';
    }
-
-    /**
-     * Check if a join between Activity and another alias.
-     *
-     * @param Join[] $joins
-     * @param string $alias the alias to search for
-     *
-     * @return bool
-     */
-    private function checkJoinAlreadyDefined(array $joins, $alias)
-    {
-        foreach ($joins as $join) {
-            if ($join->getAlias() === $alias) {
-                return true;
-            }
-        }
-
-        return false;
-    }
 }
@@ -1,39 +1,43 @@
 <?php

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

-declare(strict_types=1);
-
 namespace Chill\ActivityBundle\Export\Aggregator;

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

 class ActivityUserAggregator implements AggregatorInterface
 {
    public const KEY = 'activity_user_id';

+    private UserRender $userRender;
+
    private UserRepository $userRepository;

    public function __construct(
-        UserRepository $userRepository
+        UserRepository $userRepository,
+        UserRender $userRender
    ) {
        $this->userRepository = $userRepository;
+        $this->userRender = $userRender;
    }

-    public function addRole()
+    public function addRole(): ?string
    {
-        return new Role(ActivityStatsVoter::STATS);
+        return null;
    }

    public function alterQuery(QueryBuilder $qb, $data)
@@ -47,7 +51,7 @@ class ActivityUserAggregator implements AggregatorInterface

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

    public function buildForm(FormBuilderInterface $builder)
@@ -57,15 +61,18 @@ class ActivityUserAggregator implements AggregatorInterface

    public function getLabels($key, $values, $data): Closure
    {
-        // preload users at once
-        $this->userRepository->findBy(['id' => $values]);
-
        return function ($value) {
            if ('_header' === $value) {
-                return 'activity user';
+                return 'Activity user';
            }

-            return $this->userRepository->find($value)->getUsername();
+            if (null === $value || '' === $value) {
+                return '';
+            }
+
+            $u = $this->userRepository->find($value);
+
+            return $this->userRender->renderString($u, []);
        };
    }

@@ -0,0 +1,86 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\ActivityBundle\Export\Aggregator;
+
+use Chill\ActivityBundle\Export\Declarations;
+use Chill\MainBundle\Export\AggregatorInterface;
+use Chill\MainBundle\Repository\UserRepositoryInterface;
+use Chill\MainBundle\Templating\Entity\UserRender;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\FormBuilderInterface;
+use function in_array;
+
+class ActivityUsersAggregator implements AggregatorInterface
+{
+    private UserRender $userRender;
+
+    private UserRepositoryInterface $userRepository;
+
+    public function __construct(UserRepositoryInterface $userRepository, UserRender $userRender)
+    {
+        $this->userRepository = $userRepository;
+        $this->userRender = $userRender;
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        if (!in_array('actusers', $qb->getAllAliases(), true)) {
+            $qb->leftJoin('activity.users', 'actusers');
+        }
+
+        $qb
+            ->addSelect('actusers.id AS activity_users_aggregator')
+            ->addGroupBy('activity_users_aggregator');
+    }
+
+    public function applyOn(): string
+    {
+        return Declarations::ACTIVITY;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        // nothing to add on the form
+    }
+
+    public function getLabels($key, array $values, $data)
+    {
+        return function ($value) {
+            if ('_header' === $value) {
+                return 'Activity users';
+            }
+
+            if (null === $value || '' === $value) {
+                return '';
+            }
+
+            $u = $this->userRepository->find($value);
+
+            return $this->userRender->renderString($u, []);
+        };
+    }
+
+    public function getQueryKeys($data)
+    {
+        return ['activity_users_aggregator'];
+    }
+
+    public function getTitle()
+    {
+        return 'Aggregate by activity users';
+    }
+}
@@ -0,0 +1,87 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\ActivityBundle\Export\Aggregator;
+
+use Chill\ActivityBundle\Export\Declarations;
+use Chill\MainBundle\Repository\UserJobRepositoryInterface;
+use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\FormBuilderInterface;
+use function in_array;
+
+class ActivityUsersJobAggregator implements \Chill\MainBundle\Export\AggregatorInterface
+{
+    private TranslatableStringHelperInterface $translatableStringHelper;
+
+    private UserJobRepositoryInterface $userJobRepository;
+
+    public function __construct(UserJobRepositoryInterface $userJobRepository, TranslatableStringHelperInterface $translatableStringHelper)
+    {
+        $this->userJobRepository = $userJobRepository;
+        $this->translatableStringHelper = $translatableStringHelper;
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        if (!in_array('actusers', $qb->getAllAliases(), true)) {
+            $qb->leftJoin('activity.users', 'actusers');
+        }
+
+        $qb
+            ->addSelect('IDENTITY(actusers.userJob) AS activity_users_job_aggregator')
+            ->addGroupBy('activity_users_job_aggregator');
+    }
+
+    public function applyOn()
+    {
+        return Declarations::ACTIVITY;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        // nothing to add in the form
+    }
+
+    public function getLabels($key, array $values, $data)
+    {
+        return function ($value): string {
+            if ('_header' === $value) {
+                return 'Users \'s job';
+            }
+
+            if (null === $value || '' === $value) {
+                return '';
+            }
+
+            $j = $this->userJobRepository->find($value);
+
+            return $this->translatableStringHelper->localize(
+                $j->getLabel()
+            );
+        };
+    }
+
+    public function getQueryKeys($data): array
+    {
+        return ['activity_users_job_aggregator'];
+    }
+
+    public function getTitle()
+    {
+        return 'Aggregate by users job';
+    }
+}
@@ -0,0 +1,87 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\ActivityBundle\Export\Aggregator;
+
+use Chill\ActivityBundle\Export\Declarations;
+use Chill\MainBundle\Repository\ScopeRepositoryInterface;
+use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\FormBuilderInterface;
+use function in_array;
+
+class ActivityUsersScopeAggregator implements \Chill\MainBundle\Export\AggregatorInterface
+{
+    private ScopeRepositoryInterface $scopeRepository;
+
+    private TranslatableStringHelperInterface $translatableStringHelper;
+
+    public function __construct(ScopeRepositoryInterface $scopeRepository, TranslatableStringHelperInterface $translatableStringHelper)
+    {
+        $this->scopeRepository = $scopeRepository;
+        $this->translatableStringHelper = $translatableStringHelper;
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        if (!in_array('actusers', $qb->getAllAliases(), true)) {
+            $qb->leftJoin('activity.users', 'actusers');
+        }
+
+        $qb
+            ->addSelect('IDENTITY(actusers.mainScope) AS activity_users_main_scope_aggregator')
+            ->addGroupBy('activity_users_main_scope_aggregator');
+    }
+
+    public function applyOn()
+    {
+        return Declarations::ACTIVITY;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        // nothing to add in the form
+    }
+
+    public function getLabels($key, array $values, $data)
+    {
+        return function ($value): string {
+            if ('_header' === $value) {
+                return 'Users \'s scope';
+            }
+
+            if (null === $value || '' === $value) {
+                return '';
+            }
+
+            $s = $this->scopeRepository->find($value);
+
+            return $this->translatableStringHelper->localize(
+                $s->getName()
+            );
+        };
+    }
+
+    public function getQueryKeys($data): array
+    {
+        return ['activity_users_main_scope_aggregator'];
+    }
+
+    public function getTitle()
+    {
+        return 'Aggregate by users scope';
+    }
+}
@@ -1,19 +1,19 @@
 <?php

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

-declare(strict_types=1);
-
-namespace Chill\ActivityBundle\Export\Aggregator;
+namespace Chill\ActivityBundle\Export\Aggregator\PersonAggregators;

+use Chill\ActivityBundle\Export\Declarations;
 use Chill\ActivityBundle\Repository\ActivityReasonCategoryRepository;
 use Chill\ActivityBundle\Repository\ActivityReasonRepository;
-use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
 use Chill\MainBundle\Export\AggregatorInterface;
 use Chill\MainBundle\Export\ExportElementValidatedInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
@@ -23,11 +23,10 @@ use Doctrine\ORM\QueryBuilder;
 use RuntimeException;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\Security\Core\Role\Role;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;

-use function array_key_exists;
 use function count;
+use function in_array;

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

-    public function addRole()
+    public function addRole(): ?string
    {
-        return new Role(ActivityStatsVoter::STATS);
+        return null;
    }

    public function alterQuery(QueryBuilder $qb, $data)
    {
        // add select element
        if ('reasons' === $data['level']) {
-            $elem = 'reasons.id';
+            $elem = 'actreasons.id';
            $alias = 'activity_reasons_id';
        } elseif ('categories' === $data['level']) {
-            $elem = 'category.id';
+            $elem = 'actreasoncat.id';
            $alias = 'activity_categories_id';
        } else {
            throw new RuntimeException('The data provided are not recognized.');
@@ -68,29 +67,15 @@ class ActivityReasonAggregator implements AggregatorInterface, ExportElementVali
        $qb->addSelect($elem . ' as ' . $alias);

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

        // join category if necessary
        if ('activity_categories_id' === $alias) {
            // add join only if needed
-            if (!$this->checkJoinAlreadyDefined($qb->getDQLPart('join')['activity'], 'category')) {
-                $qb->join('reasons.category', 'category');
+            if (!in_array('actreasoncat', $qb->getAllAliases(), true)) {
+                $qb->join('actreasons.category', 'actreasoncat');
            }
        }

@@ -104,9 +89,9 @@ class ActivityReasonAggregator implements AggregatorInterface, ExportElementVali
        }
    }

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

    public function buildForm(FormBuilderInterface $builder)
@@ -149,6 +134,10 @@ class ActivityReasonAggregator implements AggregatorInterface, ExportElementVali
                return 'reasons' === $data['level'] ? 'Group by reasons' : 'Group by categories of reason';
            }

+            if (null === $value || '' === $value) {
+                return '';
+            }
+
            switch ($data['level']) {
                case 'reasons':
                    $r = $this->activityReasonRepository->find($value);
@@ -194,23 +183,4 @@ class ActivityReasonAggregator implements AggregatorInterface, ExportElementVali
                ->addViolation();
        }
    }
-
-    /**
-     * Check if a join between Activity and another alias.
-     *
-     * @param Join[] $joins
-     * @param string $alias the alias to search for
-     *
-     * @return bool
-     */
-    private function checkJoinAlreadyDefined(array $joins, $alias)
-    {
-        foreach ($joins as $join) {
-            if ($join->getAlias() === $alias) {
-                return true;
-            }
-        }
-
-        return false;
-    }
 }
@@ -0,0 +1,84 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\ActivityBundle\Export\Aggregator;
+
+use Chill\ActivityBundle\Export\Declarations;
+use Chill\MainBundle\Export\AggregatorInterface;
+use Doctrine\ORM\QueryBuilder;
+use LogicException;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
+
+class SentReceivedAggregator implements AggregatorInterface
+{
+    private TranslatorInterface $translator;
+
+    public function __construct(TranslatorInterface $translator)
+    {
+        $this->translator = $translator;
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data): void
+    {
+        $qb->addSelect('activity.sentReceived AS activity_sentreceived_aggregator')
+            ->addGroupBy('activity_sentreceived_aggregator');
+    }
+
+    public function applyOn(): string
+    {
+        return Declarations::ACTIVITY;
+    }
+
+    public function buildForm(FormBuilderInterface $builder): void
+    {
+        // No form needed
+    }
+
+    public function getLabels($key, array $values, $data): callable
+    {
+        return function (?string $value): string {
+            if ('_header' === $value) {
+                return 'export.aggregator.activity.by_sent_received.Sent or received';
+            }
+
+            switch ($value) {
+                case null:
+                case '':
+                    return '';
+
+                case 'sent':
+                    return $this->translator->trans('export.aggregator.activity.by_sent_received.is sent');
+
+                case 'received':
+                    return $this->translator->trans('export.aggregator.activity.by_sent_received.is received');
+
+                default:
+                    throw new LogicException(sprintf('The value %s is not valid', $value));
+            }
+        };
+    }
+
+    public function getQueryKeys($data): array
+    {
+        return ['activity_sentreceived_aggregator'];
+    }
+
+    public function getTitle(): string
+    {
+        return 'export.aggregator.activity.by_sent_received.Group activity by sentreceived';
+    }
+}
@@ -0,0 +1,24 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\ActivityBundle\Export;
+
+/**
+ * This class declare constants used for the export framework.
+ */
+abstract class Declarations
+{
+    public const ACTIVITY = 'activity';
+
+    public const ACTIVITY_ACP = 'activity_linked_to_acp';
+
+    public const ACTIVITY_PERSON = 'activity_linked_to_person';
+}
@@ -0,0 +1,127 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\ActivityBundle\Export\Export\LinkedToACP;
+
+use Chill\ActivityBundle\Entity\Activity;
+use Chill\ActivityBundle\Export\Declarations;
+use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
+use Chill\MainBundle\Export\ExportInterface;
+use Chill\MainBundle\Export\FormatterInterface;
+use Chill\MainBundle\Export\GroupedExportInterface;
+use Chill\PersonBundle\Entity\AccompanyingPeriodParticipation;
+use Chill\PersonBundle\Entity\Person\PersonCenterHistory;
+use Chill\PersonBundle\Export\Declarations as PersonDeclarations;
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\EntityRepository;
+use Doctrine\ORM\Query;
+use LogicException;
+use Symfony\Component\Form\FormBuilderInterface;
+
+class AvgActivityDuration implements ExportInterface, GroupedExportInterface
+{
+    protected EntityRepository $repository;
+
+    public function __construct(
+        EntityManagerInterface $em
+    ) {
+        $this->repository = $em->getRepository(Activity::class);
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+    }
+
+    public function getAllowedFormattersTypes(): array
+    {
+        return [FormatterInterface::TYPE_TABULAR];
+    }
+
+    public function getDescription(): string
+    {
+        return 'Average activities linked to an accompanying period duration by various parameters.';
+    }
+
+    public function getGroup(): string
+    {
+        return 'Exports of activities linked to an accompanying period';
+    }
+
+    public function getLabels($key, array $values, $data)
+    {
+        if ('export_avg_activity_duration' !== $key) {
+            throw new LogicException("the key {$key} is not used by this export");
+        }
+
+        return static fn ($value) => '_header' === $value ? 'Average activities linked to an accompanying period duration' : $value;
+    }
+
+    public function getQueryKeys($data): array
+    {
+        return ['export_avg_activity_duration'];
+    }
+
+    public function getResult($query, $data)
+    {
+        return $query->getQuery()->getResult(Query::HYDRATE_SCALAR);
+    }
+
+    public function getTitle(): string
+    {
+        return 'Average activity linked to an accompanying period duration';
+    }
+
+    public function getType(): string
+    {
+        return Declarations::ACTIVITY;
+    }
+
+    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
+    {
+        $centers = array_map(static function ($el) {
+            return $el['center'];
+        }, $acl);
+
+        $qb = $this->repository->createQueryBuilder('activity');
+
+        $qb
+            ->join('activity.accompanyingPeriod', 'acp')
+            ->select('AVG(activity.durationTime) as export_avg_activity_duration')
+            ->andWhere($qb->expr()->isNotNull('activity.durationTime'));
+
+        $qb
+            ->andWhere(
+                $qb->expr()->exists(
+                    'SELECT 1 FROM ' . AccompanyingPeriodParticipation::class . ' acl_count_part
+                    JOIN ' . PersonCenterHistory::class . ' acl_count_person_history WITH IDENTITY(acl_count_person_history.person) = IDENTITY(acl_count_part.person)
+                    WHERE acl_count_part.accompanyingPeriod = acp.id AND acl_count_person_history.center IN (:authorized_centers)
+                    '
+                )
+            )
+            ->setParameter('authorized_centers', $centers);
+
+        return $qb;
+    }
+
+    public function requiredRole(): string
+    {
+        return ActivityStatsVoter::STATS;
+    }
+
+    public function supportsModifiers(): array
+    {
+        return [
+            Declarations::ACTIVITY,
+            Declarations::ACTIVITY_ACP,
+            PersonDeclarations::ACP_TYPE,
+        ];
+    }
+}
@@ -0,0 +1,128 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\ActivityBundle\Export\Export\LinkedToACP;
+
+use Chill\ActivityBundle\Entity\Activity;
+use Chill\ActivityBundle\Export\Declarations;
+use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
+use Chill\MainBundle\Export\ExportInterface;
+use Chill\MainBundle\Export\FormatterInterface;
+use Chill\MainBundle\Export\GroupedExportInterface;
+use Chill\PersonBundle\Entity\AccompanyingPeriodParticipation;
+use Chill\PersonBundle\Entity\Person\PersonCenterHistory;
+use Chill\PersonBundle\Export\Declarations as PersonDeclarations;
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\EntityRepository;
+use Doctrine\ORM\Query;
+use LogicException;
+use Symfony\Component\Form\FormBuilderInterface;
+
+class AvgActivityVisitDuration implements ExportInterface, GroupedExportInterface
+{
+    protected EntityRepository $repository;
+
+    public function __construct(
+        EntityManagerInterface $em
+    ) {
+        $this->repository = $em->getRepository(Activity::class);
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        // TODO: Implement buildForm() method.
+    }
+
+    public function getAllowedFormattersTypes(): array
+    {
+        return [FormatterInterface::TYPE_TABULAR];
+    }
+
+    public function getDescription(): string
+    {
+        return 'Average activities linked to an accompanying period visit duration by various parameters.';
+    }
+
+    public function getGroup(): string
+    {
+        return 'Exports of activities linked to an accompanying period';
+    }
+
+    public function getLabels($key, array $values, $data)
+    {
+        if ('export_avg_activity_visit_duration' !== $key) {
+            throw new LogicException("the key {$key} is not used by this export");
+        }
+
+        return static fn ($value) => '_header' === $value ? 'Average activities linked to an accompanying period visit duration' : $value;
+    }
+
+    public function getQueryKeys($data): array
+    {
+        return ['export_avg_activity_visit_duration'];
+    }
+
+    public function getResult($query, $data)
+    {
+        return $query->getQuery()->getResult(Query::HYDRATE_SCALAR);
+    }
+
+    public function getTitle(): string
+    {
+        return 'Average activity linked to an accompanying period visit duration';
+    }
+
+    public function getType(): string
+    {
+        return Declarations::ACTIVITY;
+    }
+
+    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
+    {
+        $centers = array_map(static function ($el) {
+            return $el['center'];
+        }, $acl);
+
+        $qb = $this->repository->createQueryBuilder('activity');
+
+        $qb
+            ->join('activity.accompanyingPeriod', 'acp')
+            ->select('AVG(activity.travelTime) as export_avg_activity_visit_duration')
+            ->andWhere($qb->expr()->isNotNull('activity.travelTime'));
+
+        $qb
+            ->andWhere(
+                $qb->expr()->exists(
+                    'SELECT 1 FROM ' . AccompanyingPeriodParticipation::class . ' acl_count_part
+                    JOIN ' . PersonCenterHistory::class . ' acl_count_person_history WITH IDENTITY(acl_count_person_history.person) = IDENTITY(acl_count_part.person)
+                    WHERE acl_count_part.accompanyingPeriod = acp.id AND acl_count_person_history.center IN (:authorized_centers)
+                    '
+                )
+            )
+            ->setParameter('authorized_centers', $centers);
+
+        return $qb;
+    }
+
+    public function requiredRole(): string
+    {
+        return ActivityStatsVoter::STATS;
+    }
+
+    public function supportsModifiers(): array
+    {
+        return [
+            Declarations::ACTIVITY,
+            Declarations::ACTIVITY_ACP,
+            PersonDeclarations::ACP_TYPE,
+        ];
+    }
+}
@@ -0,0 +1,126 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\ActivityBundle\Export\Export\LinkedToACP;
+
+use Chill\ActivityBundle\Entity\Activity;
+use Chill\ActivityBundle\Export\Declarations;
+use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
+use Chill\MainBundle\Export\ExportInterface;
+use Chill\MainBundle\Export\FormatterInterface;
+use Chill\MainBundle\Export\GroupedExportInterface;
+use Chill\PersonBundle\Entity\AccompanyingPeriodParticipation;
+use Chill\PersonBundle\Entity\Person\PersonCenterHistory;
+use Chill\PersonBundle\Export\Declarations as PersonDeclarations;
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\EntityRepository;
+use Doctrine\ORM\Query;
+use LogicException;
+use Symfony\Component\Form\FormBuilderInterface;
+
+class CountActivity implements ExportInterface, GroupedExportInterface
+{
+    protected EntityRepository $repository;
+
+    public function __construct(
+        EntityManagerInterface $em
+    ) {
+        $this->repository = $em->getRepository(Activity::class);
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+    }
+
+    public function getAllowedFormattersTypes(): array
+    {
+        return [FormatterInterface::TYPE_TABULAR];
+    }
+
+    public function getDescription(): string
+    {
+        return 'Count activities linked to an accompanying period by various parameters.';
+    }
+
+    public function getGroup(): string
+    {
+        return 'Exports of activities linked to an accompanying period';
+    }
+
+    public function getLabels($key, array $values, $data)
+    {
+        if ('export_count_activity' !== $key) {
+            throw new LogicException("the key {$key} is not used by this export");
+        }
+
+        return static fn ($value) => '_header' === $value ? 'Number of activities linked to an accompanying period' : $value;
+    }
+
+    public function getQueryKeys($data): array
+    {
+        return ['export_count_activity'];
+    }
+
+    public function getResult($query, $data)
+    {
+        return $query->getQuery()->getResult(Query::HYDRATE_SCALAR);
+    }
+
+    public function getTitle(): string
+    {
+        return 'Count activities linked to an accompanying period';
+    }
+
+    public function getType(): string
+    {
+        return Declarations::ACTIVITY;
+    }
+
+    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
+    {
+        $centers = array_map(static function ($el) {
+            return $el['center'];
+        }, $acl);
+
+        $qb = $this->repository
+            ->createQueryBuilder('activity')
+            ->join('activity.accompanyingPeriod', 'acp');
+
+        $qb
+            ->andWhere(
+                $qb->expr()->exists(
+                    'SELECT 1 FROM ' . AccompanyingPeriodParticipation::class . ' acl_count_part
+                    JOIN ' . PersonCenterHistory::class . ' acl_count_person_history WITH IDENTITY(acl_count_person_history.person) = IDENTITY(acl_count_part.person)
+                    WHERE acl_count_part.accompanyingPeriod = acp.id AND acl_count_person_history.center IN (:authorized_centers)
+                    '
+                )
+            )
+            ->setParameter('authorized_centers', $centers);
+
+        $qb->select('COUNT(DISTINCT activity.id) as export_count_activity');
+
+        return $qb;
+    }
+
+    public function requiredRole(): string
+    {
+        return ActivityStatsVoter::STATS;
+    }
+
+    public function supportsModifiers(): array
+    {
+        return [
+            Declarations::ACTIVITY,
+            Declarations::ACTIVITY_ACP,
+            PersonDeclarations::ACP_TYPE,
+        ];
+    }
+}
@@ -0,0 +1,165 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\ActivityBundle\Export\Export\LinkedToACP;
+
+use Chill\ActivityBundle\Entity\Activity;
+use Chill\ActivityBundle\Export\Export\ListActivityHelper;
+use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
+use Chill\MainBundle\Entity\Scope;
+use Chill\MainBundle\Export\GroupedExportInterface;
+use Chill\MainBundle\Export\Helper\TranslatableStringExportLabelHelper;
+use Chill\MainBundle\Export\ListInterface;
+use Chill\PersonBundle\Entity\Person\PersonCenterHistory;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Component\Form\FormBuilderInterface;
+
+class ListActivity implements ListInterface, GroupedExportInterface
+{
+    private EntityManagerInterface $entityManager;
+
+    private ListActivityHelper $helper;
+
+    private TranslatableStringExportLabelHelper $translatableStringExportLabelHelper;
+
+    public function __construct(
+        ListActivityHelper $helper,
+        EntityManagerInterface $entityManager,
+        TranslatableStringExportLabelHelper $translatableStringExportLabelHelper
+    ) {
+        $this->helper = $helper;
+        $this->entityManager = $entityManager;
+        $this->translatableStringExportLabelHelper = $translatableStringExportLabelHelper;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        $this->helper->buildForm($builder);
+    }
+
+    public function getAllowedFormattersTypes()
+    {
+        return $this->helper->getAllowedFormattersTypes();
+    }
+
+    public function getDescription()
+    {
+        return ListActivityHelper::MSG_KEY . 'List activities linked to an accompanying course';
+    }
+
+    public function getGroup(): string
+    {
+        return 'Exports of activities linked to an accompanying period';
+    }
+
+    public function getLabels($key, array $values, $data)
+    {
+        switch ($key) {
+            case 'acpId':
+                return static function ($value) {
+                    if ('_header' === $value) {
+                        return ListActivityHelper::MSG_KEY . 'accompanying course id';
+                    }
+
+                    return $value ?? '';
+                };
+
+            case 'scopesNames':
+               return $this->translatableStringExportLabelHelper->getLabelMulti($key, $values, ListActivityHelper::MSG_KEY . 'course circles');
+
+            default:
+                return $this->helper->getLabels($key, $values, $data);
+        }
+    }
+
+    public function getQueryKeys($data)
+    {
+        return
+            array_merge(
+                $this->helper->getQueryKeys($data),
+                [
+                    'acpId',
+                    'scopesNames',
+                ]
+            );
+    }
+
+    public function getResult($query, $data)
+    {
+        return $this->helper->getResult($query, $data);
+    }
+
+    public function getTitle()
+    {
+        return ListActivityHelper::MSG_KEY . 'List activity linked to a course';
+    }
+
+    public function getType()
+    {
+        return $this->helper->getType();
+    }
+
+    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
+    {
+        $centers = array_map(static function ($el) {
+            return $el['center'];
+        }, $acl);
+
+        $qb = $this->entityManager->createQueryBuilder();
+
+        $qb
+            ->distinct()
+            ->from(Activity::class, 'activity')
+            ->join('activity.accompanyingPeriod', 'acp')
+            ->leftJoin('acp.participations', 'acppart')
+            ->leftJoin('acppart.person', 'person')
+            ->andWhere('acppart.startDate != acppart.endDate OR acppart.endDate IS NULL')
+            ->andWhere(
+                $qb->expr()->exists(
+                    'SELECT 1
+                    FROM ' . PersonCenterHistory::class . ' acl_count_person_history
+                    WHERE acl_count_person_history.person = person
+                    AND acl_count_person_history.center IN (:authorized_centers)
+                    '
+                )
+            )
+            // some grouping are necessary
+            ->addGroupBy('acp.id')
+            ->addOrderBy('activity.date')
+            ->addOrderBy('activity.id')
+            ->setParameter('authorized_centers', $centers);
+
+        $this->helper->addSelect($qb);
+
+        // add select for this step
+        $qb
+            ->addSelect('acp.id AS acpId')
+            ->addSelect('(SELECT AGGREGATE(acpScope.name) FROM ' . Scope::class . ' acpScope WHERE acpScope MEMBER OF acp.scopes) AS scopesNames')
+            ->addGroupBy('scopesNames');
+
+        return $qb;
+    }
+
+    public function requiredRole(): string
+    {
+        return ActivityStatsVoter::LISTS;
+    }
+
+    public function supportsModifiers()
+    {
+        return array_merge(
+            $this->helper->supportsModifiers(),
+            [
+                \Chill\PersonBundle\Export\Declarations::ACP_TYPE,
+            ]
+        );
+    }
+}
@@ -0,0 +1,128 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\ActivityBundle\Export\Export\LinkedToACP;
+
+use Chill\ActivityBundle\Entity\Activity;
+use Chill\ActivityBundle\Export\Declarations;
+use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
+use Chill\MainBundle\Export\ExportInterface;
+use Chill\MainBundle\Export\FormatterInterface;
+use Chill\MainBundle\Export\GroupedExportInterface;
+use Chill\PersonBundle\Entity\AccompanyingPeriodParticipation;
+use Chill\PersonBundle\Entity\Person\PersonCenterHistory;
+use Chill\PersonBundle\Export\Declarations as PersonDeclarations;
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\EntityRepository;
+use Doctrine\ORM\Query;
+use LogicException;
+use Symfony\Component\Form\FormBuilderInterface;
+
+class SumActivityDuration implements ExportInterface, GroupedExportInterface
+{
+    protected EntityRepository $repository;
+
+    public function __construct(
+        EntityManagerInterface $em
+    ) {
+        $this->repository = $em->getRepository(Activity::class);
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        // TODO: Implement buildForm() method.
+    }
+
+    public function getAllowedFormattersTypes(): array
+    {
+        return [FormatterInterface::TYPE_TABULAR];
+    }
+
+    public function getDescription(): string
+    {
+        return 'Sum activities linked to an accompanying period duration by various parameters.';
+    }
+
+    public function getGroup(): string
+    {
+        return 'Exports of activities linked to an accompanying period';
+    }
+
+    public function getLabels($key, array $values, $data)
+    {
+        if ('export_sum_activity_duration' !== $key) {
+            throw new LogicException("the key {$key} is not used by this export");
+        }
+
+        return static fn ($value) => '_header' === $value ? 'Sum activities linked to an accompanying period duration' : $value;
+    }
+
+    public function getQueryKeys($data): array
+    {
+        return ['export_sum_activity_duration'];
+    }
+
+    public function getResult($query, $data)
+    {
+        return $query->getQuery()->getResult(Query::HYDRATE_SCALAR);
+    }
+
+    public function getTitle(): string
+    {
+        return 'Sum activity linked to an accompanying period duration';
+    }
+
+    public function getType(): string
+    {
+        return Declarations::ACTIVITY;
+    }
+
+    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
+    {
+        $centers = array_map(static function ($el) {
+            return $el['center'];
+        }, $acl);
+
+        $qb = $this->repository
+            ->createQueryBuilder('activity')
+            ->join('activity.accompanyingPeriod', 'acp');
+
+        $qb->select('SUM(activity.durationTime) as export_sum_activity_duration')
+            ->andWhere($qb->expr()->isNotNull('activity.durationTime'));
+
+        $qb
+            ->andWhere(
+                $qb->expr()->exists(
+                    'SELECT 1 FROM ' . AccompanyingPeriodParticipation::class . ' acl_count_part
+                    JOIN ' . PersonCenterHistory::class . ' acl_count_person_history WITH IDENTITY(acl_count_person_history.person) = IDENTITY(acl_count_part.person)
+                    WHERE acl_count_part.accompanyingPeriod = acp.id AND acl_count_person_history.center IN (:authorized_centers)
+                    '
+                )
+            )
+            ->setParameter('authorized_centers', $centers);
+
+        return $qb;
+    }
+
+    public function requiredRole(): string
+    {
+        return ActivityStatsVoter::STATS;
+    }
+
+    public function supportsModifiers(): array
+    {
+        return [
+            Declarations::ACTIVITY,
+            Declarations::ACTIVITY_ACP,
+            PersonDeclarations::ACP_TYPE,
+        ];
+    }
+}
@@ -0,0 +1,128 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\ActivityBundle\Export\Export\LinkedToACP;
+
+use Chill\ActivityBundle\Entity\Activity;
+use Chill\ActivityBundle\Export\Declarations;
+use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
+use Chill\MainBundle\Export\ExportInterface;
+use Chill\MainBundle\Export\FormatterInterface;
+use Chill\MainBundle\Export\GroupedExportInterface;
+use Chill\PersonBundle\Entity\AccompanyingPeriodParticipation;
+use Chill\PersonBundle\Entity\Person\PersonCenterHistory;
+use Chill\PersonBundle\Export\Declarations as PersonDeclarations;
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\EntityRepository;
+use Doctrine\ORM\Query;
+use LogicException;
+use Symfony\Component\Form\FormBuilderInterface;
+
+class SumActivityVisitDuration implements ExportInterface, GroupedExportInterface
+{
+    protected EntityRepository $repository;
+
+    public function __construct(
+        EntityManagerInterface $em
+    ) {
+        $this->repository = $em->getRepository(Activity::class);
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        // TODO: Implement buildForm() method.
+    }
+
+    public function getAllowedFormattersTypes(): array
+    {
+        return [FormatterInterface::TYPE_TABULAR];
+    }
+
+    public function getDescription(): string
+    {
+        return 'Sum activities linked to an accompanying period visit duration by various parameters.';
+    }
+
+    public function getGroup(): string
+    {
+        return 'Exports of activities linked to an accompanying period';
+    }
+
+    public function getLabels($key, array $values, $data)
+    {
+        if ('export_sum_activity_visit_duration' !== $key) {
+            throw new LogicException("the key {$key} is not used by this export");
+        }
+
+        return static fn ($value) => '_header' === $value ? 'Sum activities linked to an accompanying period visit duration' : $value;
+    }
+
+    public function getQueryKeys($data): array
+    {
+        return ['export_sum_activity_visit_duration'];
+    }
+
+    public function getResult($query, $data)
+    {
+        return $query->getQuery()->getResult(Query::HYDRATE_SCALAR);
+    }
+
+    public function getTitle(): string
+    {
+        return 'Sum activity linked to an accompanying period visit duration';
+    }
+
+    public function getType(): string
+    {
+        return Declarations::ACTIVITY;
+    }
+
+    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
+    {
+        $centers = array_map(static function ($el) {
+            return $el['center'];
+        }, $acl);
+
+        $qb = $this->repository
+            ->createQueryBuilder('activity')
+            ->join('activity.accompanyingPeriod', 'acp');
+
+        $qb->select('SUM(activity.travelTime) as export_sum_activity_visit_duration')
+            ->andWhere($qb->expr()->isNotNull('activity.travelTime'));
+
+        $qb
+            ->andWhere(
+                $qb->expr()->exists(
+                    'SELECT 1 FROM ' . AccompanyingPeriodParticipation::class . ' acl_count_part
+                    JOIN ' . PersonCenterHistory::class . ' acl_count_person_history WITH IDENTITY(acl_count_person_history.person) = IDENTITY(acl_count_part.person)
+                    WHERE acl_count_part.accompanyingPeriod = acp.id AND acl_count_person_history.center IN (:authorized_centers)
+                    '
+                )
+            )
+            ->setParameter('authorized_centers', $centers);
+
+        return $qb;
+    }
+
+    public function requiredRole(): string
+    {
+        return ActivityStatsVoter::STATS;
+    }
+
+    public function supportsModifiers(): array
+    {
+        return [
+            Declarations::ACTIVITY,
+            Declarations::ACTIVITY_ACP,
+            PersonDeclarations::ACP_TYPE,
+        ];
+    }
+}
@@ -1,26 +1,28 @@
 <?php

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

-declare(strict_types=1);
-
-namespace Chill\ActivityBundle\Export\Export;
+namespace Chill\ActivityBundle\Export\Export\LinkedToPerson;

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

-class CountActivity implements ExportInterface
+class CountActivity implements ExportInterface, GroupedExportInterface
 {
    protected ActivityRepository $activityRepository;

@@ -41,7 +43,12 @@ class CountActivity implements ExportInterface

    public function getDescription()
    {
-        return 'Count activities by various parameters.';
+        return 'Count activities linked to a person by various parameters.';
+    }
+
+    public function getGroup(): string
+    {
+        return 'Exports of activities linked to a person';
    }

    public function getLabels($key, array $values, $data)
@@ -50,7 +57,7 @@ class CountActivity implements ExportInterface
            throw new LogicException("the key {$key} is not used by this export");
        }

-        return static fn ($value) => '_header' === $value ? 'Number of activities' : $value;
+        return static fn ($value) => '_header' === $value ? 'Number of activities linked to a person' : $value;
    }

    public function getQueryKeys($data)
@@ -58,45 +65,59 @@ class CountActivity implements ExportInterface
        return ['export_count_activity'];
    }

-    public function getResult($qb, $data)
+    public function getResult($query, $data)
    {
-        return $qb->getQuery()->getResult(Query::HYDRATE_SCALAR);
+        return $query->getQuery()->getResult(Query::HYDRATE_SCALAR);
    }

    public function getTitle()
    {
-        return 'Count activities';
+        return 'Count activities linked to a person';
    }

-    public function getType()
+    public function getType(): string
    {
-        return 'activity';
+        return Declarations::ACTIVITY;
    }

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

-        $qb = $this
-            ->activityRepository
+        $qb = $this->activityRepository
            ->createQueryBuilder('activity')
-            ->select('COUNT(activity.id) as export_count_activity')
-            ->join('activity.person', 'person');
+            ->join('activity.person', 'person')
+            ->join('person.centerHistory', 'centerHistory');
+
+        $qb->select('COUNT(activity.id) as export_count_activity');

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

        return $qb;
    }

-    public function requiredRole()
+    public function requiredRole(): string
    {
-        return new Role(ActivityStatsVoter::STATS);
+        return ActivityStatsVoter::STATS;
    }

    public function supportsModifiers()
    {
-        return ['person', 'activity'];
+        return [
+            Declarations::ACTIVITY,
+            Declarations::ACTIVITY_PERSON,
+            PersonDeclarations::PERSON_TYPE,
+        ];
    }
 }
@@ -1,38 +1,40 @@
 <?php

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

-declare(strict_types=1);
-
-namespace Chill\ActivityBundle\Export\Export;
+namespace Chill\ActivityBundle\Export\Export\LinkedToPerson;

 use Chill\ActivityBundle\Entity\ActivityReason;
+use Chill\ActivityBundle\Export\Declarations;
 use Chill\ActivityBundle\Repository\ActivityRepository;
 use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
 use Chill\MainBundle\Export\FormatterInterface;
+use Chill\MainBundle\Export\GroupedExportInterface;
 use Chill\MainBundle\Export\ListInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
+use Chill\PersonBundle\Export\Declarations as PersonDeclarations;
 use DateTime;
 use Doctrine\DBAL\Exception\InvalidArgumentException;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Query;
 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;

-class ListActivity implements ListInterface
+class ListActivity implements ListInterface, GroupedExportInterface
 {
    protected EntityManagerInterface $entityManager;

@@ -94,7 +96,12 @@ class ListActivity implements ListInterface

    public function getDescription()
    {
-        return 'List activities';
+        return 'List activities linked to a person description';
+    }
+
+    public function getGroup(): string
+    {
+        return 'Exports of activities linked to a person';
    }

    public function getLabels($key, array $values, $data)
@@ -117,7 +124,7 @@ class ListActivity implements ListInterface
                        return 'attendee';
                    }

-                    return $value ? 1 : 0;
+                    return $value ? 'X' : '';
                };

            case 'list_reasons':
@@ -180,12 +187,12 @@ class ListActivity implements ListInterface

    public function getTitle()
    {
-        return 'List activities';
+        return 'List activity linked to a person';
    }

-    public function getType()
+    public function getType(): string
    {
-        return 'activity';
+        return Declarations::ACTIVITY;
    }

    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
@@ -203,10 +210,20 @@ class ListActivity implements ListInterface

        $qb
            ->from('ChillActivityBundle:Activity', 'activity')
-            ->join('activity.person', 'person')
-            ->join('person.center', 'center')
-            ->andWhere('center IN (:authorized_centers)')
-            ->setParameter('authorized_centers', $centers);
+            ->join('activity.person', 'actperson')
+            ->join('actperson.centerHistory', 'centerHistory');
+
+        $qb->where(
+            $qb->expr()->andX(
+                $qb->expr()->lte('centerHistory.startDate', 'activity.date'),
+                $qb->expr()->orX(
+                    $qb->expr()->isNull('centerHistory.endDate'),
+                    $qb->expr()->gt('centerHistory.endDate', 'activity.date')
+                )
+            )
+        )
+            ->andWhere($qb->expr()->in('centerHistory.center', ':centers'))
+            ->setParameter('centers', $centers);

        foreach ($this->fields as $f) {
            if (in_array($f, $data['fields'], true)) {
@@ -217,23 +234,23 @@ class ListActivity implements ListInterface
                        break;

                    case 'person_firstname':
-                        $qb->addSelect('person.firstName AS person_firstname');
+                        $qb->addSelect('actperson.firstName AS person_firstname');

                        break;

                    case 'person_lastname':
-                        $qb->addSelect('person.lastName AS person_lastname');
+                        $qb->addSelect('actperson.lastName AS person_lastname');

                        break;

                    case 'person_id':
-                        $qb->addSelect('person.id AS person_id');
+                        $qb->addSelect('actperson.id AS person_id');

                        break;

                    case 'user_username':
-                        $qb->join('activity.user', 'user');
-                        $qb->addSelect('user.username AS user_username');
+                        $qb->join('activity.user', 'actuser');
+                        $qb->addSelect('actuser.username AS user_username');

                        break;

@@ -244,7 +261,7 @@ class ListActivity implements ListInterface
                        break;

                    case 'type_name':
-                        $qb->join('activity.type', 'type');
+                        $qb->join('activity.activityType', 'type');
                        $qb->addSelect('type.name AS type_name');

                        break;
@@ -256,6 +273,11 @@ class ListActivity implements ListInterface

                        break;

+                    case 'attendee':
+                        $qb->addSelect('IDENTITY(activity.attendee) AS attendee');
+
+                        break;
+
                    default:
                        $qb->addSelect(sprintf('activity.%s as %s', $f, $f));

@@ -267,13 +289,17 @@ class ListActivity implements ListInterface
        return $qb;
    }

-    public function requiredRole()
+    public function requiredRole(): string
    {
-        return new Role(ActivityStatsVoter::LISTS);
+        return ActivityStatsVoter::LISTS;
    }

    public function supportsModifiers()
    {
-        return ['activity', 'person'];
+        return [
+            Declarations::ACTIVITY,
+            Declarations::ACTIVITY_PERSON,
+            //PersonDeclarations::PERSON_TYPE,
+        ];
    }
 }
@@ -1,31 +1,34 @@
 <?php

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

-declare(strict_types=1);
-
-namespace Chill\ActivityBundle\Export\Export;
+namespace Chill\ActivityBundle\Export\Export\LinkedToPerson;

+use Chill\ActivityBundle\Export\Declarations;
 use Chill\ActivityBundle\Repository\ActivityRepository;
 use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
+use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Export\ExportInterface;
 use Chill\MainBundle\Export\FormatterInterface;
+use Chill\MainBundle\Export\GroupedExportInterface;
+use Chill\PersonBundle\Export\Declarations as PersonDeclarations;
 use Doctrine\ORM\Query;
 use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\Security\Core\Role\Role;

 /**
 * This export allow to compute stats on activity duration.
 *
 * The desired stat must be given in constructor.
 */
-class StatActivityDuration implements ExportInterface
+class StatActivityDuration implements ExportInterface, GroupedExportInterface
 {
    public const SUM = 'sum';

@@ -59,8 +62,15 @@ class StatActivityDuration implements ExportInterface
    public function getDescription()
    {
        if (self::SUM === $this->action) {
-            return 'Sum activities duration by various parameters.';
+            return 'Sum activities linked to a person duration by various parameters.';
        }
+
+        throw new LogicException('this action is not supported: ' . $this->action);
+    }
+
+    public function getGroup(): string
+    {
+        return 'Exports of activities linked to a person';
    }

    public function getLabels($key, array $values, $data)
@@ -69,7 +79,7 @@ class StatActivityDuration implements ExportInterface
            throw new LogicException(sprintf('The key %s is not used by this export', $key));
        }

-        $header = self::SUM === $this->action ? 'Sum of activities duration' : false;
+        $header = self::SUM === $this->action ? 'Sum activities linked to a person duration' : false;

        return static fn (string $value) => '_header' === $value ? $header : $value;
    }
@@ -79,27 +89,29 @@ class StatActivityDuration implements ExportInterface
        return ['export_stat_activity'];
    }

-    public function getResult($qb, $data)
+    public function getResult($query, $data)
    {
-        return $qb->getQuery()->getResult(Query::HYDRATE_SCALAR);
+        return $query->getQuery()->getResult(Query::HYDRATE_SCALAR);
    }

    public function getTitle()
    {
        if (self::SUM === $this->action) {
-            return 'Sum activity duration';
+            return 'Sum activity linked to a person duration';
        }
+
+        throw new LogicException('This action is not supported: ' . $this->action);
    }

-    public function getType()
+    public function getType(): string
    {
-        return 'activity';
+        return Declarations::ACTIVITY;
    }

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

@@ -111,20 +123,37 @@ class StatActivityDuration implements ExportInterface
            $select = 'SUM(activity.durationTime) AS export_stat_activity';
        }

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

-    public function requiredRole()
+    public function requiredRole(): string
    {
-        return new Role(ActivityStatsVoter::STATS);
+        return ActivityStatsVoter::STATS;
    }

    public function supportsModifiers()
    {
-        return ['person', 'activity'];
+        return [
+            Declarations::ACTIVITY,
+            Declarations::ACTIVITY_PERSON,
+            //PersonDeclarations::PERSON_TYPE,
+        ];
    }
 }
@@ -0,0 +1,269 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\ActivityBundle\Export\Export;
+
+use Chill\ActivityBundle\Export\Declarations;
+use Chill\ActivityBundle\Repository\ActivityPresenceRepositoryInterface;
+use Chill\ActivityBundle\Repository\ActivityTypeRepositoryInterface;
+use Chill\MainBundle\Export\FormatterInterface;
+use Chill\MainBundle\Export\Helper\DateTimeHelper;
+use Chill\MainBundle\Export\Helper\TranslatableStringExportLabelHelper;
+use Chill\MainBundle\Export\Helper\UserHelper;
+use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
+use Chill\PersonBundle\Export\Helper\LabelPersonHelper;
+use Chill\ThirdPartyBundle\Export\Helper\LabelThirdPartyHelper;
+use Doctrine\ORM\AbstractQuery;
+use Doctrine\ORM\QueryBuilder;
+use LogicException;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
+use const SORT_NUMERIC;
+
+class ListActivityHelper
+{
+    public const MSG_KEY = 'export.list.activity.';
+
+    private ActivityPresenceRepositoryInterface $activityPresenceRepository;
+
+    private ActivityTypeRepositoryInterface $activityTypeRepository;
+
+    private DateTimeHelper $dateTimeHelper;
+
+    private LabelPersonHelper $labelPersonHelper;
+
+    private LabelThirdPartyHelper $labelThirdPartyHelper;
+
+    private TranslatableStringHelperInterface $translatableStringHelper;
+
+    private TranslatableStringExportLabelHelper $translatableStringLabelHelper;
+
+    private TranslatorInterface $translator;
+
+    private UserHelper $userHelper;
+
+    public function __construct(
+        ActivityPresenceRepositoryInterface $activityPresenceRepository,
+        ActivityTypeRepositoryInterface $activityTypeRepository,
+        DateTimeHelper $dateTimeHelper,
+        LabelPersonHelper $labelPersonHelper,
+        LabelThirdPartyHelper $labelThirdPartyHelper,
+        TranslatorInterface $translator,
+        TranslatableStringHelperInterface $translatableStringHelper,
+        TranslatableStringExportLabelHelper $translatableStringLabelHelper,
+        UserHelper $userHelper
+    ) {
+        $this->activityPresenceRepository = $activityPresenceRepository;
+        $this->activityTypeRepository = $activityTypeRepository;
+        $this->dateTimeHelper = $dateTimeHelper;
+        $this->labelPersonHelper = $labelPersonHelper;
+        $this->labelThirdPartyHelper = $labelThirdPartyHelper;
+        $this->translator = $translator;
+        $this->translatableStringHelper = $translatableStringHelper;
+        $this->translatableStringLabelHelper = $translatableStringLabelHelper;
+        $this->userHelper = $userHelper;
+    }
+
+    public function addSelect(QueryBuilder $qb): void
+    {
+        $qb
+            ->addSelect('activity.id AS id')
+            ->addSelect('activity.date')
+            ->addSelect('IDENTITY(activity.activityType) AS typeName')
+            ->leftJoin('activity.reasons', 'reasons')
+            ->addSelect('AGGREGATE(reasons.name) AS listReasons')
+            ->leftJoin('activity.persons', 'actPerson')
+            ->addSelect('AGGREGATE(actPerson.id) AS personsIds')
+            ->addSelect('AGGREGATE(actPerson.id) AS personsNames')
+            ->leftJoin('activity.users', 'users_u')
+            ->addSelect('AGGREGATE(users_u.id) AS usersIds')
+            ->addSelect('AGGREGATE(users_u.id) AS usersNames')
+            ->leftJoin('activity.thirdParties', 'thirdparty')
+            ->addSelect('AGGREGATE(thirdparty.id) AS thirdPartiesIds')
+            ->addSelect('AGGREGATE(thirdparty.id) AS thirdPartiesNames')
+            ->addSelect('IDENTITY(activity.attendee) AS attendeeName')
+            ->addSelect('activity.durationTime')
+            ->addSelect('activity.travelTime')
+            ->addSelect('activity.emergency')
+            ->leftJoin('activity.location', 'location')
+            ->addSelect('location.name AS locationName')
+            ->addSelect('activity.sentReceived')
+            ->addSelect('IDENTITY(activity.createdBy) AS createdBy')
+            ->addSelect('activity.createdAt')
+            ->addSelect('IDENTITY(activity.updatedBy) AS updatedBy')
+            ->addSelect('activity.updatedAt')
+            ->addGroupBy('activity.id')
+            ->addGroupBy('location.id');
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+    }
+
+    public function getAllowedFormattersTypes()
+    {
+        return [FormatterInterface::TYPE_LIST];
+    }
+
+    public function getLabels($key, array $values, $data)
+    {
+        switch ($key) {
+            case 'createdAt':
+            case 'updatedAt':
+                return $this->dateTimeHelper->getLabel($key);
+
+            case 'createdBy':
+            case 'updatedBy':
+                return $this->userHelper->getLabel($key, $values, $key);
+
+            case 'date':
+                return $this->dateTimeHelper->getLabel(self::MSG_KEY . $key);
+
+            case 'attendeeName':
+                return function ($value) {
+                    if ('_header' === $value) {
+                        return 'Attendee';
+                    }
+
+                    if (null === $value || null === $presence = $this->activityPresenceRepository->find($value)) {
+                        return '';
+                    }
+
+                    return $this->translatableStringHelper->localize($presence->getName());
+                };
+
+            case 'listReasons':
+                return $this->translatableStringLabelHelper->getLabelMulti($key, $values, 'Activity Reasons');
+
+            case 'typeName':
+                return function ($value) {
+                    if ('_header' === $value) {
+                        return 'Activity type';
+                    }
+
+                    if (null === $value || null === $type = $this->activityTypeRepository->find($value)) {
+                        return '';
+                    }
+
+                    return $this->translatableStringHelper->localize($type->getName());
+                };
+
+            case 'usersNames':
+                return $this->userHelper->getLabelMulti($key, $values, self::MSG_KEY . 'users name');
+
+            case 'usersIds':
+            case 'thirdPartiesIds':
+            case 'personsIds':
+                return static function ($value) use ($key) {
+                    if ('_header' === $value) {
+                        switch ($key) {
+                            case 'usersIds':
+                                return self::MSG_KEY . 'users ids';
+
+                            case 'thirdPartiesIds':
+                                return self::MSG_KEY . 'third parties ids';
+
+                            case 'personsIds':
+                                return self::MSG_KEY . 'persons ids';
+
+                            default:
+                                throw new LogicException('key not supported');
+                        }
+                    }
+
+                    $decoded = json_decode($value);
+
+                    return implode(
+                        '|',
+                        array_unique(
+                            array_filter($decoded, static fn (?int $id) => null !== $id),
+                            SORT_NUMERIC
+                        )
+                    );
+                };
+
+            case 'personsNames':
+                return $this->labelPersonHelper->getLabelMulti($key, $values, self::MSG_KEY . 'persons name');
+
+            case 'thirdPartiesNames':
+                return $this->labelThirdPartyHelper->getLabelMulti($key, $values, self::MSG_KEY . 'thirds parties');
+
+            case 'sentReceived':
+                return function ($value) {
+                    if ('_header' === $value) {
+                        return self::MSG_KEY . 'sent received';
+                    }
+
+                    if (null === $value) {
+                        return '';
+                    }
+
+                    return $this->translator->trans($value);
+                };
+
+            default:
+                return function ($value) use ($key) {
+                    if ('_header' === $value) {
+                        return self::MSG_KEY . $key;
+                    }
+
+                    if (null === $value) {
+                        return '';
+                    }
+
+                    return $this->translator->trans($value);
+                };
+        }
+    }
+
+    public function getQueryKeys($data)
+    {
+        return [
+            'id',
+            'date',
+            'typeName',
+            'listReasons',
+            'attendeeName',
+            'durationTime',
+            'travelTime',
+            'emergency',
+            'locationName',
+            'sentReceived',
+            'personsIds',
+            'personsNames',
+            'usersIds',
+            'usersNames',
+            'thirdPartiesIds',
+            'thirdPartiesNames',
+            'createdBy',
+            'createdAt',
+            'updatedBy',
+            'updatedAt',
+        ];
+    }
+
+    public function getResult($query, $data)
+    {
+        return $query->getQuery()->getResult(AbstractQuery::HYDRATE_SCALAR);
+    }
+
+    public function getType(): string
+    {
+        return Declarations::ACTIVITY;
+    }
+
+    public function supportsModifiers()
+    {
+        return [
+            Declarations::ACTIVITY,
+        ];
+    }
+}
@@ -0,0 +1,92 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\ActivityBundle\Export\Filter\ACPFilters;
+
+use Chill\ActivityBundle\Entity\Activity;
+use Chill\ActivityBundle\Entity\ActivityType;
+use Chill\ActivityBundle\Repository\ActivityTypeRepositoryInterface;
+use Chill\MainBundle\Export\FilterInterface;
+use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
+use Chill\PersonBundle\Export\Declarations;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
+use Symfony\Component\Form\FormBuilderInterface;
+
+class ActivityTypeFilter implements FilterInterface
+{
+    private ActivityTypeRepositoryInterface $activityTypeRepository;
+
+    private TranslatableStringHelperInterface $translatableStringHelper;
+
+    public function __construct(
+        ActivityTypeRepositoryInterface $activityTypeRepository,
+        TranslatableStringHelperInterface $translatableStringHelper
+    ) {
+        $this->activityTypeRepository = $activityTypeRepository;
+        $this->translatableStringHelper = $translatableStringHelper;
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        $qb->andWhere(
+            $qb->expr()->exists(
+                'SELECT 1 FROM ' . Activity::class . ' act_type_filter_activity
+                WHERE act_type_filter_activity.activityType IN (:act_type_filter_activity_types) AND act_type_filter_activity.accompanyingPeriod = acp'
+            )
+        );
+        $qb->setParameter('act_type_filter_activity_types', $data['accepted_activitytypes']);
+    }
+
+    public function applyOn()
+    {
+        return Declarations::ACP_TYPE;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        $builder->add('accepted_activitytypes', EntityType::class, [
+            'class' => ActivityType::class,
+            'choices' => $this->activityTypeRepository->findAllActive(),
+            'choice_label' => function (ActivityType $aty) {
+                return
+                    ($aty->hasCategory() ? $this->translatableStringHelper->localize($aty->getCategory()->getName()) . ' > ' : '')
+                    .
+                    $this->translatableStringHelper->localize($aty->getName());
+            },
+            'multiple' => true,
+            'expanded' => true,
+        ]);
+    }
+
+    public function describeAction($data, $format = 'string'): array
+    {
+        $types = [];
+
+        foreach ($data['accepted_activitytypes'] as $aty) {
+            $types[] = $this->translatableStringHelper->localize($aty->getName());
+        }
+
+        return ['Filtered by activity types: only %activitytypes%', [
+            '%activitytypes%' => implode(', ', $types),
+        ]];
+    }
+
+    public function getTitle(): string
+    {
+        return 'Filter accompanying course by activity type';
+    }
+}
@@ -0,0 +1,73 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\ActivityBundle\Export\Filter\ACPFilters;
+
+use Chill\ActivityBundle\Export\Declarations;
+use Chill\MainBundle\Export\FilterInterface;
+use Chill\MainBundle\Form\Type\PickUserDynamicType;
+use Chill\MainBundle\Templating\Entity\UserRender;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\FormBuilderInterface;
+
+class ByCreatorFilter implements FilterInterface
+{
+    private UserRender $userRender;
+
+    public function __construct(UserRender $userRender)
+    {
+        $this->userRender = $userRender;
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        $qb
+            ->andWhere(
+                $qb->expr()->in('activity.createdBy', ':users')
+            )
+            ->setParameter('users', $data['accepted_users']);
+    }
+
+    public function applyOn(): string
+    {
+        return Declarations::ACTIVITY_ACP;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        $builder->add('accepted_users', PickUserDynamicType::class, [
+            'multiple' => true,
+        ]);
+    }
+
+    public function describeAction($data, $format = 'string'): array
+    {
+        $users = [];
+
+        foreach ($data['accepted_users'] as $u) {
+            $users[] = $this->userRender->renderString($u, []);
+        }
+
+        return ['Filtered activity by creator: only %users%', [
+            '%users%' => implode(', ', $users),
+        ]];
+    }
+
+    public function getTitle(): string
+    {
+        return 'Filter activity by creator';
+    }
+}
@@ -0,0 +1,83 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\ActivityBundle\Export\Filter\ACPFilters;
+
+use Chill\ActivityBundle\Export\Declarations;
+use Chill\MainBundle\Export\FilterInterface;
+use Chill\PersonBundle\Entity\SocialWork\SocialAction;
+use Chill\PersonBundle\Form\Type\PickSocialActionType;
+use Chill\PersonBundle\Templating\Entity\SocialActionRender;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\FormBuilderInterface;
+use function in_array;
+
+class BySocialActionFilter implements FilterInterface
+{
+    private SocialActionRender $actionRender;
+
+    public function __construct(SocialActionRender $actionRender)
+    {
+        $this->actionRender = $actionRender;
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        if (!in_array('actsocialaction', $qb->getAllAliases(), true)) {
+            $qb->join('activity.socialActions', 'actsocialaction');
+        }
+
+        $clause = $qb->expr()->in('actsocialaction.id', ':socialactions');
+
+        $qb->andWhere($clause)
+            ->setParameter(
+                'socialactions',
+                SocialAction::getDescendantsWithThisForActions($data['accepted_socialactions'])
+            );
+    }
+
+    public function applyOn(): string
+    {
+        return Declarations::ACTIVITY_ACP;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        $builder->add('accepted_socialactions', PickSocialActionType::class, [
+            'multiple' => true,
+        ]);
+    }
+
+    public function describeAction($data, $format = 'string'): array
+    {
+        $actions = [];
+
+        foreach ($data['accepted_socialactions'] as $action) {
+            $actions[] = $this->actionRender->renderString($action, [
+                'show_and_children' => true,
+            ]);
+        }
+
+        return ['Filtered activity by linked socialaction: only %actions%', [
+            '%actions%' => implode(', ', $actions),
+        ]];
+    }
+
+    public function getTitle(): string
+    {
+        return 'Filter activity by linked socialaction';
+    }
+}
--- a/Show More
+++ b/Show More