fix type for condition in ParticipationController

fix cs
fix social action consistency
2025-11-04 03:08:25 +00:00 · 2022-04-27 08:44:49 +02:00 · 2022-04-26 21:16:55 +02:00 · 2022-04-26 21:12:31 +02:00 · 2022-04-26 20:29:07 +02:00 · 2022-04-26 20:27:24 +02:00
668 changed files with 16501 additions and 5675 deletions
--- a/.env
+++ b/.env
@@ -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
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -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:
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,16 +11,218 @@ and this project adheres to
 ## Unreleased

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

 ## Test releases

+### 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
+
+
+### 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 +233,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 +268,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 +426,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
--- a/BIN
+++ b/BIN
--- a/composer.json
+++ b/composer.json
@@ -21,7 +21,8 @@
        "knplabs/knp-time-bundle": "^1.12",
        "league/csv": "^9.7.1",
        "nyholm/psr7": "^1.4",
-        "ocramius/package-versions": "^1.10",
+        "ocramius/package-versions": "^1.10 || ^2",
+        "odolbeau/phone-number-bundle": "^3.6",
        "phpoffice/phpspreadsheet": "^1.16",
        "ramsey/uuid-doctrine": "^1.7",
        "sensio/framework-extra-bundle": "^5.5",
@@ -32,6 +33,7 @@
        "symfony/expression-language": "^4.4",
        "symfony/form": "^4.4",
        "symfony/framework-bundle": "^4.4",
+        "symfony/http-foundation": "^4.4",
        "symfony/intl": "^4.4",
        "symfony/mailer": "^5.4",
        "symfony/mime": "^5.4",
@@ -102,7 +104,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,
--- a/docs/source/development/pagination.rst
+++ b/docs/source/development/pagination.rst
@@ -32,7 +32,7 @@ Then, render the pagination using the dedicated twig function.

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

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

   <table>

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

 It proposes 1 new block :

-* personcontent
+* content

  * where to display the information of the person

--- a/phpstan-critical.neon
+++ b/phpstan-critical.neon
@@ -25,11 +25,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
--- a/phpstan-deprecations.neon
+++ b/phpstan-deprecations.neon
@@ -105,15 +105,6 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillActivityBundle/Export/Export/ListActivity.php

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

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

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

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

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

-		-
-			message:
-				"""
-					#^Parameter \\$translator of method Chill\\\\CustomFieldsBundle\\\\Form\\\\CustomFieldsGroupType\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
-					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
-				"""
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/Form/CustomFieldsGroupType.php
-
-		-
-			message:
-				"""
-					#^Call to deprecated method getReachableScopes\\(\\) of class Chill\\\\MainBundle\\\\Security\\\\Authorization\\\\AuthorizationHelper\\:
-					Use getReachableCircles$#
-				"""
-			count: 1
-			path: src/Bundle/ChillDocStoreBundle/Controller/DocumentPersonController.php
-
-		-
-			message:
-				"""
-					#^Parameter \\$translator of method Chill\\\\DocStoreBundle\\\\Controller\\\\DocumentPersonController\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
-					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
-				"""
-			count: 1
-			path: src/Bundle/ChillDocStoreBundle/Controller/DocumentPersonController.php
-
 		-
 			message:
 				"""
@@ -435,15 +300,6 @@ parameters:
 			count: 6
 			path: src/Bundle/ChillEventBundle/Controller/EventController.php

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

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

-		-
-			message:
-				"""
-					#^Parameter \\$translator of method Chill\\\\AMLI\\\\FamilyMembersBundle\\\\Controller\\\\FamilyMemberController\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
-					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
-				"""
-			count: 1
-			path: src/Bundle/ChillFamilyMembersBundle/Controller/FamilyMemberController.php
-
-		-
-			message:
-				"""
-					#^Parameter \\$translator of method Chill\\\\AMLI\\\\FamilyMembersBundle\\\\Menu\\\\UserMenuBuilder\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
-					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
-				"""
-			count: 1
-			path: src/Bundle/ChillFamilyMembersBundle/Menu/UserMenuBuilder.php
-
 		-
 			message:
 				"""
@@ -534,24 +336,6 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillFamilyMembersBundle/Security/Voter/FamilyMemberVoter.php

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-		-
-			message:
-				"""
-					#^Parameter \\$translator of method Chill\\\\ThirdPartyBundle\\\\Controller\\\\ThirdPartyController\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
-					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
-				"""
-			count: 1
-			path: src/Bundle/ChillThirdPartyBundle/Controller/ThirdPartyController.php
-
-		-
-			message:
-				"""
-					#^Parameter \\$translator of method Chill\\\\ThirdPartyBundle\\\\Form\\\\Type\\\\PickThirdPartyType\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
-					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
-				"""
-			count: 1
-			path: src/Bundle/ChillThirdPartyBundle/Form/Type/PickThirdPartyType.php
-
-		-
-			message:
-				"""
-					#^Parameter \\$translator of method Chill\\\\ThirdPartyBundle\\\\Menu\\\\MenuBuilder\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
-					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
-				"""
-			count: 1
-			path: src/Bundle/ChillThirdPartyBundle/Menu/MenuBuilder.php
-
 		-
 			message:
 				"""
--- a/phpstan-types.neon
+++ b/phpstan-types.neon
@@ -250,11 +250,6 @@ 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
@@ -295,11 +290,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 +315,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,11 +345,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
@@ -470,18 +450,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
-
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -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>
--- a/src/Bundle/ChillActivityBundle/Controller/ActivityController.php
+++ b/src/Bundle/ChillActivityBundle/Controller/ActivityController.php
@@ -34,6 +34,7 @@ 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;
@@ -178,14 +179,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();
@@ -200,17 +202,42 @@ final class ActivityController extends AbstractController
            '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->get('translator')->trans('Success : activity updated!'));
+
            return $this->redirectToRoute('chill_activity_activity_show', $params);
        }

@@ -393,12 +420,39 @@ final class ActivityController extends AbstractController
            '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();

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

            $params = $this->buildParamsToUrl($person, $accompanyingPeriod);
--- a/src/Bundle/ChillActivityBundle/Entity/Activity.php
+++ b/src/Bundle/ChillActivityBundle/Entity/Activity.php
@@ -231,11 +231,22 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
    {
        if (!$this->socialActions->contains($socialAction)) {
            $this->socialActions[] = $socialAction;
+            $this->ensureSocialActionConsistency();
        }

        return $this;
    }

+    /**
+     * Add a social issue.
+     *
+     * Note: the social issue consistency (the fact that only yougest social issues
+     * are kept) is processed by an entity listener:
+     *
+     * @see{\Chill\PersonBundle\AccompanyingPeriod\SocialIssueConsistency\AccompanyingPeriodSocialIssueConsistencyEntityListener}
+     *
+     * @return $this
+     */
    public function addSocialIssue(SocialIssue $socialIssue): self
    {
        if (!$this->socialIssues->contains($socialIssue)) {
@@ -357,7 +368,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();
                }
@@ -631,4 +642,13 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac

        return $this;
    }
+
+    private function ensureSocialActionConsistency(): void
+    {
+        $ancestors = SocialAction::findAncestorSocialActions($this->getSocialActions());
+
+        foreach ($ancestors as $ancestor) {
+            $this->removeSocialAction($ancestor);
+        }
+    }
 }
--- a/src/Bundle/ChillActivityBundle/Entity/ActivityType.php
+++ b/src/Bundle/ChillActivityBundle/Entity/ActivityType.php
@@ -271,7 +271,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')
--- a/src/Bundle/ChillActivityBundle/EntityListener/ActivityEntityListener.php
+++ b/src/Bundle/ChillActivityBundle/EntityListener/ActivityEntityListener.php
@@ -66,9 +66,6 @@ class ActivityEntityListener
                    $newAction->addPerson($person);
                }

-                foreach ($associatedThirdparties as $thirdparty) {
-                    $newAction->setHandlingThierparty($thirdparty);
-                }
                $this->em->persist($newAction);
                $this->em->flush();
            }
--- a/src/Bundle/ChillActivityBundle/Export/Export/ListActivity.php
+++ b/src/Bundle/ChillActivityBundle/Export/Export/ListActivity.php
@@ -24,9 +24,9 @@ use Doctrine\ORM\Query;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Security\Core\Role\Role;
-use Symfony\Component\Translation\TranslatorInterface;
 use Symfony\Component\Validator\Constraints\Callback;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;

 use function array_key_exists;
 use function count;
--- a/src/Bundle/ChillActivityBundle/Export/Filter/ActivityDateFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/ActivityDateFilter.php
@@ -21,7 +21,7 @@ use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\FormError;
 use Symfony\Component\Form\FormEvent;
 use Symfony\Component\Form\FormEvents;
-use Symfony\Component\Translation\TranslatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;

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

 use function count;

--- a/src/Bundle/ChillActivityBundle/Form/ActivityType.php
+++ b/src/Bundle/ChillActivityBundle/Form/ActivityType.php
@@ -125,7 +125,9 @@ class ActivityType extends AbstractType
        }

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

        if ($activityType->isVisible('socialActions') && $accompanyingPeriod) {
-            $builder->add('socialActions', HiddenType::class);
+            $builder->add('socialActions', HiddenType::class, [
+                'required' => $activityType->getSocialActionsVisible() === 2,
+            ]);
            $builder->get('socialActions')
                ->addModelTransformer(new CallbackTransformer(
                    static function (iterable $socialActionsAsIterable): string {
@@ -305,6 +309,7 @@ class ActivityType extends AbstractType
                'label' => $activityType->getLabel('documents'),
                'required' => $activityType->isRequired('documents'),
                'allow_add' => true,
+                'allow_delete' => true,
                'button_add_label' => 'activity.Insert a document',
                'button_remove_label' => 'activity.Remove a document',
                'empty_collection_explain' => 'No documents',
@@ -338,7 +343,9 @@ class ActivityType extends AbstractType
        }

        if ($activityType->isVisible('location')) {
-            $builder->add('location', HiddenType::class)
+            $builder->add('location', HiddenType::class, [
+                'required' => $activityType->getLocationVisible() === 2,
+            ])
                ->get('location')
                ->addModelTransformer(new CallbackTransformer(
                    static function (?Location $location): string {
@@ -366,8 +373,8 @@ class ActivityType extends AbstractType
                'label' => $activityType->getLabel('sentReceived'),
                'required' => $activityType->isRequired('sentReceived'),
                'choices' => [
-                    'Sent' => Activity::SENTRECEIVED_SENT,
                    'Received' => Activity::SENTRECEIVED_RECEIVED,
+                    'Sent' => Activity::SENTRECEIVED_SENT,
                ],
            ]);
        }
--- a/src/Bundle/ChillActivityBundle/Menu/PersonMenuBuilder.php
+++ b/src/Bundle/ChillActivityBundle/Menu/PersonMenuBuilder.php
@@ -15,7 +15,7 @@ use Chill\ActivityBundle\Security\Authorization\ActivityVoter;
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
 use Knp\Menu\MenuItem;
 use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
-use Symfony\Component\Translation\TranslatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;

 class PersonMenuBuilder implements LocalMenuBuilderInterface
 {
--- a/src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepository.php
+++ b/src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepository.php
@@ -12,13 +12,20 @@ declare(strict_types=1);
 namespace Chill\ActivityBundle\Repository;

 use Chill\ActivityBundle\Entity\Activity;
+use Chill\ActivityBundle\Entity\ActivityPresence;
+use Chill\ActivityBundle\Entity\ActivityType;
 use Chill\ActivityBundle\Security\Authorization\ActivityVoter;
+use Chill\MainBundle\Entity\Location;
+use Chill\MainBundle\Entity\LocationType;
 use Chill\MainBundle\Entity\Scope;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
 use Chill\MainBundle\Security\Resolver\CenterResolverDispatcherInterface;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\Person;
+use Doctrine\DBAL\Types\Types;
+use Doctrine\ORM\AbstractQuery;
 use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\Query\ResultSetMappingBuilder;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 use Symfony\Component\Security\Core\Role\Role;
 use Symfony\Component\Security\Core\Security;
@@ -72,6 +79,86 @@ final class ActivityACLAwareRepository implements ActivityACLAwareRepositoryInte
            ->findByAccompanyingPeriod($period, $scopes, true, $limit, $start, $orderBy);
    }

+    public function findByAccompanyingPeriodSimplified(AccompanyingPeriod $period, ?int $limit = 1000): array
+    {
+        $rsm = new ResultSetMappingBuilder($this->em);
+
+        $sql = '
+        SELECT
+            a.id AS activity_id,
+            date,
+            CASE WHEN durationtime IS NOT NULL THEN (EXTRACT(EPOCH from durationtime) / 60)::int ELSE 0 END AS durationtimeminute,
+            attendee_id,
+            comment_comment,
+            emergency,
+            sentreceived,
+            CASE WHEN traveltime IS NOT NULL THEN (EXTRACT(EPOCH from traveltime) / 60)::int ELSE 0 END AS traveltimeminute,
+            t.id AS type_id, t.name as type_name,
+            p.id AS presence_id, p.name AS presence_name,
+            location.id AS location_id, location.address_id, location.name AS location_name, location.phonenumber1, location.phonenumber2, location.email,
+            location.locationtype_id, locationtype.title AS locationtype_title,
+            users.userids AS userids,
+            thirdparties.thirdpartyids,
+            persons.personids,
+            actions.socialactionids,
+            issues.socialissueids
+
+        FROM activity a
+        LEFT JOIN chill_main_location location ON a.location_id = location.id
+        LEFT JOIN chill_main_location_type locationtype ON location.locationtype_id = locationtype.id
+        LEFT JOIN activitytpresence p ON a.attendee_id = p.id
+        LEFT JOIN activitytype t ON a.type_id = t.id
+        LEFT JOIN LATERAL (SELECT jsonb_agg(user_id) userids, activity_id FROM activity_user AS au WHERE a.id = au.activity_id GROUP BY activity_id) AS users ON TRUE
+        LEFT JOIN LATERAL (SELECT jsonb_agg(thirdparty_id) thirdpartyids, activity_id FROM activity_thirdparty AS au WHERE a.id = au.activity_id GROUP BY activity_id) AS thirdparties ON TRUE
+        LEFT JOIN LATERAL (SELECT jsonb_agg(person_id) personids, activity_id FROM activity_person AS au WHERE a.id = au.activity_id GROUP BY activity_id) AS persons ON TRUE
+        LEFT JOIN LATERAL (SELECT jsonb_agg(socialaction_id) socialactionids, activity_id FROM chill_activity_activity_chill_person_socialaction AS au WHERE a.id = au.activity_id GROUP BY activity_id) AS actions ON TRUE
+        LEFT JOIN LATERAL (SELECT jsonb_agg(socialissue_id) socialissueids, activity_id FROM chill_activity_activity_chill_person_socialissue AS au WHERE a.id = au.activity_id GROUP BY activity_id) AS issues ON TRUE
+
+        WHERE accompanyingperiod_id = ?
+        ORDER BY a.date DESC, a.id DESC
+        LIMIT ?
+        ';
+
+        $rsm
+            ->addEntityResult(Activity::class, 'a')
+            ->addFieldResult('a', 'activity_id', 'id')
+            ->addFieldResult('a', 'date', 'date')
+            ->addFieldResult('a', 'comment', 'comment')
+            ->addFieldResult('a', 'sentreceived', 'sentReceived')
+            ->addFieldResult('a', 'emergency', 'emergency')
+            ->addJoinedEntityResult(Location::class, 'location', 'a', 'location')
+            ->addFieldResult('location', 'location_id', 'id')
+            ->addFieldResult('location', 'location_name', 'name')
+            ->addFieldResult('location', 'phonenumber1', 'phonenumber1')
+            ->addFieldResult('location', 'phonenumber2', 'phonenumber2')
+            ->addFieldResult('location', 'email', 'email')
+            ->addJoinedEntityResult(LocationType::class, 'locationType', 'location', 'locationType')
+            ->addFieldResult('locationType', 'locationtype_id', 'id')
+            ->addFieldResult('locationType', 'locationtype_title', 'title')
+            ->addJoinedEntityResult(ActivityType::class, 'activityType', 'a', 'activityType')
+            ->addFieldResult('activityType', 'type_id', 'id')
+            ->addFieldResult('activityType', 'type_name', 'name')
+            ->addJoinedEntityResult(ActivityPresence::class, 'activityPresence', 'a', 'attendee')
+            ->addFieldResult('activityPresence', 'presence_id', 'id')
+            ->addFieldResult('activityPresence', 'presence_name', 'name')
+
+            // results which cannot be mapped into entity
+            ->addScalarResult('comment_comment', 'comment', Types::TEXT)
+            ->addScalarResult('userids', 'userIds', Types::JSON)
+            ->addScalarResult('thirdpartyids', 'thirdPartyIds', Types::JSON)
+            ->addScalarResult('personids', 'personIds', Types::JSON)
+            ->addScalarResult('socialactionids', 'socialActionIds', Types::JSON)
+            ->addScalarResult('socialissueids', 'socialIssueIds', Types::JSON)
+            ->addScalarResult('durationtimeminute', 'durationTimeMinute', Types::INTEGER)
+            ->addScalarResult('traveltimeminute', 'travelTimeMinute', Types::INTEGER);
+
+        $nq = $this->em->createNativeQuery($sql, $rsm);
+
+        $nq->setParameter(0, $period->getId())->setParameter(1, $limit);
+
+        return $nq->getResult(AbstractQuery::HYDRATE_ARRAY);
+    }
+
    /**
     * @param array $orderBy
     *
--- a/src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepositoryInterface.php
+++ b/src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepositoryInterface.php
@@ -21,6 +21,15 @@ interface ActivityACLAwareRepositoryInterface
     */
    public function findByAccompanyingPeriod(AccompanyingPeriod $period, string $role, ?int $start = 0, ?int $limit = 1000, ?array $orderBy = []): array;

+    /**
+     * Return a list of activities, simplified as array (not object).
+     *
+     * The aim of this method is to get a long list of activities and keep performance.
+     *
+     * @return array an array of array, each item representing an activity
+     */
+    public function findByAccompanyingPeriodSimplified(AccompanyingPeriod $period, ?int $limit = 1000): array;
+
    /**
     * @return Activity[]|array
     */
--- a/src/Bundle/ChillActivityBundle/Resources/public/page/edit_activity/index.scss
+++ b/src/Bundle/ChillActivityBundle/Resources/public/page/edit_activity/index.scss
@@ -0,0 +1,23 @@
+div.chill-dropzone__below-zone {
+    a.btn-delete {
+        display: none;
+    }
+}
+
+ul[data-collection-name="documents"] {
+    button.remove-entry {
+        margin: 0.5rem 0!important;
+    }
+}
+
+
+// do it in js does not work
+// document.addEventListener('DOMContentLoaded', e => {
+//     const dropzoneBelow = document.querySelectorAll('div.chill-dropzone__below-zone');
+//     dropzoneBelow.forEach(
+//         d => {
+//             const a = d.querySelector('a.btn-delete');
+//             d.removeChild(a);
+//         }
+//     )
+// });
--- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/ConcernedGroups.vue
+++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/ConcernedGroups.vue
@@ -19,14 +19,18 @@
         </ul>
      </div>

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

   </teleport>
 </template>
--- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/ConcernedGroups/PersonBadge.vue
+++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/ConcernedGroups/PersonBadge.vue
@@ -1,7 +1,7 @@
 <template>
   <li>
-      <span :title="person.text">
-         <span class="chill_denomination" @click.prevent="$emit('remove', person)">
+      <span :title="person.text" @click.prevent="$emit('remove', person)">
+         <span class="chill_denomination">
            <person-text :person="person" :isCut="true"></person-text>
         </span>
      </span>
--- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/Location.vue
+++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/Location.vue
@@ -1,7 +1,7 @@
 <template>
    <teleport to="#location">
        <div class="mb-3 row">
-            <label class="col-form-label col-sm-4">
+            <label :class="locationClassList">
                {{ $t("activity.location") }}
            </label>
            <div class="col-sm-8">
@@ -41,6 +41,12 @@ export default {
        NewLocation,
        VueMultiselect,
    },
+    data() {
+        return {
+            locationClassList:
+               `col-form-label col-sm-4 ${document.querySelector('input#chill_activitybundle_activity_location').getAttribute('required') ? 'required' : ''}`,
+        }
+    },
    computed: {
        ...mapState(["activity", "availableLocations"]),
        ...mapGetters(["suggestedEntities"]),
--- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/Location/NewLocation.vue
+++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/Location/NewLocation.vue
@@ -18,6 +18,12 @@
                </template>
                <template v-slot:body>
                    <form>
+                        <div class="alert alert-warning" v-if="errors.length">
+                            <ul>
+                                <li v-for="(e, i) in errors" :key="i">{{ e }}</li>
+                            </ul>
+                        </div>
+
                        <div class="form-floating mb-3">
                            <select class="form-select form-select-lg" id="type" required v-model="selectType">
                                <option selected disabled value="">{{ $t('activity.choose_location_type') }}</option>
@@ -54,11 +60,6 @@
                            <label for="email">{{ $t('activity.location_fields.email') }}</label>
                        </div>

-                        <div class="alert alert-warning" v-if="errors.length">
-                            <ul>
-                                <li v-for="(e, i) in errors" :key="i">{{ e }}</li>
-                            </ul>
-                        </div>
                    </form>
                </template>
                <template v-slot:footer>
--- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc.vue
+++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc.vue
@@ -3,7 +3,7 @@

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

@@ -42,7 +42,7 @@

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

@@ -54,19 +54,19 @@
               {{ $t('activity.select_first_a_social_issue') }}
            </span>

-             <template v-else-if="socialActionsList.length > 0">
-                 <check-social-action
-                     v-if="socialIssuesSelected.length || socialActionsSelected.length"
-                     v-for="action in socialActionsList"
-                     :key="action.id"
-                     :action="action"
-                     :selection="socialActionsSelected"
-                     @updateSelected="updateActionsSelected">
-                 </check-social-action>
-             </template>
+            <template v-else-if="socialActionsList.length > 0">
+               <check-social-action
+                  v-if="socialIssuesSelected.length || socialActionsSelected.length"
+                  v-for="action in socialActionsList"
+                  :key="action.id"
+                  :action="action"
+                  :selection="socialActionsSelected"
+                  @updateSelected="updateActionsSelected">
+               </check-social-action>
+            </template>

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


@@ -94,6 +94,10 @@ export default {
         issueIsLoading: false,
         actionIsLoading: false,
         actionAreLoaded: false,
+         socialIssuesClassList:
+            `col-form-label ${document.querySelector('input#chill_activitybundle_activity_socialIssues').getAttribute('required') ? 'required' : ''}`,
+         socialActionsClassList:
+            `col-form-label ${document.querySelector('input#chill_activitybundle_activity_socialActions').getAttribute('required') ? 'required' : ''}`,
      }
   },
   computed: {
@@ -107,7 +111,7 @@ export default {
         return this.$store.state.socialIssuesOther;
      },
      socialActionsList() {
-         return this.$store.state.socialActionsList;
+         return this.$store.getters.socialActionsListSorted;
      },
      socialActionsSelected() {
         return this.$store.state.activity.socialActions;
--- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/index.js
+++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/index.js
@@ -2,11 +2,15 @@ import { createApp } from 'vue';
 import { _createI18n } from 'ChillMainAssets/vuejs/_js/i18n'
 import { activityMessages } from './i18n'
 import store from './store'
+import PickTemplate from 'ChillDocGeneratorAssets/vuejs/_components/PickTemplate.vue';
+import {fetchTemplates} from 'ChillDocGeneratorAssets/api/pickTemplate.js';

 import App from './App.vue';

 const i18n = _createI18n(activityMessages);

+// app for activity
+
 const hasSocialIssues = document.querySelector('#social-issues-acc') !== null;
 const hasLocation = document.querySelector('#location') !== null;
 const hasPerson = document.querySelector('#add-persons') !== null;
@@ -29,3 +33,54 @@ const app = createApp({
 .use(i18n)
 .component('app', App)
 .mount('#activity');
+
+
+// app for picking template
+
+const i18nGendoc = _createI18n({});
+
+document.querySelectorAll('div[data-docgen-template-picker]').forEach(el => {
+    fetchTemplates(el.dataset.entityClass).then(templates => {
+        const picker = {
+            template:
+                '<pick-template :templates="this.templates" :preventDefaultMoveToGenerate="true" ' +
+                    ':entityClass="faked" @go-to-generate-document="generateDoc"></pick-template>',
+            components: {
+                PickTemplate,
+            },
+            data() {
+                return {
+                    templates: templates,
+                    entityId: el.dataset.entityId,
+                }
+            },
+            methods: {
+                generateDoc({event, link, template}) {
+                    console.log('generateDoc');
+                    console.log('link', link);
+                    console.log('template', template);
+
+                    let hiddenInput = document.querySelector("input[data-template-id]");
+
+                    if (hiddenInput === null) {
+                        console.error('hidden input not found');
+                        return;
+                    }
+
+                    hiddenInput.value = template;
+
+                    let form = document.querySelector('form[name="chill_activitybundle_activity"');
+
+                    if (form === null) {
+                        console.error('form not found');
+                        return;
+                    }
+
+                    form.submit();
+                }
+            }
+        };
+        createApp(picker).use(i18nGendoc).mount(el);
+    })
+
+});
--- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/store.js
+++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/store.js
@@ -101,6 +101,9 @@ const store = createStore({
                            state.activity.activityType.thirdPartiesVisible !== 0)
                );
        },
+        socialActionsListSorted(state) {
+            return [ ...state.socialActionsList].sort((a, b) => a.ordering - b.ordering);
+        },
    },
    mutations: {
        // SocialIssueAcc
@@ -131,7 +134,6 @@ const store = createStore({
            state.socialActionsList = [];
        },
        addActionInList(state, action) {
-            //console.log('add action list', action.id);
            state.socialActionsList.push(action);
        },
        updateActionsSelected(state, actions) {
--- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/store.locations.js
+++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/store.locations.js
@@ -110,10 +110,8 @@ export default function prepareLocations(store) {
        console.log('default loation id', window.default_location_id);
        if (window.default_location_id) {
            for (let group of store.state.availableLocations) {
-                console.log(group);
                let location = group.locations.find((l) => l.id === window.default_location_id);
-                console.log(location);
-                if (location !== undefined) {
+                if (location !== undefined & store.state.activity.location === null) {
                    store.dispatch('updateLocation', location);
                    break;
                }
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/_list_item.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/_list_item.html.twig
@@ -68,7 +68,7 @@
                    <div class="wl-col title"><h3>{{ 'Referrer'|trans }}</h3></div>
                    <div class="wl-col list">
                        <p class="wl-item">
-                            {{ activity.user|chill_entity_render_string|capitalize }}
+                            {{ activity.user|chill_entity_render_box }}
                        </p>
                    </div>
                </div>
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/confirm_deletePerson.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/confirm_deletePerson.html.twig
@@ -5,7 +5,7 @@

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

-{% block personcontent %}
+{% block content %}
 {{ include('@ChillMain/Util/confirmation_template.html.twig',
    {
        'title'             : 'Remove activity'|trans,
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/edit.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/edit.html.twig
@@ -35,7 +35,7 @@
    {{ form_row(edit_form.socialActions) }}
 {% endif %}

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

@@ -89,9 +89,9 @@

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

-<div data-docgen-template-picker="data-docgen-template-picker" data-entity-class="Chill\ActivityBundle\Entity\Activity" data-entity-id="{{ entity.id }}"></div>

 {% set person_id = null %}
 {% if entity.person %}
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/editAccompanyingCourse.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/editAccompanyingCourse.html.twig
@@ -24,12 +24,11 @@
        window.activity = {{ activity_json|json_encode|raw }};
    </script>
    {{ encore_entry_script_tags('vue_activity') }}
-    {{ encore_entry_script_tags('mod_docgen_picktemplate') }}
 {% endblock %}

 {% block css %}
    {{ parent() }}
    {{ encore_entry_link_tags('mod_async_upload') }}
    {{ encore_entry_link_tags('vue_activity') }}
-    {{ encore_entry_link_tags('mod_docgen_picktemplate') }}
+    {{ encore_entry_link_tags('page_edit_activity') }}
 {% endblock %}
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/editPerson.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/editPerson.html.twig
@@ -20,7 +20,7 @@

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

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

    <div id="activity"></div> {# <=== vue component #}
@@ -39,11 +39,9 @@
        window.activity = {{ activity_json|json_encode|raw }};
    </script>
    {{ encore_entry_script_tags('vue_activity') }}
-    {{ encore_entry_script_tags('mod_docgen_picktemplate') }}
 {% endblock %}

 {% block css %}
    {{ encore_entry_link_tags('mod_async_upload') }}
    {{ encore_entry_link_tags('vue_activity') }}
-    {{ encore_entry_link_tags('mod_docgen_picktemplate') }}
 {% endblock %}
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/listPerson.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/listPerson.html.twig
@@ -30,7 +30,7 @@
    {{ encore_entry_link_tags('mod_notification_toggle_read_status') }}
 {% endblock %}

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

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

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

-    {% if is_granted('CHILL_ACTIVITY_CREATE', person) %}
+    {% if is_granted('CHILL_ACTIVITY_CREATE_PERSON', person) %}
    <ul class="record_actions sticky-form-buttons">
        <li>
            <a href="{{ path('chill_activity_activity_new', {'person_id': person_id, 'accompanying_period_id': accompanying_course_id}) }}"
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/list_recent.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/list_recent.html.twig
@@ -13,7 +13,7 @@
                        <p class="date-label">{{ activity.date|format_date('short') }}</p>
                    {%- endif -%}

-                    <span class="like-h3">{{ activity.type.name | localize_translatable_string }}</span>
+                    <span class="like-h3">{{ activity.type.name|localize_translatable_string }}</span>

                    {% if activity.emergency %}
                        <span class="badge bg-danger rounded-pill fs-6">{{ 'Emergency'|trans|upper }}</span>
@@ -41,7 +41,7 @@
                        {% if activity.user and t.userVisible %}
                            <li>
                                <span class="item-key">{{ 'Referrer'|trans ~ ': ' }}</span>
-                                <b>{{ activity.user.usernameCanonical }}</b>
+                                <b>{{ activity.user|chill_entity_render_box}}</b>
                            </li>
                        {% endif %}

--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/new.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/new.html.twig
@@ -35,7 +35,7 @@
    {{ form_row(form.socialActions) }}
 {% endif %}

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

@@ -85,14 +85,15 @@
    {{ form_row(form.comment) }}
 {% endif %}

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

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

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

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

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

    <div id="activity"></div> {# <=== vue component #}
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/selectTypePerson.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/selectTypePerson.html.twig
@@ -4,6 +4,6 @@

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

-{% block personcontent %}
+{% block content %}
    {% include 'ChillActivityBundle:Activity:selectType.html.twig' %}
 {% endblock %}
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/showPerson.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/showPerson.html.twig
@@ -18,11 +18,11 @@

 {% import 'ChillActivityBundle:ActivityReason:macro.html.twig' as m %}

-{% block personcontent -%}
+{% block content -%}
 <div class="activity-show">
    {% include 'ChillActivityBundle:Activity:show.html.twig' with {'context': 'person'} %}
 </div>
-{% endblock personcontent %}
+{% endblock %}

 {% block block_post_menu %}
    <div class="post-menu pt-4">
--- a/src/Bundle/ChillActivityBundle/Resources/views/Admin/layout_activity.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Admin/layout_activity.html.twig
@@ -25,7 +25,7 @@
 {% endblock %}

 {% block layout_wvm_content %}
-    {% block admin_content %}<!-- block personcontent empty -->
+    {% block admin_content %}<!-- block content empty -->
        <h1>{{ 'Activity configuration' |trans }}</h1>
    {% endblock %}
 {% endblock  %}
--- a/src/Bundle/ChillActivityBundle/Service/DocGenerator/ActivityContext.php
+++ b/src/Bundle/ChillActivityBundle/Service/DocGenerator/ActivityContext.php
@@ -17,13 +17,12 @@ use Chill\DocGeneratorBundle\Context\DocGeneratorContextWithPublicFormInterface;
 use Chill\DocGeneratorBundle\Context\Exception\UnexpectedTypeException;
 use Chill\DocGeneratorBundle\Entity\DocGeneratorTemplate;
 use Chill\DocGeneratorBundle\Service\Context\BaseContextData;
-use Chill\DocStoreBundle\Entity\Document;
 use Chill\DocStoreBundle\Entity\StoredObject;
 use Chill\DocStoreBundle\Repository\DocumentCategoryRepository;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\Person;
-use Chill\PersonBundle\Templating\Entity\PersonRender;
+use Chill\PersonBundle\Templating\Entity\PersonRenderInterface;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
@@ -44,7 +43,7 @@ class ActivityContext implements

    private NormalizerInterface $normalizer;

-    private PersonRender $personRender;
+    private PersonRenderInterface $personRender;

    private TranslatableStringHelperInterface $translatableStringHelper;

@@ -55,7 +54,7 @@ class ActivityContext implements
        NormalizerInterface $normalizer,
        TranslatableStringHelperInterface $translatableStringHelper,
        EntityManagerInterface $em,
-        PersonRender $personRender,
+        PersonRenderInterface $personRender,
        TranslatorInterface $translator,
        BaseContextData $baseContextData
    ) {
@@ -210,11 +209,8 @@ class ActivityContext implements
     */
    public function storeGenerated(DocGeneratorTemplate $template, StoredObject $storedObject, object $entity, array $contextGenerationData): void
    {
-        $doc = new StoredObject();
-        // TODO push document to remote
+        $entity->addDocument($storedObject);

-        $this->em->persist($doc);
-
-        $entity->addDocument($doc);
+        $this->em->persist($storedObject);
    }
 }
--- a/src/Bundle/ChillActivityBundle/Service/DocGenerator/ListActivitiesByAccompanyingPeriodContext.php
+++ b/src/Bundle/ChillActivityBundle/Service/DocGenerator/ListActivitiesByAccompanyingPeriodContext.php
@@ -0,0 +1,286 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\ActivityBundle\Service\DocGenerator;
+
+use Chill\ActivityBundle\Entity\ActivityPresence;
+use Chill\ActivityBundle\Entity\ActivityType;
+use Chill\ActivityBundle\Repository\ActivityACLAwareRepositoryInterface;
+use Chill\DocGeneratorBundle\Context\DocGeneratorContextWithAdminFormInterface;
+use Chill\DocGeneratorBundle\Context\DocGeneratorContextWithPublicFormInterface;
+use Chill\DocGeneratorBundle\Entity\DocGeneratorTemplate;
+use Chill\DocStoreBundle\Entity\StoredObject;
+use Chill\MainBundle\Entity\Location;
+use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Repository\UserRepository;
+use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\Entity\SocialWork\SocialAction;
+use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
+use Chill\PersonBundle\Repository\PersonRepository;
+use Chill\PersonBundle\Repository\SocialWork\SocialActionRepository;
+use Chill\PersonBundle\Repository\SocialWork\SocialIssueRepository;
+use Chill\PersonBundle\Service\DocGenerator\AccompanyingPeriodContext;
+use Chill\ThirdPartyBundle\Entity\ThirdParty;
+use Chill\ThirdPartyBundle\Repository\ThirdPartyRepository;
+use DateTime;
+use libphonenumber\PhoneNumber;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
+use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
+
+class ListActivitiesByAccompanyingPeriodContext implements
+    DocGeneratorContextWithAdminFormInterface,
+    DocGeneratorContextWithPublicFormInterface
+{
+    private AccompanyingPeriodContext $accompanyingPeriodContext;
+
+    private ActivityACLAwareRepositoryInterface $activityACLAwareRepository;
+
+    private NormalizerInterface $normalizer;
+
+    private PersonRepository $personRepository;
+
+    private SocialActionRepository $socialActionRepository;
+
+    private SocialIssueRepository $socialIssueRepository;
+
+    private ThirdPartyRepository $thirdPartyRepository;
+
+    private TranslatableStringHelperInterface $translatableStringHelper;
+
+    private UserRepository $userRepository;
+
+    public function __construct(
+        AccompanyingPeriodContext $accompanyingPeriodContext,
+        ActivityACLAwareRepositoryInterface $activityACLAwareRepository,
+        NormalizerInterface $normalizer,
+        PersonRepository $personRepository,
+        SocialActionRepository $socialActionRepository,
+        SocialIssueRepository $socialIssueRepository,
+        ThirdPartyRepository $thirdPartyRepository,
+        TranslatableStringHelperInterface $translatableStringHelper,
+        UserRepository $userRepository
+    ) {
+        $this->accompanyingPeriodContext = $accompanyingPeriodContext;
+        $this->activityACLAwareRepository = $activityACLAwareRepository;
+        $this->normalizer = $normalizer;
+        $this->personRepository = $personRepository;
+        $this->socialActionRepository = $socialActionRepository;
+        $this->socialIssueRepository = $socialIssueRepository;
+        $this->thirdPartyRepository = $thirdPartyRepository;
+        $this->translatableStringHelper = $translatableStringHelper;
+        $this->userRepository = $userRepository;
+    }
+
+    public function adminFormReverseTransform(array $data): array
+    {
+        return $this->accompanyingPeriodContext->adminFormReverseTransform($data);
+    }
+
+    public function adminFormTransform(array $data): array
+    {
+        return $this->accompanyingPeriodContext->adminFormTransform($data);
+    }
+
+    public function buildAdminForm(FormBuilderInterface $builder): void
+    {
+        $this->accompanyingPeriodContext->buildAdminForm($builder);
+    }
+
+    public function buildPublicForm(FormBuilderInterface $builder, DocGeneratorTemplate $template, $entity): void
+    {
+        $this->accompanyingPeriodContext->buildPublicForm($builder, $template, $entity);
+    }
+
+    public function getData(DocGeneratorTemplate $template, $entity, array $contextGenerationData = []): array
+    {
+        $data = $this->accompanyingPeriodContext->getData($template, $entity, $contextGenerationData);
+
+        $data['activities'] = $this->getActivitiesSimplified($entity);
+
+        return $data;
+    }
+
+    public function getDescription(): string
+    {
+        return 'docgen.Accompanying period with a list of activities description';
+    }
+
+    public function getEntityClass(): string
+    {
+        return AccompanyingPeriod::class;
+    }
+
+    public function getFormData(DocGeneratorTemplate $template, $entity): array
+    {
+        return $this->accompanyingPeriodContext->getFormData($template, $entity);
+    }
+
+    public static function getKey(): string
+    {
+        return self::class;
+    }
+
+    public function getName(): string
+    {
+        return 'docgen.Accompanying period with a list of activities';
+    }
+
+    public function hasAdminForm(): bool
+    {
+        return $this->accompanyingPeriodContext->hasAdminForm();
+    }
+
+    public function hasPublicForm(DocGeneratorTemplate $template, $entity): bool
+    {
+        return $this->accompanyingPeriodContext->hasPublicForm($template, $entity);
+    }
+
+    public function storeGenerated(DocGeneratorTemplate $template, StoredObject $storedObject, object $entity, array $contextGenerationData): void
+    {
+        $this->accompanyingPeriodContext->storeGenerated($template, $storedObject, $entity, $contextGenerationData);
+    }
+
+    private function getActivitiesSimplified(AccompanyingPeriod $period)
+    {
+        $activities =
+            $this->activityACLAwareRepository->findByAccompanyingPeriodSimplified($period);
+        $results = [];
+
+        foreach ($activities as $row) {
+            $activity = $row[0];
+
+            $activity['date'] = $this->normalizer->normalize($activity['date'], 'docgen', [
+                AbstractNormalizer::GROUPS => ['docgen:read'], 'docgen:expects' => DateTime::class,
+            ]);
+
+            if (null === $activity['location']) {
+                $activity['location'] = $this->normalizer->normalize(null, 'docgen', [
+                    AbstractNormalizer::GROUPS => ['docgen:read'], 'docgen:expects' => Location::class,
+                ]);
+                $activity['location']['type'] = 'location';
+            } else {
+                $activity['location']['isNull'] = false;
+                $activity['location']['type'] = 'location';
+
+                foreach (['1', '2'] as $key) {
+                    $activity['location']['phonenumber' . $key] = $this->normalizer->normalize(
+                        $activity['location']['phonenumber' . $key],
+                        'docgen',
+                        [AbstractNormalizer::GROUPS => ['docgen:read'], 'docgen:expects' => PhoneNumber::class]
+                    );
+                }
+            }
+
+            if (is_numeric($activity['location']['locationType']['id'])) {
+                $activity['location']['locationType']['title'] = $this->translatableStringHelper->localize(
+                    $activity['location']['locationType']['title']
+                );
+                $activity['location']['locationType']['isNull'] = false;
+                $activity['location']['locationType']['type'] = 'locationType';
+            }
+
+            if (null !== $activity['activityType']) {
+                $activity['activityType']['name'] = $this->translatableStringHelper->localize(
+                    $activity['activityType']['name']
+                );
+                $activity['activityType']['isNull'] = false;
+                $activity['activityType']['type'] = 'activityType';
+            } else {
+                $activity['activityType'] = $this->normalizer->normalize(null, 'docgen', [
+                    AbstractNormalizer::GROUPS => ['docgen:read'], 'docgen:expects' => ActivityType::class,
+                ]);
+            }
+
+            if (null !== $activity['attendee']) {
+                $activity['attendee']['name'] = $this->translatableStringHelper->localize(
+                    $activity['attendee']['name']
+                );
+                $activity['attendee']['isNull'] = false;
+                $activity['attendee']['type'] = 'activityPresence';
+            } else {
+                $activity['attendee'] = $this->normalizer->normalize(null, 'docgen', [
+                    AbstractNormalizer::GROUPS => ['docgen:read'], 'docgen:expects' => ActivityPresence::class,
+                ]);
+            }
+
+            $activity['comment'] = (string) $row['comment'];
+            $activity['travelTimeMinute'] = $row['travelTimeMinute'];
+            $activity['durationTimeMinute'] = $row['durationTimeMinute'];
+
+            if (null !== $row['userIds']) {
+                foreach ($row['userIds'] as $id) {
+                    $activity['users'][] = $this->normalizer->normalize(
+                        $this->userRepository->find($id),
+                        'docgen',
+                        [AbstractNormalizer::GROUPS => ['docgen:read'], 'docgen:expects' => User::class]
+                    );
+                }
+            } else {
+                $activity['users'] = [];
+            }
+
+            if (null !== $row['personIds']) {
+                foreach ($row['personIds'] as $id) {
+                    $activity['persons'][] = $this->normalizer->normalize(
+                        $this->personRepository->find($id),
+                        'docgen',
+                        [AbstractNormalizer::GROUPS => ['docgen:read'], 'docgen:expects' => Person::class]
+                    );
+                }
+            } else {
+                $activity['persons'] = [];
+            }
+
+            if (null !== $row['thirdPartyIds']) {
+                foreach ($row['thirdPartyIds'] as $id) {
+                    $activity['thirdParties'][] = $this->normalizer->normalize(
+                        $this->thirdPartyRepository->find($id),
+                        'docgen',
+                        [AbstractNormalizer::GROUPS => ['docgen:read'], 'docgen:expects' => ThirdParty::class]
+                    );
+                }
+            } else {
+                $activity['thirdParties'] = [];
+            }
+
+            if (null !== $row['socialActionIds']) {
+                foreach ($row['socialActionIds'] as $id) {
+                    $activity['socialActions'][] = $this->normalizer->normalize(
+                        $this->socialActionRepository->find($id),
+                        'docgen',
+                        [AbstractNormalizer::GROUPS => ['docgen:read'], 'docgen:expects' => SocialAction::class]
+                    );
+                }
+            } else {
+                $activity['socialActions'] = [];
+            }
+
+            if (null !== $row['socialIssueIds']) {
+                foreach ($row['socialIssueIds'] as $id) {
+                    $activity['socialIssues'][] = $this->normalizer->normalize(
+                        $this->socialIssueRepository->find($id),
+                        'docgen',
+                        [AbstractNormalizer::GROUPS => ['docgen:read'], 'docgen:expects' => SocialIssue::class]
+                    );
+                }
+            } else {
+                $activity['socialIssues'] = [];
+            }
+
+            $results[] = $activity;
+        }
+
+        return $results;
+    }
+}
--- a/src/Bundle/ChillActivityBundle/Tests/Entity/ActivityTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Entity/ActivityTest.php
@@ -0,0 +1,114 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\ActivityBundle\Tests\Entity;
+
+use Chill\ActivityBundle\Entity\Activity;
+use Chill\PersonBundle\AccompanyingPeriod\SocialIssueConsistency\AccompanyingPeriodSocialIssueConsistencyEntityListener;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Entity\SocialWork\SocialAction;
+use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
+use Doctrine\ORM\Event\LifecycleEventArgs;
+use PHPUnit\Framework\TestCase;
+use Prophecy\PhpUnit\ProphecyTrait;
+
+/**
+ * @internal
+ * @coversNothing
+ */
+final class ActivityTest extends TestCase
+{
+    use ProphecyTrait;
+
+    public function testHierarchySocialActions(): void
+    {
+        $parent = new SocialAction();
+        $child = new SocialAction();
+
+        $parent->addChild($child);
+        $grandChild = new SocialAction();
+        $child->addChild($grandChild);
+
+        $activity = new Activity();
+
+        $activity->addSocialAction($parent);
+
+        $this->assertCount(1, $activity->getSocialActions());
+        $this->assertContains($parent, $activity->getSocialActions());
+
+        $activity->addSocialAction($grandChild);
+
+        $this->assertCount(1, $activity->getSocialActions());
+        $this->assertContains($grandChild, $activity->getSocialActions());
+        $this->assertNotContains($parent, $activity->getSocialActions());
+
+        $activity->addSocialAction($child);
+
+        $this->assertCount(1, $activity->getSocialActions());
+        $this->assertContains($grandChild, $activity->getSocialActions());
+        $this->assertNotContains($parent, $activity->getSocialActions());
+        $this->assertNotContains($child, $activity->getSocialActions());
+
+        $activity->addSocialAction($another = new SocialAction());
+
+        $this->assertCount(2, $activity->getSocialActions());
+        $this->assertContains($grandChild, $activity->getSocialActions());
+        $this->assertContains($another, $activity->getSocialActions());
+        $this->assertNotContains($parent, $activity->getSocialActions());
+        $this->assertNotContains($child, $activity->getSocialActions());
+    }
+
+    public function testHierarchySocialIssues(): void
+    {
+        $listener = new AccompanyingPeriodSocialIssueConsistencyEntityListener();
+        $event = $this->prophesize(LifecycleEventArgs::class)->reveal();
+
+        $parent = new SocialIssue();
+        $child = new SocialIssue();
+
+        $parent->addChild($child);
+        $grandChild = new SocialIssue();
+        $child->addChild($grandChild);
+
+        $activity = new Activity();
+        $activity->setAccompanyingPeriod(new AccompanyingPeriod());
+
+        $activity->addSocialIssue($parent);
+        $listener->preUpdate($activity, $event);
+
+        $this->assertCount(1, $activity->getSocialIssues());
+        $this->assertContains($parent, $activity->getSocialIssues());
+
+        $activity->addSocialIssue($grandChild);
+        $listener->preUpdate($activity, $event);
+
+        $this->assertCount(1, $activity->getSocialIssues());
+        $this->assertContains($grandChild, $activity->getSocialIssues());
+        $this->assertNotContains($parent, $activity->getSocialIssues());
+
+        $activity->addSocialIssue($child);
+        $listener->preUpdate($activity, $event);
+
+        $this->assertCount(1, $activity->getSocialIssues());
+        $this->assertContains($grandChild, $activity->getSocialIssues());
+        $this->assertNotContains($parent, $activity->getSocialIssues());
+        $this->assertNotContains($child, $activity->getSocialIssues());
+
+        $activity->addSocialIssue($another = new SocialIssue());
+        $listener->preUpdate($activity, $event);
+
+        $this->assertCount(2, $activity->getSocialIssues());
+        $this->assertContains($grandChild, $activity->getSocialIssues());
+        $this->assertContains($another, $activity->getSocialIssues());
+        $this->assertNotContains($parent, $activity->getSocialIssues());
+        $this->assertNotContains($child, $activity->getSocialIssues());
+    }
+}
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ActivityReasonAggregatorTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ActivityReasonAggregatorTest.php
@@ -9,7 +9,7 @@

 declare(strict_types=1);

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

 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;

--- a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ActivityTypeAggregatorTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ActivityTypeAggregatorTest.php
@@ -9,7 +9,7 @@

 declare(strict_types=1);

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

 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;

--- a/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ActivityUserAggregatorTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ActivityUserAggregatorTest.php
@@ -9,7 +9,7 @@

 declare(strict_types=1);

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

 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;

--- a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ActivityReasonFilterTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/ActivityReasonFilterTest.php
@@ -9,7 +9,7 @@

 declare(strict_types=1);

-namespace Chill\ActivityBundle\Tests\Filter;
+namespace Chill\ActivityBundle\Tests\Export\Filter;

 use Chill\MainBundle\Test\Export\AbstractFilterTest;
 use Doctrine\Common\Collections\ArrayCollection;
--- a/src/Bundle/ChillActivityBundle/Tests/Export/Filter/PersonHavingActivityBetweenDateFilterTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Export/Filter/PersonHavingActivityBetweenDateFilterTest.php
@@ -9,7 +9,7 @@

 declare(strict_types=1);

-namespace Chill\ActivityBundle\Tests\Filter;
+namespace Chill\ActivityBundle\Tests\Export\Filter;

 use Chill\MainBundle\Test\Export\AbstractFilterTest;
 use DateTime;
--- a/src/Bundle/ChillActivityBundle/chill.webpack.config.js
+++ b/src/Bundle/ChillActivityBundle/chill.webpack.config.js
@@ -7,5 +7,7 @@ module.exports = function(encore, entries)
        ChillActivityAssets: __dirname + '/Resources/public'
    });

+    encore.addEntry('page_edit_activity', __dirname + '/Resources/public/page/edit_activity/index.scss');
+
    encore.addEntry('vue_activity', __dirname + '/Resources/public/vuejs/Activity/index.js');
 };
--- a/src/Bundle/ChillActivityBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillActivityBundle/translations/messages.fr.yml
@@ -66,6 +66,14 @@ Choose a type: Choisir un type
 1 hour 30: 1 heure 30
 1 hour 45: 1 heure 45
 2 hours: 2 heures
+2 hours 15: 2 heures 15
+2 hours 30: 2 heures 30
+2 hours 45: 2 heures 45
+3 hours: 3 heures
+3 hours 30: 3 heures 30
+4 hours: 4 heures
+4 hours 30: 4 heures 30
+5 hours: 5 heures
 Concerned groups: Parties concernées
 Persons in accompanying course: Usagers du parcours
 Third persons: Tiers non-pro.
@@ -76,7 +84,7 @@ activity:
    Insert a document: Insérer un document
    Remove a document: Supprimer le document
    comment: Commentaire
-No documents: Pas de documents
+No documents: Aucun document

 #timeline
 '%user% has done an %activity_type%': '%user% a effectué une activité de type "%activity_type%"'
@@ -232,3 +240,5 @@ This is the minimal activity data: Activité n°
 docgen:
    Activity basic: Echange
    A basic context for activity: Contexte pour les échanges
+    Accompanying period with a list of activities: Parcours d'accompagnement avec liste des échanges
+    Accompanying period with a list of activities description: Ce contexte reprend les informations du parcours, et tous les échanges pour un parcours. Les échanges ne sont pas filtrés.
--- a/src/Bundle/ChillAsideActivityBundle/src/DependencyInjection/Configuration.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/DependencyInjection/Configuration.php
@@ -31,6 +31,10 @@ class Configuration implements ConfigurationInterface
            ->isRequired()
            ->defaultValue(
                [
+                    ['label' => '1 minutes',  'seconds' => 60],
+                    ['label' => '2 minutes',  'seconds' => 120],
+                    ['label' => '3 minutes',  'seconds' => 180],
+                    ['label' => '4 minutes',  'seconds' => 240],
                    ['label' => '5 minutes',  'seconds' => 300],
                    ['label' => '10 minutes', 'seconds' => 600],
                    ['label' => '15 minutes', 'seconds' => 900],
--- a/src/Bundle/ChillAsideActivityBundle/src/Entity/AsideActivityCategory.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Entity/AsideActivityCategory.php
@@ -167,7 +167,6 @@ class AsideActivityCategory
        }

        $this->parent = $parent;
-        dump($this);

        return $this;
    }
--- a/src/Bundle/ChillAsideActivityBundle/src/Menu/UserMenuBuilder.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Menu/UserMenuBuilder.php
@@ -16,7 +16,7 @@ use Chill\TaskBundle\Templating\UI\CountNotificationTask;
 use Knp\Menu\MenuItem;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
-use Symfony\Component\Translation\TranslatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;

 class UserMenuBuilder implements LocalMenuBuilderInterface
 {
--- a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/Admin/layout_asideactivity.html.twig
+++ b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/Admin/layout_asideactivity.html.twig
@@ -6,7 +6,7 @@

 {% block layout_wvm_content %}
 	{% block admin_content %}
-		<!-- block personcontent empty -->
+		<!-- block content empty -->
 		<h1>{{ 'Aside activity configuration'|trans }}</h1>
 	{% endblock %}
 {% endblock  %}
--- a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/index.html.twig
+++ b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/index.html.twig
@@ -40,7 +40,7 @@
 									{% endif %}
 								</div>
 							</div>
-							<div class="item-col">
+							<div class="item-col" style="justify-content: flex-end;">
 								<div class="box">
 									<ul class="list-content fa-ul">
 										<li>
@@ -79,7 +79,7 @@

 			{{ chill_pagination(paginator) }}

-			<ul class="record_actions">
+			<ul class="record_actions sticky-form-buttons">
 				<li>
 					<a href="{{ chill_path_add_return_path('chill_crud_aside_activity_new') }}" class="btn btn-create">
 						{{ 'Create'|trans }}
--- a/src/Bundle/ChillBudgetBundle/Calculator/CalculatorInterface.php
+++ b/src/Bundle/ChillBudgetBundle/Calculator/CalculatorInterface.php
@@ -9,9 +9,9 @@

 declare(strict_types=1);

-namespace Chill\AMLI\BudgetBundle\Calculator;
+namespace Chill\BudgetBundle\Calculator;

-use Chill\AMLI\BudgetBundle\Entity\AbstractElement;
+use Chill\BudgetBundle\Entity\AbstractElement;

 interface CalculatorInterface
 {
--- a/src/Bundle/ChillBudgetBundle/Calculator/CalculatorManager.php
+++ b/src/Bundle/ChillBudgetBundle/Calculator/CalculatorManager.php
@@ -9,9 +9,9 @@

 declare(strict_types=1);

-namespace Chill\AMLI\BudgetBundle\Calculator;
+namespace Chill\BudgetBundle\Calculator;

-use Chill\AMLI\BudgetBundle\Entity\AbstractElement;
+use Chill\BudgetBundle\Entity\AbstractElement;
 use OutOfBoundsException;

 use function array_key_exists;
--- a/src/Bundle/ChillBudgetBundle/Calculator/CalculatorResult.php
+++ b/src/Bundle/ChillBudgetBundle/Calculator/CalculatorResult.php
@@ -9,7 +9,7 @@

 declare(strict_types=1);

-namespace Chill\AMLI\BudgetBundle\Calculator;
+namespace Chill\BudgetBundle\Calculator;

 class CalculatorResult
 {
--- a/src/Bundle/ChillBudgetBundle/ChillAMLIBudgetBundle.php
+++ b/src/Bundle/ChillBudgetBundle/ChillAMLIBudgetBundle.php
@@ -9,12 +9,12 @@

 declare(strict_types=1);

-namespace Chill\AMLI\BudgetBundle;
+namespace Chill\BudgetBundle;

-use Chill\AMLI\BudgetBundle\DependencyInjection\Compiler\CalculatorCompilerPass;
+use Chill\BudgetBundle\DependencyInjection\Compiler\CalculatorCompilerPass;
 use Symfony\Component\HttpKernel\Bundle\Bundle;

-class ChillAMLIBudgetBundle extends Bundle
+class ChillBudgetBundle extends Bundle
 {
    public function build(\Symfony\Component\DependencyInjection\ContainerBuilder $container)
    {
--- a/src/Bundle/ChillBudgetBundle/Config/ConfigRepository.php
+++ b/src/Bundle/ChillBudgetBundle/Config/ConfigRepository.php
@@ -9,7 +9,7 @@

 declare(strict_types=1);

-namespace Chill\AMLI\BudgetBundle\Config;
+namespace Chill\BudgetBundle\Config;

 class ConfigRepository
 {
@@ -29,6 +29,11 @@ class ConfigRepository
        $this->charges = $charges;
    }

+    public function getChargesKeys(): array
+    {
+        return array_map(static function ($element) { return $element['key']; }, $this->charges);
+    }
+
    /**
     * @return array where keys are the resource'key and label the ressource label
     */
@@ -43,6 +48,11 @@ class ConfigRepository
        return $charges;
    }

+    public function getResourcesKeys(): array
+    {
+        return array_map(static function ($element) { return $element['key']; }, $this->resources);
+    }
+
    /**
     * @return array where keys are the resource'key and label the ressource label
     */
--- a/src/Bundle/ChillBudgetBundle/Controller/AbstractElementController.php
+++ b/src/Bundle/ChillBudgetBundle/Controller/AbstractElementController.php
@@ -9,37 +9,29 @@

 declare(strict_types=1);

-namespace Chill\AMLI\BudgetBundle\Controller;
+namespace Chill\BudgetBundle\Controller;

-use Chill\AMLI\BudgetBundle\Entity\AbstractElement;
-use Chill\AMLI\BudgetBundle\Security\Authorization\BudgetElementVoter;
+use Chill\BudgetBundle\Entity\AbstractElement;
+use Chill\BudgetBundle\Security\Authorization\BudgetElementVoter;
 use Chill\PersonBundle\Entity\Person;
 use Doctrine\ORM\EntityManagerInterface;
 use Psr\Log\LoggerInterface;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
-use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\Form\Extension\Core\Type\SubmitType;
+use Symfony\Component\Form\Form;
 use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\Translation\TranslatorInterface;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Contracts\Translation\TranslatorInterface;

 use function get_class;

-abstract class AbstractElementController extends Controller
+abstract class AbstractElementController extends AbstractController
 {
-    /**
-     * @var LoggerInterface
-     */
-    protected $chillMainLogger;
+    protected LoggerInterface $chillMainLogger;

-    /**
-     * @var EntityManagerInterface
-     */
-    protected $em;
+    protected EntityManagerInterface $em;

-    /**
-     * @var TranslatorInterface
-     */
-    protected $translator;
+    protected TranslatorInterface $translator;

    public function __construct(
        EntityManagerInterface $em,
@@ -59,16 +51,22 @@ abstract class AbstractElementController extends Controller
     *
     * @param mixed $template
     * @param mixed $flashMessage
-     *
-     * @return \Symfony\Component\BrowserKit\Response
     */
-    protected function _delete(AbstractElement $element, Request $request, $template, $flashMessage)
+    protected function _delete(AbstractElement $element, Request $request, $template, $flashMessage): Response
    {
        $this->denyAccessUnlessGranted(BudgetElementVoter::DELETE, $element, 'You are not '
-             . 'allowed to delete this family membership');
+            . 'allowed to delete this item');

        $form = $this->createDeleteForm();

+        if (null !== $element->getPerson()) {
+            $entity = $element->getPerson();
+            $indexPage = 'chill_budget_elements_index';
+        } else {
+            $entity = $element->getHousehold();
+            $indexPage = 'chill_budget_elements_household_index';
+        }
+
        if ($request->getMethod() === Request::METHOD_DELETE) {
            $form->handleRequest($request);

@@ -88,8 +86,8 @@ abstract class AbstractElementController extends Controller
                $this->addFlash('success', $this->translator
                    ->trans($flashMessage));

-                return $this->redirectToRoute('chill_budget_elements_index', [
-                    'id' => $element->getPerson()->getId(),
+                return $this->redirectToRoute($indexPage, [
+                    'id' => $entity->getId(),
                ]);
            }
        }
@@ -103,13 +101,23 @@ abstract class AbstractElementController extends Controller
    /**
     * @param string $template
     * @param string $flashOnSuccess
-     *
-     * @return \Symfony\Component\HttpFoundation\Response
     */
-    protected function _edit(AbstractElement $element, Request $request, $template, $flashOnSuccess)
+    protected function _edit(AbstractElement $element, Request $request, $template, $flashOnSuccess): Response
    {
        $this->denyAccessUnlessGranted(BudgetElementVoter::UPDATE, $element);

+        if (null !== $element->getPerson()) {
+            $entity = $element->getPerson();
+            $entityStr = 'person';
+            $indexPage = 'chill_budget_elements_index';
+        } else {
+            $entity = $element->getHousehold();
+            $entityStr = 'household';
+            $indexPage = 'chill_budget_elements_household_index';
+        }
+
+        $entity = null !== $element->getPerson() ? $element->getPerson() : $element->getHousehold();
+
        $form = $this->createForm($this->getType(), $element);
        $form->add('submit', SubmitType::class);

@@ -121,29 +129,39 @@ abstract class AbstractElementController extends Controller

            $this->addFlash('success', $this->translator->trans($flashOnSuccess));

-            return $this->redirectToRoute('chill_budget_elements_index', [
-                'id' => $element->getPerson()->getId(),
+            return $this->redirectToRoute($indexPage, [
+                'id' => $entity->getId(),
            ]);
        }

        return $this->render($template, [
            'element' => $element,
            'form' => $form->createView(),
-            'person' => $element->getPerson(),
+            $entityStr => $entity,
        ]);
    }

    /**
     * @param mixed $template
     * @param mixed $flashMessageOnSuccess
+     * @param mixed $entity
     */
-    protected function _new(Person $person, Request $request, $template, $flashMessageOnSuccess)
+    protected function _new($entity, Request $request, $template, $flashMessageOnSuccess)
    {
-        /** @var \Chill\AMLI\BudgetBundle\Entity\AbstractElement $element */
-        $element = $this->createNewElement()
-            ->setPerson($person);
+        /** @var AbstractElement $element */
+        $element = $this->createNewElement();

-        $this->denyAccessUnlessGranted(BudgetElementVoter::CREATE, $element);
+        if ($entity instanceof Person) {
+            $element->setPerson($entity);
+            $entityStr = 'person';
+            $indexPage = 'chill_budget_elements_index';
+        } else {
+            $element->setHousehold($entity);
+            $entityStr = 'household';
+            $indexPage = 'chill_budget_elements_household_index';
+        }
+
+        // $this->denyAccessUnlessGranted(BudgetElementVoter::CREATE, $entity);

        $form = $this->createForm($this->getType(), $element);
        $form->add('submit', SubmitType::class);
@@ -157,8 +175,8 @@ abstract class AbstractElementController extends Controller

            $this->addFlash('success', $this->translator->trans($flashMessageOnSuccess));

-            return $this->redirectToRoute('chill_budget_elements_index', [
-                'id' => $person->getId(),
+            return $this->redirectToRoute($indexPage, [
+                'id' => $entity->getId(),
            ]);
        }

@@ -168,7 +186,7 @@ abstract class AbstractElementController extends Controller

        return $this->render($template, [
            'form' => $form->createView(),
-            'person' => $person,
+            $entityStr => $entity,
            'element' => $element,
        ]);
    }
@@ -183,7 +201,7 @@ abstract class AbstractElementController extends Controller
     */
    protected function _view(AbstractElement $element, $template)
    {
-        $this->denyAccessUnlessGranted(BudgetElementVoter::SHOW, $element);
+        $this->denyAccessUnlessGranted(BudgetElementVoter::SEE, $element);

        return $this->render($template, [
            'element' => $element,
@@ -199,10 +217,8 @@ abstract class AbstractElementController extends Controller

    /**
     * Creates a form to delete a help request entity by id.
-     *
-     * @return \Symfony\Component\Form\Form The form
     */
-    private function createDeleteForm()
+    private function createDeleteForm(): Form
    {
        return $this->createFormBuilder()
            ->setMethod(Request::METHOD_DELETE)
--- a/src/Bundle/ChillBudgetBundle/Controller/ChargeController.php
+++ b/src/Bundle/ChillBudgetBundle/Controller/ChargeController.php
@@ -9,10 +9,11 @@

 declare(strict_types=1);

-namespace Chill\AMLI\BudgetBundle\Controller;
+namespace Chill\BudgetBundle\Controller;

-use Chill\AMLI\BudgetBundle\Entity\Charge;
-use Chill\AMLI\BudgetBundle\Form\ChargeType;
+use Chill\BudgetBundle\Entity\Charge;
+use Chill\BudgetBundle\Form\ChargeType;
+use Chill\PersonBundle\Entity\Household\Household;
 use Chill\PersonBundle\Entity\Person;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
 use Symfony\Component\HttpFoundation\Request;
@@ -32,7 +33,7 @@ class ChargeController extends AbstractElementController
        return $this->_delete(
            $charge,
            $request,
-            '@ChillAMLIBudget/Charge/confirm_delete.html.twig',
+            '@ChillBudget/Charge/confirm_delete.html.twig',
            'Charge deleted'
        );
    }
@@ -50,7 +51,7 @@ class ChargeController extends AbstractElementController
        return $this->_edit(
            $charge,
            $request,
-            '@ChillAMLIBudget/Charge/edit.html.twig',
+            '@ChillBudget/Charge/edit.html.twig',
            'Charge updated'
        );
    }
@@ -68,7 +69,25 @@ class ChargeController extends AbstractElementController
        return $this->_new(
            $person,
            $request,
-            '@ChillAMLIBudget/Charge/new.html.twig',
+            '@ChillBudget/Charge/new.html.twig',
+            'Charge created'
+        );
+    }
+
+    /**
+     * @Route(
+     *     "{_locale}/budget/charge/by-household/{id}/new",
+     *     name="chill_budget_charge_household_new"
+     * )
+     *
+     * @return \Symfony\Component\HttpFoundation\Response
+     */
+    public function newHouseholdAction(Request $request, Household $household)
+    {
+        return $this->_new(
+            $household,
+            $request,
+            '@ChillBudget/Charge/new.html.twig',
            'Charge created'
        );
    }
@@ -83,7 +102,7 @@ class ChargeController extends AbstractElementController
     */
    public function viewAction(Charge $charge)
    {
-        return $this->_view($charge, '@ChillAMLIBudget/Charge/view.html.twig');
+        return $this->_view($charge, '@ChillBudget/Charge/view.html.twig');
    }

    protected function createNewElement()
--- a/src/Bundle/ChillBudgetBundle/Controller/ElementController.php
+++ b/src/Bundle/ChillBudgetBundle/Controller/ElementController.php
@@ -9,44 +9,33 @@

 declare(strict_types=1);

-namespace Chill\AMLI\BudgetBundle\Controller;
+namespace Chill\BudgetBundle\Controller;

-use Chill\AMLI\BudgetBundle\Calculator\CalculatorManager;
-use Chill\AMLI\BudgetBundle\Entity\Charge;
-use Chill\AMLI\BudgetBundle\Entity\Resource;
-use Chill\AMLI\BudgetBundle\Security\Authorization\BudgetElementVoter;
+use Chill\BudgetBundle\Calculator\CalculatorManager;
+use Chill\BudgetBundle\Entity\Charge;
+use Chill\BudgetBundle\Entity\Resource;
+use Chill\BudgetBundle\Security\Authorization\BudgetElementVoter;
+use Chill\PersonBundle\Entity\Household\Household;
 use Chill\PersonBundle\Entity\Person;
 use DateTime;
 use Doctrine\ORM\EntityManagerInterface;
 use Psr\Log\LoggerInterface;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
-use Symfony\Bundle\FrameworkBundle\Controller\Controller;
-use Symfony\Component\Translation\TranslatorInterface;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Contracts\Translation\TranslatorInterface;

 use function array_merge;
 use function count;

-class ElementController extends Controller
+class ElementController extends AbstractController
 {
-    /**
-     * @var CalculatorManager
-     */
-    protected $calculator;
+    protected CalculatorManager $calculator;

-    /**
-     * @var LoggerInterface
-     */
-    protected $chillMainLogger;
+    protected LoggerInterface $chillMainLogger;

-    /**
-     * @var EntityManagerInterface
-     */
-    protected $em;
+    protected EntityManagerInterface $em;

-    /**
-     * @var TranslatorInterface
-     */
-    protected $translator;
+    protected TranslatorInterface $translator;

    public function __construct(
        EntityManagerInterface $em,
@@ -68,11 +57,12 @@ class ElementController extends Controller
     */
    public function indexAction(Person $person)
    {
-        $this->denyAccessUnlessGranted(BudgetElementVoter::SHOW, $person);
+        $this->denyAccessUnlessGranted(BudgetElementVoter::SEE, $person);

        $charges = $this->em
            ->getRepository(Charge::class)
            ->findByPerson($person);
+
        $ressources = $this->em
            ->getRepository(Resource::class)
            ->findByPerson($person);
@@ -81,10 +71,10 @@ class ElementController extends Controller

        $actualCharges = $this->em
            ->getRepository(Charge::class)
-            ->findByPersonAndDate($person, $now);
+            ->findByEntityAndDate($person, $now);
        $actualResources = $this->em
            ->getRepository(Resource::class)
-            ->findByPersonAndDate($person, $now);
+            ->findByEntityAndDate($person, $now);

        $elements = array_merge($actualCharges, $actualResources);

@@ -92,11 +82,79 @@ class ElementController extends Controller
            $results = $this->calculator->calculateDefault($elements);
        }

-        return $this->render('ChillAMLIBudgetBundle:Element:index.html.twig', [
+        return $this->render('ChillBudgetBundle:Person:index.html.twig', [
            'person' => $person,
            'charges' => $charges,
            'resources' => $ressources,
            'results' => $results ?? [],
        ]);
    }
+
+    /**
+     * @Route(
+     *     "{_locale}/budget/elements/by-household/{id}",
+     *     name="chill_budget_elements_household_index"
+     * )
+     */
+    public function indexHouseholdAction(Household $household)
+    {
+        $this->denyAccessUnlessGranted(BudgetElementVoter::SEE, $household);
+
+        $charges = $this->em
+            ->getRepository(Charge::class)
+            ->findByHousehold($household);
+
+        $ressources = $this->em
+            ->getRepository(Resource::class)
+            ->findByHousehold($household);
+
+        $now = new DateTime('now');
+
+        $actualCharges = $this->em
+            ->getRepository(Charge::class)
+            ->findByEntityAndDate($household, $now);
+        $actualResources = $this->em
+            ->getRepository(Resource::class)
+            ->findByEntityAndDate($household, $now);
+
+        $elements = array_merge($actualCharges, $actualResources);
+
+        if (count($elements) > 0) {
+            $results = $this->calculator->calculateDefault($elements);
+        }
+
+        // quick solution to calculate the sum, difference and amount from
+        // controller. This should be done from the calculators
+        // TODO replace this by calculators
+        $wholeCharges = $actualCharges;
+        $wholeResources = $actualResources;
+
+        foreach ($household->getCurrentPersons() as $person) {
+            $wholeCharges = array_merge(
+                $wholeCharges,
+                $this->em
+                    ->getRepository(Charge::class)
+                    ->findByEntityAndDate($person, $now)
+            );
+            $wholeResources = array_merge(
+                $wholeResources,
+                $this->em
+                    ->getRepository(Resource::class)
+                    ->findByEntityAndDate($person, $now)
+            );
+        }
+
+        return $this->render('ChillBudgetBundle:Household:index.html.twig', [
+            'household' => $household,
+            'charges' => $charges,
+            'resources' => $ressources,
+            'wholeResources' => array_filter($wholeResources, static function (Resource $r) use ($now) {
+                return $r->getStartDate() <= $now && ($r->getEndDate() === null || $r->getEndDate() >= $now);
+            }),
+            'wholeCharges' => array_filter($wholeCharges, static function (Charge $c) use ($now) {
+                return $c->getStartDate() <= $now && ($c->getEndDate() === null || $c->getEndDate() >= $now);
+            }),
+            'results' => $results ?? [],
+        ]);
+    }
 }
--- a/src/Bundle/ChillBudgetBundle/Controller/ResourceController.php
+++ b/src/Bundle/ChillBudgetBundle/Controller/ResourceController.php
@@ -9,13 +9,15 @@

 declare(strict_types=1);

-namespace Chill\AMLI\BudgetBundle\Controller;
+namespace Chill\BudgetBundle\Controller;

-use Chill\AMLI\BudgetBundle\Entity\Resource;
-use Chill\AMLI\BudgetBundle\Form\ResourceType;
+use Chill\BudgetBundle\Entity\Resource;
+use Chill\BudgetBundle\Form\ResourceType;
+use Chill\PersonBundle\Entity\Household\Household;
 use Chill\PersonBundle\Entity\Person;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;

 class ResourceController extends AbstractElementController
 {
@@ -24,15 +26,13 @@ class ResourceController extends AbstractElementController
     *     "{_locale}/budget/resource/{id}/delete",
     *     name="chill_budget_resource_delete"
     * )
-     *
-     * @return \Symfony\Component\HttpFoundation\Response
     */
    public function deleteAction(Request $request, Resource $resource)
    {
        return $this->_delete(
            $resource,
            $request,
-            '@ChillAMLIBudget/Resource/confirm_delete.html.twig',
+            '@ChillBudget/Resource/confirm_delete.html.twig',
            'Resource deleted'
        );
    }
@@ -42,33 +42,49 @@ class ResourceController extends AbstractElementController
     *     "{_locale}/budget/resource/{id}/edit",
     *     name="chill_budget_resource_edit"
     * )
-     *
-     * @return \Symfony\Component\HttpFoundation\Response
     */
-    public function editAction(Request $request, Resource $resource)
+    public function editAction(Request $request, Resource $resource): Response
    {
        return $this->_edit(
            $resource,
            $request,
-            '@ChillAMLIBudget/Resource/edit.html.twig',
+            '@ChillBudget/Resource/edit.html.twig',
            'Resource updated'
        );
    }

    /**
+     * Create a new budget element for a person.
+     *
     * @Route(
     *     "{_locale}/budget/resource/by-person/{id}/new",
     *     name="chill_budget_resource_new"
     * )
-     *
-     * @return \Symfony\Component\HttpFoundation\Response
     */
-    public function newAction(Request $request, Person $person)
+    public function newAction(Request $request, Person $person): Response
    {
        return $this->_new(
            $person,
            $request,
-            '@ChillAMLIBudget/Resource/new.html.twig',
+            '@ChillBudget/Resource/new.html.twig',
+            'Resource created'
+        );
+    }
+
+    /**
+     * Create new budget element for a household.
+     *
+     * @Route(
+     *     "{_locale}/budget/resource/by-household/{id}/new",
+     *     name="chill_budget_resource_household_new"
+     * )
+     */
+    public function newHouseholdAction(Request $request, Household $household): Response
+    {
+        return $this->_new(
+            $household,
+            $request,
+            '@ChillBudget/Resource/new.html.twig',
            'Resource created'
        );
    }
@@ -78,12 +94,10 @@ class ResourceController extends AbstractElementController
     *     "{_locale}/budget/resource/{id}/view",
     *     name="chill_budget_resource_view"
     * )
-     *
-     * @return \Symfony\Component\HttpFoundation\Response
     */
-    public function viewAction(Resource $resource)
+    public function viewAction(Resource $resource): Response
    {
-        return $this->_view($resource, '@ChillAMLIBudget/Resource/view.html.twig');
+        return $this->_view($resource, '@ChillBudget/Resource/view.html.twig');
    }

    protected function createNewElement()
--- a/src/Bundle/ChillBudgetBundle/DependencyInjection/ChillAMLIBudgetExtension.php
+++ b/src/Bundle/ChillBudgetBundle/DependencyInjection/ChillAMLIBudgetExtension.php
@@ -9,9 +9,9 @@

 declare(strict_types=1);

-namespace Chill\AMLI\BudgetBundle\DependencyInjection;
+namespace Chill\BudgetBundle\DependencyInjection;

-use Chill\AMLI\BudgetBundle\Security\Authorization\BudgetElementVoter;
+use Chill\BudgetBundle\Security\Authorization\BudgetElementVoter;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
@@ -23,11 +23,11 @@ use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 *
 * @see http://symfony.com/doc/current/cookbook/bundles/extension.html
 */
-class ChillAMLIBudgetExtension extends Extension implements PrependExtensionInterface
+class ChillBudgetExtension extends Extension implements PrependExtensionInterface
 {
    public function load(array $configs, ContainerBuilder $container)
    {
-        $configuration = new Configuration();
+        $configuration = $this->getConfiguration($configs, $container);
        $config = $this->processConfiguration($configuration, $configs);

        $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__ . '/../config'));
@@ -38,6 +38,7 @@ class ChillAMLIBudgetExtension extends Extension implements PrependExtensionInte
        $loader->load('services/templating.yaml');
        $loader->load('services/menu.yaml');
        $loader->load('services/calculator.yaml');
+        $loader->load('services/services.yaml');

        $this->storeConfig('resources', $config, $container);
        $this->storeConfig('charges', $config, $container);
@@ -58,7 +59,7 @@ class ChillAMLIBudgetExtension extends Extension implements PrependExtensionInte
        $container->prependExtensionConfig('chill_main', [
            'routing' => [
                'resources' => [
-                    '@ChillAMLIBudgetBundle/config/routing.yaml',
+                    '@ChillBudgetBundle/config/routing.yaml',
                ],
            ],
        ]);
@@ -68,8 +69,8 @@ class ChillAMLIBudgetExtension extends Extension implements PrependExtensionInte
    {
        $container->prependExtensionConfig('security', [
            'role_hierarchy' => [
-                BudgetElementVoter::UPDATE => [BudgetElementVoter::SHOW],
-                BudgetElementVoter::CREATE => [BudgetElementVoter::SHOW],
+                BudgetElementVoter::UPDATE => [BudgetElementVoter::SEE],
+                BudgetElementVoter::CREATE => [BudgetElementVoter::SEE],
            ],
        ]);
    }
--- a/src/Bundle/ChillBudgetBundle/DependencyInjection/Compiler/CalculatorCompilerPass.php
+++ b/src/Bundle/ChillBudgetBundle/DependencyInjection/Compiler/CalculatorCompilerPass.php
@@ -9,7 +9,7 @@

 declare(strict_types=1);

-namespace Chill\AMLI\BudgetBundle\DependencyInjection\Compiler;
+namespace Chill\BudgetBundle\DependencyInjection\Compiler;

 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -19,7 +19,7 @@ class CalculatorCompilerPass implements CompilerPassInterface
 {
    public function process(ContainerBuilder $container)
    {
-        $manager = $container->getDefinition('Chill\AMLI\BudgetBundle\Calculator\CalculatorManager');
+        $manager = $container->getDefinition('Chill\BudgetBundle\Calculator\CalculatorManager');

        foreach ($container->findTaggedServiceIds('chill_budget.calculator') as $id => $tags) {
            foreach ($tags as $tag) {
--- a/src/Bundle/ChillBudgetBundle/DependencyInjection/Configuration.php
+++ b/src/Bundle/ChillBudgetBundle/DependencyInjection/Configuration.php
@@ -9,7 +9,7 @@

 declare(strict_types=1);

-namespace Chill\AMLI\BudgetBundle\DependencyInjection;
+namespace Chill\BudgetBundle\DependencyInjection;

 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
@@ -23,14 +23,14 @@ class Configuration implements ConfigurationInterface
 {
    public function getConfigTreeBuilder()
    {
-        $treeBuilder = new TreeBuilder('chill_amli_budget');
-        $rootNode = $treeBuilder->getRootNode('chill_amli_budget');
+        $treeBuilder = new TreeBuilder('chill_budget');
+        $rootNode = $treeBuilder->getRootNode('chill_budget');

        $rootNode
            ->children()

                // ressources
-            ->arrayNode('resources')->isRequired()->requiresAtLeastOneElement()
+            ->arrayNode('resources')->defaultValue([])
            ->arrayPrototype()
            ->children()
            ->scalarNode('key')->isRequired()->cannotBeEmpty()
@@ -52,7 +52,7 @@ class Configuration implements ConfigurationInterface
            ->end()
            ->end()
            ->end()
-            ->arrayNode('charges')->isRequired()->requiresAtLeastOneElement()
+            ->arrayNode('charges')->defaultValue([])
            ->arrayPrototype()
            ->children()
            ->scalarNode('key')->isRequired()->cannotBeEmpty()
--- a/src/Bundle/ChillBudgetBundle/Entity/AbstractElement.php
+++ b/src/Bundle/ChillBudgetBundle/Entity/AbstractElement.php
@@ -9,13 +9,15 @@

 declare(strict_types=1);

-namespace Chill\AMLI\BudgetBundle\Entity;
+namespace Chill\BudgetBundle\Entity;

+use Chill\PersonBundle\Entity\Household\Household;
 use Chill\PersonBundle\Entity\Person;
 use DateTime;
 use DateTimeImmutable;
 use DateTimeInterface;
 use Doctrine\ORM\Mapping as ORM;
+use Ramsey\Uuid\Type\Decimal;
 use Symfony\Component\Validator\Constraints as Assert;

 /**
@@ -26,8 +28,6 @@ use Symfony\Component\Validator\Constraints as Assert;
 abstract class AbstractElement
 {
    /**
-     * @var decimal
-     *
     * @ORM\Column(name="amount", type="decimal", precision=10, scale=2)
     * @Assert\GreaterThan(
     *     value=0
@@ -36,100 +36,80 @@ abstract class AbstractElement
     *     message="The amount cannot be empty"
     * )
     */
-    private $amount;
+    private string $amount;

    /**
-     * @var string|null
-     *
     * @ORM\Column(name="comment", type="text", nullable=true)
     */
-    private $comment;
+    private ?string $comment;

    /**
-     * @var DateTimeImmutable|null
-     *
     * @ORM\Column(name="endDate", type="datetime_immutable", nullable=true)
     * @Assert\GreaterThan(
     *     propertyPath="startDate",
     *     message="The budget element's end date must be after the start date"
     * )
     */
-    private $endDate;
+    private ?DateTimeImmutable $endDate;
+
+    /**
+     * @ORM\ManyToOne(
+     *     targetEntity="\Chill\PersonBundle\Entity\Household\Household"
+     * )
+     */
+    private ?Household $household = null;

    /**
-     * @var Person
     * @ORM\ManyToOne(
     *     targetEntity="\Chill\PersonBundle\Entity\Person"
     * )
     */
-    private $person;
+    private ?Person $person = null;

    /**
-     * @var DateTimeImmutable
-     *
     * @ORM\Column(name="startDate", type="datetime_immutable")
     * @Assert\Date
     */
-    private $startDate;
+    private DateTimeImmutable $startDate;

    /**
-     * @var string
-     *
     * @ORM\Column(name="type", type="string", length=255)
     */
-    private $type;
+    private string $type;

-    /**
-     * Get amount.
-     *
-     * @return float
-     */
-    public function getAmount()
+    /*Getters and Setters */
+
+    public function getAmount(): float
    {
        return (float) $this->amount;
    }

-    /**
-     * Get comment.
-     *
-     * @return string|null
-     */
-    public function getComment()
+    public function getComment(): ?string
    {
        return $this->comment;
    }

-    /**
-     * Get endDate.
-     *
-     * @return DateTimeImmutable|null
-     */
-    public function getEndDate()
+    public function getEndDate(): ?DateTimeImmutable
    {
        return $this->endDate;
    }

-    public function getPerson(): Person
+    public function getHousehold(): ?Household
+    {
+        return $this->household;
+    }
+
+    public function getPerson(): ?Person
    {
        return $this->person;
    }

-    /**
-     * Get startDate.
-     *
-     * @return DateTimeImmutable
-     */
-    public function getStartDate()
+    public function getStartDate(): DateTimeImmutable
    {
        return $this->startDate;
    }

-    /**
-     * Get type.
-     *
-     * @return string
-     */
-    public function getType()
+    public function getType(): string
    {
        return $this->type;
    }
@@ -143,40 +123,21 @@ abstract class AbstractElement

    abstract public function isResource(): bool;

-    /**
-     * Set amount.
-     *
-     * @param string $amount
-     *
-     * @return AbstractElement
-     */
-    public function setAmount($amount)
+    public function setAmount(string $amount): self
    {
        $this->amount = $amount;

        return $this;
    }

-    /**
-     * Set comment.
-     *
-     * @param string|null $comment
-     *
-     * @return AbstractElement
-     */
-    public function setComment($comment = null)
+    public function setComment(?string $comment = null): self
    {
        $this->comment = $comment;

        return $this;
    }

-    /**
-     * Set endDate.
-     *
-     * @return AbstractElement
-     */
-    public function setEndDate(?DateTimeInterface $endDate = null)
+    public function setEndDate(?DateTimeInterface $endDate = null): self
    {
        if ($endDate instanceof DateTime) {
            $this->endDate = DateTimeImmutable::createFromMutable($endDate);
@@ -189,19 +150,21 @@ abstract class AbstractElement
        return $this;
    }

-    public function setPerson(Person $person)
+    public function setHousehold(Household $household): self
+    {
+        $this->household = $household;
+
+        return $this;
+    }
+
+    public function setPerson(Person $person): self
    {
        $this->person = $person;

        return $this;
    }

-    /**
-     * Set startDate.
-     *
-     * @return AbstractElement
-     */
-    public function setStartDate(DateTimeInterface $startDate)
+    public function setStartDate(DateTimeInterface $startDate): self
    {
        if ($startDate instanceof DateTime) {
            $this->startDate = DateTimeImmutable::createFromMutable($startDate);
@@ -214,14 +177,7 @@ abstract class AbstractElement
        return $this;
    }

-    /**
-     * Set type.
-     *
-     * @param string $type
-     *
-     * @return AbstractElement
-     */
-    public function setType($type)
+    public function setType(string $type): self
    {
        $this->type = $type;

--- a/src/Bundle/ChillBudgetBundle/Entity/Charge.php
+++ b/src/Bundle/ChillBudgetBundle/Entity/Charge.php
@@ -9,8 +9,9 @@

 declare(strict_types=1);

-namespace Chill\AMLI\BudgetBundle\Entity;
+namespace Chill\BudgetBundle\Entity;

+use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Entity\HasCenterInterface;
 use DateTimeImmutable;
 use Doctrine\ORM\Mapping as ORM;
@@ -19,7 +20,7 @@ use Doctrine\ORM\Mapping as ORM;
 * Charge.
 *
 * @ORM\Table(name="chill_budget.charge")
- * @ORM\Entity(repositoryClass="Chill\AMLI\BudgetBundle\Repository\ChargeRepository")
+ * @ORM\Entity(repositoryClass="Chill\BudgetBundle\Repository\ChargeRepository")
 */
 class Charge extends AbstractElement implements HasCenterInterface
 {
@@ -58,7 +59,7 @@ class Charge extends AbstractElement implements HasCenterInterface
        $this->setStartDate(new DateTimeImmutable('today'));
    }

-    public function getCenter(): \Chill\MainBundle\Entity\Center
+    public function getCenter(): ?Center
    {
        return $this->getPerson()->getCenter();
    }
--- a/src/Bundle/ChillBudgetBundle/Entity/Resource.php
+++ b/src/Bundle/ChillBudgetBundle/Entity/Resource.php
@@ -9,8 +9,9 @@

 declare(strict_types=1);

-namespace Chill\AMLI\BudgetBundle\Entity;
+namespace Chill\BudgetBundle\Entity;

+use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Entity\HasCenterInterface;
 use DateTimeImmutable;
 use Doctrine\ORM\Mapping as ORM;
@@ -19,7 +20,7 @@ use Doctrine\ORM\Mapping as ORM;
 * Resource.
 *
 * @ORM\Table(name="chill_budget.resource")
- * @ORM\Entity(repositoryClass="Chill\AMLI\BudgetBundle\Repository\ResourceRepository")
+ * @ORM\Entity(repositoryClass="Chill\BudgetBundle\Repository\ResourceRepository")
 */
 class Resource extends AbstractElement implements HasCenterInterface
 {
@@ -37,7 +38,7 @@ class Resource extends AbstractElement implements HasCenterInterface
        $this->setStartDate(new DateTimeImmutable('today'));
    }

-    public function getCenter(): \Chill\MainBundle\Entity\Center
+    public function getCenter(): ?Center
    {
        return $this->getPerson()->getCenter();
    }
--- a/src/Bundle/ChillBudgetBundle/Form/ChargeType.php
+++ b/src/Bundle/ChillBudgetBundle/Form/ChargeType.php
@@ -9,10 +9,10 @@

 declare(strict_types=1);

-namespace Chill\AMLI\BudgetBundle\Form;
+namespace Chill\BudgetBundle\Form;

-use Chill\AMLI\BudgetBundle\Config\ConfigRepository;
-use Chill\AMLI\BudgetBundle\Entity\Charge;
+use Chill\BudgetBundle\Config\ConfigRepository;
+use Chill\BudgetBundle\Entity\Charge;
 use Chill\MainBundle\Form\Type\ChillDateType;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use Symfony\Component\Form\AbstractType;
@@ -45,6 +45,7 @@ class ChargeType extends AbstractType
            ->add('type', ChoiceType::class, [
                'choices' => $this->getTypes(),
                'placeholder' => 'Choose a charge type',
+                'attr' => ['class' => ' select2 '],
            ])
            ->add('amount', MoneyType::class)
            ->add('comment', TextareaType::class, [
@@ -96,7 +97,7 @@ class ChargeType extends AbstractType

    public function getBlockPrefix()
    {
-        return 'chill_amli_budgetbundle_charge';
+        return 'chill_budgetbundle_charge';
    }

    private function getTypes()
--- a/src/Bundle/ChillBudgetBundle/Form/ResourceType.php
+++ b/src/Bundle/ChillBudgetBundle/Form/ResourceType.php
@@ -9,10 +9,10 @@

 declare(strict_types=1);

-namespace Chill\AMLI\BudgetBundle\Form;
+namespace Chill\BudgetBundle\Form;

-use Chill\AMLI\BudgetBundle\Config\ConfigRepository;
-use Chill\AMLI\BudgetBundle\Entity\Resource;
+use Chill\BudgetBundle\Config\ConfigRepository;
+use Chill\BudgetBundle\Entity\Resource;
 use Chill\MainBundle\Form\Type\ChillDateType;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use Symfony\Component\Form\AbstractType;
@@ -45,6 +45,7 @@ class ResourceType extends AbstractType
                'choices' => $this->getTypes(),
                'placeholder' => 'Choose a resource type',
                'label' => 'Resource element type',
+                'attr' => ['class' => ' select2 '],
            ])
            ->add('amount', MoneyType::class)
            ->add('comment', TextareaType::class, [
@@ -80,7 +81,7 @@ class ResourceType extends AbstractType

    public function getBlockPrefix()
    {
-        return 'chill_amli_budgetbundle_resource';
+        return 'chill_budgetbundle_resource';
    }

    private function getTypes()
--- a/src/Bundle/ChillBudgetBundle/Menu/HouseholdMenuBuilder.php
+++ b/src/Bundle/ChillBudgetBundle/Menu/HouseholdMenuBuilder.php
@@ -0,0 +1,53 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\BudgetBundle\Menu;
+
+use Chill\BudgetBundle\Security\Authorization\BudgetElementVoter;
+use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
+use Knp\Menu\MenuItem;
+use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
+
+class HouseholdMenuBuilder implements LocalMenuBuilderInterface
+{
+    protected AuthorizationCheckerInterface $authorizationChecker;
+
+    protected TranslatorInterface $translator;
+
+    public function __construct(
+        AuthorizationCheckerInterface $authorizationChecker,
+        TranslatorInterface $translator
+    ) {
+        $this->authorizationChecker = $authorizationChecker;
+        $this->translator = $translator;
+    }
+
+    public function buildMenu($menuId, MenuItem $menu, array $parameters)
+    {
+        /** @var Household $household */
+        $household = $parameters['household'];
+
+        // if ($this->authorizationChecker->isGranted(BudgetElementVoter::SHOW, $household)) {
+        $menu->addChild($this->translator->trans('household.Budget'), [
+            'route' => 'chill_budget_elements_household_index',
+            'routeParameters' => [
+                'id' => $household->getId(),
+            ], ])
+            ->setExtras(['order' => 19]);
+        // }
+    }
+
+    public static function getMenuIds(): array
+    {
+        return ['household'];
+    }
+}
--- a/src/Bundle/ChillBudgetBundle/Menu/PersonMenuBuilder.php
+++ b/src/Bundle/ChillBudgetBundle/Menu/PersonMenuBuilder.php
@@ -9,25 +9,19 @@

 declare(strict_types=1);

-namespace Chill\AMLI\BudgetBundle\Menu;
+namespace Chill\BudgetBundle\Menu;

-use Chill\AMLI\BudgetBundle\Security\Authorization\BudgetElementVoter;
+use Chill\BudgetBundle\Security\Authorization\BudgetElementVoter;
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
 use Knp\Menu\MenuItem;
 use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
-use Symfony\Component\Translation\TranslatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;

-class UserMenuBuilder implements LocalMenuBuilderInterface
+class PersonMenuBuilder implements LocalMenuBuilderInterface
 {
-    /**
-     * @var AuthorizationCheckerInterface
-     */
-    protected $authorizationChecker;
+    protected AuthorizationCheckerInterface $authorizationChecker;

-    /**
-     * @var TranslatorInterface
-     */
-    protected $translator;
+    protected TranslatorInterface $translator;

    public function __construct(
        AuthorizationCheckerInterface $authorizationChecker,
@@ -39,10 +33,10 @@ class UserMenuBuilder implements LocalMenuBuilderInterface

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

-        if ($this->authorizationChecker->isGranted(BudgetElementVoter::SHOW, $person)) {
+        if ($this->authorizationChecker->isGranted(BudgetElementVoter::SEE, $person)) {
            $menu->addChild(
                $this->translator->trans('Budget'),
                [
@@ -50,7 +44,7 @@ class UserMenuBuilder implements LocalMenuBuilderInterface
                    'routeParameters' => ['id' => $person->getId()],
                ]
            )
-                ->setExtra('order', 460);
+                ->setExtra('order', 59);
        }
    }

--- a/src/Bundle/ChillBudgetBundle/Repository/ChargeRepository.php
+++ b/src/Bundle/ChillBudgetBundle/Repository/ChargeRepository.php
@@ -9,10 +9,11 @@

 declare(strict_types=1);

-namespace Chill\AMLI\BudgetBundle\Repository;
+namespace Chill\BudgetBundle\Repository;

 use Chill\PersonBundle\Entity\Person;
 use DateTime;
+use Doctrine\ORM\EntityRepository;

 /**
 * ChargeRepository.
@@ -20,13 +21,15 @@ use DateTime;
 * This class was generated by the Doctrine ORM. Add your own custom
 * repository methods below.
 */
-class ChargeRepository extends \Doctrine\ORM\EntityRepository
+class ChargeRepository extends EntityRepository
 {
-    public function findByPersonAndDate(Person $person, DateTime $date, $sort = null)
+    public function findByEntityAndDate($entity, DateTime $date, $sort = null)
    {
        $qb = $this->createQueryBuilder('c');

-        $qb->where('c.person = :person')
+        $entityStr = $entity instanceof Person ? 'person' : 'household';
+
+        $qb->where("c.{$entityStr} = :{$entityStr}")
            ->andWhere('c.startDate < :date')
            ->andWhere('c.startDate < :date OR c.startDate IS NULL');

@@ -35,7 +38,7 @@ class ChargeRepository extends \Doctrine\ORM\EntityRepository
        }

        $qb->setParameters([
-            'person' => $person,
+            $entityStr => $entity,
            'date' => $date,
        ]);

--- a/src/Bundle/ChillBudgetBundle/Repository/ResourceRepository.php
+++ b/src/Bundle/ChillBudgetBundle/Repository/ResourceRepository.php
@@ -9,10 +9,11 @@

 declare(strict_types=1);

-namespace Chill\AMLI\BudgetBundle\Repository;
+namespace Chill\BudgetBundle\Repository;

 use Chill\PersonBundle\Entity\Person;
 use DateTime;
+use Doctrine\ORM\EntityRepository;

 /**
 * ResourceRepository.
@@ -20,23 +21,28 @@ use DateTime;
 * This class was generated by the Doctrine ORM. Add your own custom
 * repository methods below.
 */
-class ResourceRepository extends \Doctrine\ORM\EntityRepository
+class ResourceRepository extends EntityRepository
 {
-    public function findByPersonAndDate(Person $person, DateTime $date, $sort = null)
+    public function findByEntityAndDate($entity, DateTime $date, $sort = null)
    {
        $qb = $this->createQueryBuilder('c');

-        $qb->where('c.person = :person')
-            ->andWhere('c.startDate < :date')
-            ->andWhere('c.startDate < :date OR c.startDate IS NULL');
+        $entityStr = $entity instanceof Person ? 'person' : 'household';
+
+        $qb->where("c.{$entityStr} = :{$entityStr}")
+            // TODO: in controller, the budget and charges asked are also for future and actual
+            //->andWhere('c.startDate < :date')
+            // TODO: there is a misconception here, the end date must be lower or null. startDate are never null
+            //->andWhere('c.startDate < :date OR c.startDate IS NULL');
+;

        if (null !== $sort) {
            $qb->orderBy($sort);
        }

        $qb->setParameters([
-            'person' => $person,
-            'date' => $date,
+            $entityStr => $entity,
+            //'date' => $date,
        ]);

        return $qb->getQuery()->getResult();
--- a/src/Bundle/ChillBudgetBundle/Resources/public/page/chillbudget.scss
+++ b/src/Bundle/ChillBudgetBundle/Resources/public/page/chillbudget.scss
@@ -0,0 +1,61 @@
+.subtitle {
+    margin-top: 1rem;
+    margin-bottom: 1rem;
+    padding: 1rem;
+}
+.family-title {
+    margin-bottom: 1rem !important;
+}
+.budget-table th {
+    th {
+        color: white;
+    }
+}
+.budget-table {
+    th.charge {
+        background-color: #e03851d7;
+    }
+}
+.budget-table {
+    th.resource {
+        background-color: #6d9e63d8;
+    }
+}
+.budget-table {
+    th, td {
+        padding: 10px;
+        text-align: right;
+    }
+    td.column-wide {
+        width: 20%;
+    }
+    td.column-small {
+        width: 15%;
+        &.right {
+            align-items: right;
+        }
+    }
+}
+
+.btn-budget {
+    margin-right: 1rem !important;
+}
+
+.el-type {
+    font-weight: 600;
+    text-align: left !important;
+}
+
+.total {
+    margin-top: 1rem;
+    border-top: 1px dashed black;
+}
+
+.accordion-item {
+    margin-bottom: 1rem;
+}
+
+button[aria-expanded="true"] > span.folded,
+button[aria-expanded="false"] > span.unfolded { display: none; }
+button[aria-expanded="false"] > span.folded,
+button[aria-expanded="true"] > span.unfolded { display: inline; }
--- a/src/Bundle/ChillBudgetBundle/Resources/public/page/index.js
+++ b/src/Bundle/ChillBudgetBundle/Resources/public/page/index.js
@@ -0,0 +1 @@
+require('./chillbudget.scss');
--- a/src/Bundle/ChillBudgetBundle/Resources/views/Budget/_budget.html.twig
+++ b/src/Bundle/ChillBudgetBundle/Resources/views/Budget/_budget.html.twig
@@ -0,0 +1,74 @@
+{% set entity = person is defined ? person :  household %}
+
+{% set actualResources = [] %}
+{% set futureResources = [] %}
+{% set pastResources   = [] %}
+
+{% for r in resources %}
+    {% if r.startDate|date('U') <= 'now'|date('U') %}
+        {% if r.endDate is null or r.endDate|date('U') >= 'now'|date('U') %}
+            {% set actualResources = actualResources|merge([ r ]) %}
+        {% else %}
+            {% set pastResources = pastResources|merge([ r ]) %}
+        {% endif %}
+    {% else %}
+        {% set futureResources = futureResources|merge([ r ]) %}
+    {% endif %}
+{% endfor %}
+
+{% set actualCharges = [] %}
+{% set futureCharges = [] %}
+{% set pastCharges   = [] %}
+
+{% for c in charges %}
+    {% if c.startDate|date('U') <= 'now'|date('U') %}
+        {% if c.endDate is null or c.endDate|date('U') >= 'now'|date('U') %}
+            {% set actualCharges = actualCharges|merge([ c ]) %}
+        {% else %}
+            {% set pastCharges = pastCharges|merge([ c ]) %}
+        {% endif %}
+    {% else %}
+        {% set futureCharges = futureCharges|merge([ c ]) %}
+    {% endif %}
+{% endfor %}
+
+
+<h3 class="subtitle">{{ 'Actual budget'|trans }}</h3>
+
+{% if actualCharges|length > 0 or actualResources|length > 0 %}
+    {% include 'ChillBudgetBundle:Budget:_current_budget.html.twig' with {
+        'actualResources': actualResources,
+        'actualCharges': actualCharges,
+        'results': results,
+        'entity': entity
+    } %}
+{% else %}
+    <div class="flex-table">
+        <div class="item-bloc">
+            <p><span class="chill-no-data-statement">{{ "There isn't any element recorded"|trans }}</span></p>
+        </div>
+    </div>
+{% endif %}
+
+{% if pastCharges|length > 0 or pastResources|length > 0 %}
+    <h2 class="subtitle">{{ 'Past budget'|trans }}</h2>
+
+    {% include 'ChillBudgetBundle:Budget:_past_budget.html.twig' with {
+        'pastCharges': pastCharges,
+        'pastResources': pastResources,
+        'entity': entity
+    } %}
+{% endif %}
+
+{% if futureCharges|length > 0 or futureResources|length > 0 %}
+    <h2 class="subtitle">{{ 'Future budget'|trans }}</h2>
+
+    {% include 'ChillBudgetBundle:Budget:_future_budget.html.twig' with {
+        'futureResources': futureResources,
+        'futureCharges': futureCharges,
+        'entity': entity
+    } %}
+{% endif %}
+
+
+
--- a/src/Bundle/ChillBudgetBundle/Resources/views/Budget/_current_budget.html.twig
+++ b/src/Bundle/ChillBudgetBundle/Resources/views/Budget/_current_budget.html.twig
@@ -0,0 +1,30 @@
+{% from 'ChillBudgetBundle:Budget:_macros.html.twig' import table_elements, table_results %}
+
+{# <h2 class="subtitle">{{ 'Actual budget'|trans }}</h2> #}
+
+<div class="flex-table">
+    <h4 class="family-title">{{ 'Actual resources'|trans }}</h4>
+
+    {% if actualResources|length > 0 %}
+    <div class="item-bloc">
+        {{ table_elements(actualResources, 'resource') }}
+    </div>
+    {% else %}
+    <div class="item-bloc">
+        <span class="chill-no-data-statement">{{ 'No resources registered'|trans }}</span>
+    </div>
+    {% endif %}
+</div>
+
+<div class="flex-table">
+    <h4 class="family-title">{{ 'Actual charges'|trans }}</h4>
+    {% if actualCharges|length > 0 %}
+    <div class="item-bloc">
+        {{ table_elements(actualCharges, 'charge') }}
+    </div>
+    {% else %}
+    <div class="item-bloc">
+        <span class="chill-no-data-statement">{{ 'No charges registered'|trans }}</span>
+    </div>
+    {% endif %}
+</div>
--- a/src/Bundle/ChillBudgetBundle/Resources/views/Budget/_future_budget.html.twig
+++ b/src/Bundle/ChillBudgetBundle/Resources/views/Budget/_future_budget.html.twig
@@ -0,0 +1,51 @@
+{% from 'ChillBudgetBundle:Budget:_macros.html.twig' import table_elements, table_results %}
+
+<div class="accordion" id="future_{{ entity.id }}">
+    <div class="accordion-item">
+        <h2 class="accordion-header" id="heading_future_{{ entity.id }}">
+            <button
+                class="accordion-button collapsed"
+                type="button"
+                data-bs-toggle="collapse"
+                data-bs-target="#collapse_future_{{ entity.id }}"
+                aria-expanded="false"
+                aria-controls="collapse_future_{{ entity.id }}">
+                <span class="folded">{{ 'Show future budget'|trans }}</span>
+                <span class="unfolded text-secondary">{{ 'Hide budget'|trans }}</span>
+            </button>
+        </h2>
+
+        <div id="collapse_future_{{ entity.id }}"
+            class="accordion-collapse collapse"
+            aria-labelledby="heading_future_{{ entity.id }}"
+            data-bs-parent="#future_{{ entity.id }}">
+
+            <div class="flex-table">
+                <h3 class="family-title">{{ 'Future resources'|trans }}</h3>
+
+                {% if futureResources|length > 0 %}
+                    <div class="item-bloc">
+                        {{ table_elements(futureResources, 'resource') }}
+                    </div>
+                {% else %}
+                    <div class="item-bloc">
+                        <span class="chill-no-data-statement">{{ 'No future resources registered'|trans }}</span>
+                    </div>
+                {% endif %}
+            </div>
+            <div class="flex-table">
+                <h3 class="family-title">{{ 'Future charges'|trans }}</h3>
+
+                {% if futureCharges|length > 0 %}
+                    <div class="item-bloc">
+                        {{ table_elements(futureCharges, 'charge') }}
+                    </div>
+                {% else %}
+                    <div class="item-bloc">
+                        <span class="chill-no-data-statement">{{ 'No future charges registered'|trans }}</span>
+                    </div>
+                {% endif %}
+            </div>
+        </div>
+    </div>
+</div>
--- a/src/Bundle/ChillBudgetBundle/Resources/views/Budget/_macros.html.twig
+++ b/src/Bundle/ChillBudgetBundle/Resources/views/Budget/_macros.html.twig
@@ -0,0 +1,97 @@
+{% macro table_elements(elements, family) %}
+<table class="budget-table">
+    <thead>
+        <tr>
+            <th class="{{ family }} el-type">{{ 'Budget element type'|trans }}</th>
+            <th class="{{ family }}">{{ 'Amount'|trans }}</th>
+            <th class="{{ family }}">{{ 'Validity period'|trans }}</th>
+            <th class="{{ family }}">&nbsp;</th>
+        </tr>
+    </thead>
+    <tbody>
+        {% set total = 0 %}
+        {% for f in elements %}
+        {% set total = total + f.amount %}
+        <tr>
+            <td class="column-wide el-type">
+                <span class="badge-title">
+                    <span class="title_label title_label_{{ family }}"></span>
+                    <span class="title_action">{{ f.type|budget_element_type_display(family) }}<span>
+                </span>
+            </td>
+            <td class="column-small">{{ f.amount|format_currency('EUR') }}</td>
+            <td class="column-wide">
+                {% if f.endDate is not null %}
+                    {{ f.startDate|format_date('short') ~ ' - ' ~ f.endDate|format_date('short') }}
+                {% else %}
+                    {{ f.startDate|format_date('short') ~ ' - ...' }}
+                {% endif %}
+            </td>
+            <td class="column-small">
+                <ul class="record_actions">
+                    {% if is_granted('CHILL_BUDGET_ELEMENT_SEE', f) %}
+                        <li>
+                            <a href="{{ path('chill_budget_' ~ family ~ '_view', { 'id': f.id } ) }}" class="btn btn-sm btn-show"></a>
+                        </li>
+                    {% endif %}
+                    {% if is_granted('CHILL_BUDGET_ELEMENT_UPDATE', f) %}
+                        <li>
+                            <a href="{{ path('chill_budget_' ~ family ~'_edit', { 'id': f.id } ) }}" class="btn btn-sm btn-edit"></a>
+                        </li>
+                    {% endif %}
+                    {% if is_granted('CHILL_BUDGET_ELEMENT_DELETE', f) %}
+                        <li>
+                            <a href="{{ path('chill_budget_' ~ family ~ '_delete', { 'id': f.id } ) }}" class="btn btn-sm btn-delete"></a>
+                        </li>
+                    {% endif %}
+                </ul>
+            </td>
+        </tr>
+        {% endfor %}
+        <tr class="total">
+            <td class="el-type">
+                {{ 'Total'|trans }}
+            </td>
+            <td>
+                {{ total|format_currency('EUR') }}
+            </td>
+            <td>&nbsp;</td>
+            <td>&nbsp;</td>
+        </tr>
+    </tbody>
+</table>
+{% endmacro %}
+
+{% macro table_results(actualCharges, actualResources) %}
+
+{% set totalCharges = 0 %}
+{% for c in actualCharges %}
+    {% set totalCharges = totalCharges + c.amount %}
+{% endfor %}
+
+{% set totalResources = 0 %}
+{% for r in actualResources %}
+    {% set totalResources = totalResources + r.amount %}
+{% endfor %}
+
+{% set result = (totalResources - totalCharges) %}
+
+<table>
+    <thead>
+        <tr>
+            <th>&nbsp;</th>
+            <th>&nbsp;</th>
+            <th>{{ 'Budget calculator result'|trans }}</th>
+        </tr>
+    </thead>
+    <tbody>
+        <tr>
+            <td>{{ 'The balance'|trans }}</td>
+            <td>&nbsp;</td>
+            <td>
+                {{ result|format_currency('EUR') }}
+            </td>
+        </tr>
+    </tbody>
+</table>
+{% endmacro %}
--- a/src/Bundle/ChillBudgetBundle/Resources/views/Budget/_past_budget.html.twig
+++ b/src/Bundle/ChillBudgetBundle/Resources/views/Budget/_past_budget.html.twig
@@ -0,0 +1,53 @@
+{% from 'ChillBudgetBundle:Budget:_macros.html.twig' import table_elements, table_results %}
+
+<div class="accordion" id="past_{{ entity.id }}">
+    <div class="accordion-item">
+        <h2 class="accordion-header" id="heading_past_{{ entity.id }}">
+            <button
+                class="accordion-button collapsed"
+                type="button"
+                data-bs-toggle="collapse"
+                data-bs-target="#collapse_past_{{ entity.id }}"
+                aria-expanded="false"
+                aria-controls="collapse_past_{{ entity.id }}">
+                <span class="folded">{{ 'Show past budget'|trans }}</span>
+                <span class="unfolded text-secondary">{{ 'Hide budget'|trans }}</span>
+            </button>
+        </h2>
+
+        <div id="collapse_past_{{ entity.id }}"
+            class="accordion-collapse collapse"
+            aria-labelledby="heading_past_{{ entity.id }}"
+            data-bs-parent="#past_{{ entity.id }}">
+
+            <div class="flex-table">
+                <h3 class="family-title">{{ 'Past resources'|trans }}</h3>
+
+                {% if pastResources|length > 0 %}
+                    <div class="item-bloc">
+                        {{ table_elements(pastResources, 'resource') }}
+                    </div>
+                {% else %}
+                    <div class="item-bloc">
+                        <span class="chill-no-data-statement">{{ 'No past resources registered'|trans }}</span>
+                    </div>
+                {% endif %}
+            </div>
+
+            <div class="flex-table">
+                <h3 class="family-title">{{ 'Past charges'|trans }}</h3>
+
+                {% if pastCharges|length > 0 %}
+                    <div class="item-bloc">
+                        {{ table_elements(pastCharges, 'charge') }}
+                    </div>
+                {% else %}
+                    <div class="item-bloc">
+                        <span class="chill-no-data-statement">{{ 'No past charges registered'|trans }}</span>
+                    </div>
+                {% endif %}
+            </div>
+        </div>
+
+    </div>
+</div>
--- a/src/Bundle/ChillBudgetBundle/Resources/views/Charge/confirm_delete.html.twig
+++ b/src/Bundle/ChillBudgetBundle/Resources/views/Charge/confirm_delete.html.twig
@@ -1,18 +1,29 @@
-{% extends "@ChillPerson/Person/layout.html.twig"  %}
+{% if element.person is not null %}
+    {% set template = '@ChillPerson/Person/layout.html.twig' %}
+    {% set indexPage = 'chill_budget_elements_index' %}
+    {% set activeRouteKey = '' %}
+    {% set person = element.person %}
+    {% set confirm_question = 'Are you sure you want to remove the charge "%type%" associated to "%name%" ?'|trans({ '%name%' : person.firstname ~ ' ' ~ person.lastname, '%type%': element.type|budget_element_type_display('charge') } ) %}
+{% else %}
+    {% set template = '@ChillPerson/Household/layout.html.twig' %}
+    {% set indexPage = 'chill_budget_elements_household_index' %}
+    {% set activeRouteKey = '' %}
+    {% set household = element.household %}
+    {% set confirm_question = 'Are you sure you want to remove the charge "%type%" associated to household "%household%" ?'|trans({ '%household%' : household.id, '%type%': element.type|budget_element_type_display('charge') } ) %}
+{% endif %}

-{% set activeRouteKey = '' %}
-{% set person = element.person %}
+{% extends template %}

-{% block title  'Remove resource'|trans %}
+{% block title  'Remove charge'|trans %}

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

 {{ include('ChillMainBundle:Util:confirmation_template.html.twig',
    {
        'title'             : 'Remove charge'|trans,
-        'confirm_question'  : 'Are you sure you want to remove the charge "%type%" associated to "%name%" ?'|trans({ '%name%' : person.firstname ~ ' ' ~ person.lastname, '%type%': element.type|budget_element_type_display('charge') } ),
-        'cancel_route'      : 'chill_budget_elements_index',
-        'cancel_parameters' : { 'id' : element.person.id },
+        'confirm_question'  : confirm_question,
+        'cancel_route'      : indexPage,
+        'cancel_parameters' : { 'id': person is defined ? person.id : household.id },
        'form'              : delete_form
    } ) }}

--- a/src/Bundle/ChillBudgetBundle/Resources/views/Charge/edit.html.twig
+++ b/src/Bundle/ChillBudgetBundle/Resources/views/Charge/edit.html.twig
@@ -1,31 +1,43 @@
-{% extends "@ChillPerson/Person/layout.html.twig" %}
+{% if element.person is not null %}
+    {% set template = '@ChillPerson/Person/layout.html.twig' %}
+    {% set indexPage = 'chill_budget_elements_index' %}
+    {% set activeRouteKey = '' %}
+    {% set person = element.person %}
+{% else %}
+    {% set template = '@ChillPerson/Household/layout.html.twig' %}
+    {% set indexPage = 'chill_budget_elements_household_index' %}
+    {% set activeRouteKey = '' %}
+    {% set household = element.household %}
+{% endif %}
+
+{% set title = 'Edit charge'|trans %}
+
+{% extends template %}

-{% set activeRouteKey = '' %}
-{% set title = 'Edit Charge for %name%'|trans({ '%name%' : person.firstName ~ " " ~ person.lastName } ) %}
 {% block title title %}

-{% block personcontent %}
+{% block content %}
 <h1>{{ title }}</h1>

 {{ form_start(form) }}

 {{ form_row(form.type) }}
 {{ form_row(form.amount) }}
-{{ form_row(form.help) }} 
+{{ form_row(form.help) }}
 {{ form_row(form.comment) }}
 {{ form_row(form.startDate) }}
 {{ form_row(form.endDate) }}

 <ul class="record_actions sticky-form-buttons">
    <li class="cancel">
-        <a href="{{ path("chill_budget_elements_index", { 'id': person.id } ) }}" class="btn btn-cancel">
-           {{ 'Back to the list'|trans }}
+        <a href="{{ path(indexPage, { 'id': person is defined ? person.id : household.id } ) }}" class="btn btn-cancel">
+            {{ 'Back to the list'|trans }}
        </a>
    </li>
    <li>
-        {{ form_widget(form.submit, { 'attr' : { 'class': 'btn btn-create' }, 'label': 'Edit' } ) }}
+        {{ form_widget(form.submit, { 'attr' : { 'class': 'btn btn-edit' }, 'label': 'Edit' } ) }}
    </li>
 </ul>
-       
+
 {{ form_end(form) }}
 {% endblock %}
--- a/src/Bundle/ChillBudgetBundle/Resources/views/Charge/new.html.twig
+++ b/src/Bundle/ChillBudgetBundle/Resources/views/Charge/new.html.twig
@@ -1,31 +1,42 @@
-{% extends "@ChillPerson/Person/layout.html.twig" %}
+{% if element.person is not null %}
+    {% set template = '@ChillPerson/Person/layout.html.twig' %}
+    {% set indexPage = 'chill_budget_elements_index' %}
+    {% set activeRouteKey = '' %}
+    {% set person = element.person %}
+{% else %}
+    {% set template = '@ChillPerson/Household/layout.html.twig' %}
+    {% set indexPage = 'chill_budget_elements_household_index' %}
+    {% set activeRouteKey = '' %}
+    {% set household = element.household %}
+{% endif %}

-{% set activeRouteKey = '' %}
-{% set title = 'New Charge for %name%'|trans({ '%name%' : person.firstName ~ " " ~ person.lastName } ) %}
+{% set title = 'New charge'|trans %}
+
+{% extends template %}
 {% block title title %}

-{% block personcontent %}
+{% block content %}
 <h1>{{ title }}</h1>

 {{ form_start(form) }}

 {{ form_row(form.type) }}
 {{ form_row(form.amount) }}
-{{ form_row(form.help) }} 
+{{ form_row(form.help) }}
 {{ form_row(form.comment) }}
 {{ form_row(form.startDate) }}
 {{ form_row(form.endDate) }}

 <ul class="record_actions sticky-form-buttons">
    <li class="cancel">
-        <a href="{{ path("chill_budget_elements_index", { 'id': person.id } ) }}" class="btn btn-cancel">
-           {{ 'Back to the list'|trans }}
+        <a href="{{ path(indexPage, { 'id': person is defined ? person.id : household.id } ) }}" class="btn btn-cancel">
+            {{ 'Back to the list'|trans }}
        </a>
    </li>
    <li>
        {{ form_widget(form.submit, { 'attr' : { 'class': 'btn btn-create' }, 'label': 'Create' } ) }}
    </li>
 </ul>
-       
+
 {{ form_end(form) }}
 {% endblock %}
--- a/src/Bundle/ChillBudgetBundle/Resources/views/Charge/view.html.twig
+++ b/src/Bundle/ChillBudgetBundle/Resources/views/Charge/view.html.twig
@@ -1,49 +1,68 @@
-{% extends "@ChillPerson/Person/layout.html.twig" %}
+{% if element.person is not null %}
+    {% set template = '@ChillPerson/Person/layout.html.twig' %}
+    {% set indexPage = 'chill_budget_elements_index' %}
+    {% set activeRouteKey = '' %}
+    {% set person = element.person %}
+{% else %}
+    {% set template = '@ChillPerson/Household/layout.html.twig' %}
+    {% set indexPage = 'chill_budget_elements_household_index' %}
+    {% set activeRouteKey = '' %}
+    {% set household = element.household %}
+{% endif %}

-{% set activeRouteKey = '' %}
-{% set person = element.person %}
-{% set title = 'Charge for %name%'|trans({ '%name%' : person.firstName ~ " " ~ person.lastName } ) %}
+{% set title = 'Charge' %}
+
+{% extends template %}

 {% block title title %}

-{% block personcontent %}
-<h1>{{ title }}</h1>
+{% block content %}
+<div class="budget-show">
+    <h1>{{ title }}</h1>

-<dl class="chill_view_data">
-    <dt>{{ 'Type'|trans }}</dt>
-    <dd>{{ element.type|budget_element_type_display('charge') }}</dd>
-
-    <dt>{{ 'Amount'|trans }}</dt>
-    <dd>{{ element.amount|localizedcurrency('EUR') }}</dd>
-
-    <dt>{{ 'Validity period'|trans }}</dt>
-    <dd>
-        {% if element.endDate is not null %}
-            {{ 'Valid since %startDate% until %endDate%'|trans( { '%startDate%': element.startDate|localizeddate('long', 'none'), '%endDate%': familyMember.endDate|localizeddate('long', 'none') } ) }}
-        {% else %}
-            {{ 'Valid since %startDate%'|trans( { '%startDate%': element.startDate|localizeddate('long', 'none') } ) }}
-        {% endif %}
-    </dd>
-
-    <dt>{{ 'Comment'|trans }}</dt>
-    <dd>
-        {%- if element.comment is not empty -%}
-        <blockquote class="chill-user-quote">
-            {{ element.comment }}
-        </blockquote>
-        {%- else -%}
-        <span class="chill-no-data-statement">{{ 'Not given'|trans }}</span>
-        {%- endif -%}
-    </dd>
-</dl>
+    <div class="flex-table">
+        <div class="item-bloc">
+            <div class="item-row">
+                <h2 class="badge-title">
+                    <span class="title_label title_label_charge"></span>
+                    <span class="title_action">{{ element.type|budget_element_type_display('charge') }}</span>
+                </h2>
+            </div>
+            <div class="item-row separator">
+                <dl class="chill_view_data">
+                    <dt>{{ 'Amount'|trans }}</dt>
+                    <dd>{{ element.amount|format_currency('EUR') }}</dd>
+                    <dt>{{ 'Validity period'|trans }}</dt>
+                    <dd>
+                        {% if element.endDate is not null %}
+                            {{ 'Valid since %startDate% until %endDate%'|trans( { '%startDate%': element.startDate|format_date('long'), '%endDate%': element.endDate|format_date('long') } ) }}
+                        {% else %}
+                            {{ 'Valid since %startDate%'|trans( { '%startDate%': element.startDate|format_date('long') } ) }}
+                        {% endif %}
+                    </dd>
+                    <dt>{{ 'Comment'|trans }}</dt>
+                    <dd>
+                        {%- if element.comment is not empty -%}
+                        <blockquote class="chill-user-quote">
+                            {{ element.comment }}
+                        </blockquote>
+                        {%- else -%}
+                        <span class="chill-no-data-statement">{{ 'Not given'|trans }}</span>
+                        {%- endif -%}
+                    </dd>
+                </dl>
+            </div>
+        </div>
+    </div>
+</div>

 <ul class="record_actions sticky-form-buttons">
    <li class="cancel">
-        <a href="{{ path("chill_budget_elements_index", { 'id': person.id } ) }}" class="btn btn-cancel">
-           {{ 'Back to the list'|trans }}
+        <a href="{{ path(indexPage, { 'id': person is defined ? person.id : household.id } ) }}" class="btn btn-cancel">
+            {{ 'Back to the list'|trans }}
        </a>
    </li>
-    {% if is_granted(constant('Chill\\AMLI\\BudgetBundle\\Security\\Authorization\\BudgetElementVoter::UPDATE'), element) %}
+    {% if is_granted('CHILL_BUDGET_ELEMENT_UPDATE', element) %}
        <li>
            <a href="{{ path('chill_budget_charge_edit', { 'id': element.id } ) }}" class="btn btn-edit">{{ 'Edit'|trans }}</a>
        </li>
--- a/src/Bundle/ChillBudgetBundle/Resources/views/Element/index.html.twig
+++ b/src/Bundle/ChillBudgetBundle/Resources/views/Element/index.html.twig
@@ -1,228 +0,0 @@
-{% extends "@ChillPerson/Person/layout.html.twig" %}
-
-{% set activeRouteKey = '' %}
-{% set title = 'Budget for %name%'|trans({ '%name%' : person.firstName ~ " " ~ person.lastName } ) %}
-{% block title title %}
-    
-    
-{% set actualResources = [] %}
-{% set futureResources = [] %}
-{% set pastResources   = [] %}
-
-{% for r in resources %}
-    {% if r.startDate|date('U') <= 'now'|date('U') %}
-        {% if r.endDate is null or r.endDate|date('U') >= 'now'|date('U') %}
-            {% set actualResources = actualResources|merge([ r ]) %}
-        {% else %}
-            {% set pastResources = pastResources|merge([ r ]) %}
-        {% endif %}
-    {% else %}
-        {% set futureResources = futureResources|merge([ r ]) %}
-    {% endif %}
-{% endfor %}
-
-{% set actualCharges = [] %}
-{% set futureCharges = [] %}
-{% set pastCharges   = [] %}
-
-{% for c in charges %}
-    {% if c.startDate|date('U') <= 'now'|date('U') %}
-        {% if c.endDate is null or c.endDate|date('U') >= 'now'|date('U') %}
-            {% set actualCharges = actualCharges|merge([ c ]) %}
-        {% else %}
-            {% set pastCharges = pastCharges|merge([ c ]) %}
-        {% endif %}
-    {% else %}
-        {% set futureCharges = futureCharges|merge([ c ]) %}
-    {% endif %}
-{% endfor %}
-
-
-{% macro table_elements(elements, family) %}
-<table>
-    <thead>
-        <tr>
-            <th>{{ 'Budget element type'|trans }}</th>
-            <th>{{ 'Amount'|trans }}</th>
-            <th>{{ 'Validity period'|trans }}</th>
-            <th>&nbsp;</th>
-        </tr>
-    </thead>
-    <tbody>
-        {% set total = 0 %}
-        {% for f in elements %}
-        {% set total = total + f.amount %}
-        <tr>
-            <td>
-                {{ f.type|budget_element_type_display(family) }}
-            </td>
-            <td>{{ f.amount|format_currency('EUR') }}</td>
-            <td>
-                {% if f.endDate is not null %}
-                    {{ 'Valid since %startDate% until %endDate%'|trans( { '%startDate%': f.startDate|format_date('long'), '%endDate%': f.endDate|format_date('long') } ) }}
-                {% else %}
-                    {{ 'Valid since %startDate%'|trans( { '%startDate%': f.startDate|format_date('long') } ) }}
-                {% endif %}
-            </td>
-            <td>
-                <ul class="record_actions">
-                    {% if is_granted(constant('Chill\\AMLI\\BudgetBundle\\Security\\Authorization\\BudgetElementVoter::SHOW'), f) %}
-                        <li>
-                            <a href="{{ path('chill_budget_' ~ family ~ '_view', { 'id': f.id } ) }}" class="btn btn-show"></a>
-                        </li>
-                    {% endif %}
-                    {% if is_granted(constant('Chill\\AMLI\\BudgetBundle\\Security\\Authorization\\BudgetElementVoter::UPDATE'), f) %}
-                        <li>
-                            <a href="{{ path('chill_budget_' ~ family ~'_edit', { 'id': f.id } ) }}" class="btn btn-edit"></a>
-                        </li>
-                    {% endif %}
-                    {% if is_granted(constant('Chill\\AMLI\\BudgetBundle\\Security\\Authorization\\BudgetElementVoter::DELETE'), f) %}
-                        <li>
-                            <a href="{{ path('chill_budget_' ~ family ~ '_delete', { 'id': f.id } ) }}" class="btn btn-delete"></a>
-                        </li>
-                    {% endif %}
-                </ul>
-            </td>
-        </tr>
-        {% endfor %}
-        <tr>
-            <td>
-                {{ 'Total'|trans }}
-            </td>
-            <td>
-                {{ total|format_currency('EUR') }}
-            </td>
-            <td>&nbsp;</td>
-            <td>&nbsp;</td>
-        </tr>
-    </tbody>
-</table>
-{% endmacro %}
-
-{% macro table_results(results) %}
-<table>
-    <thead>
-        <tr>
-            <th>&nbsp;</th>
-            <th>{{ 'Budget calculator result'|trans }}</th>
-        </tr>
-    </thead>
-    <tbody>
-    {% for result in results %}
-        <tr>
-            <td>{{ result.label }}</td>
-            <td>
-                {% if result.type == constant('CHILL\\AMLI\\BudgetBundle\\Calculator\\CalculatorResult::TYPE_CURRENCY') %}
-                    {{ result.result|format_currency('EUR') }}
-                {% elseif result.type == constant('CHILL\\AMLI\\BudgetBundle\\Calculator\\CalculatorResult::TYPE_PERCENTAGE') %}
-                    {{ result.result|round(2, 'ceil') ~ '%' }}
-                {% else %}
-                    {{ result.result|round(2, 'common') }}
-                {% endif %}
-            </td>
-        </tr>
-    {% endfor %}
-    </tbody>
-</table>
-{% endmacro %}
-
-{% import _self as m %}
-
-{% block personcontent %}
-<h1>{{ title }}</h1>
-
-<h2>{{ 'Actual budget'|trans }}</h2>
-
-{% if resources|length == 0 and charges|length == 0 %}
-    <p><span class="chill-no-data-statement">{{ "There isn't any element recorded"|trans }}</span></p>
-{% else %}
-    <h3>{{ 'Actual resources'|trans }}</h3>
-        
-    {% if actualResources|length > 0 %}
-        {{ m.table_elements(actualResources, 'resource') }}
-    {% else %}
-        <span class="chill-no-data-statement">{{ 'No resources registered'|trans }}</span>
-    {% endif %}
-    
-    <h3>{{ 'Actual charges'|trans }}</h3>
-    
-    {% if actualCharges|length > 0 %}
-        {{ m.table_elements(actualCharges, 'charge') }}
-    {% else %}
-        <span class="chill-no-data-statement">{{ 'No charges registered'|trans }}</span>
-    {% endif %} 
-    
-    {% if results|length > 0 %}
-        <h2>{{ 'Budget calculator'|trans }}</h2>
-        
-        {{ m.table_results(results) }}
-    {% endif %}
-    
-    {% if is_granted(constant('Chill\\AMLI\\BudgetBundle\\Security\\Authorization\\BudgetElementVoter::CREATE'), person) %}
-    <ul class="record_actions">
-        <li>
-            <a class="btn btn-create" href="{{ path('chill_budget_resource_new', { 'id': person.id} ) }}">{{ 'Create new resource'|trans }}</a>
-        </li>
-        <li>
-            <a class="btn btn-create" href="{{ path('chill_budget_charge_new', { 'id': person.id} ) }}">{{ 'Create new charge'|trans }}</a>
-        </li>
-    </ul>
-    {% endif %}
-
-{% endif %}
-
-{% if pastCharges|length > 0 or pastResources|length > 0 %}
-    <h2>{{ 'Past budget'|trans }}</h2>
-    
-    <h3>{{ 'Past resources'|trans }}</h3>
-        
-    {% if pastResources|length > 0 %}
-        {{ m.table_elements(pastResources, 'resource') }}
-    {% else %}
-        <span class="chill-no-data-statement">{{ 'No past resources registered'|trans }}</span>
-    {% endif %}
-    
-    <h3>{{ 'Past charges'|trans }}</h3>
-    
-    {% if pastCharges|length > 0 %}
-        {{ m.table_elements(pastCharges, 'charge') }}
-    {% else %}
-        <span class="chill-no-data-statement">{{ 'No past charges registered'|trans }}</span>
-    {% endif %} 
-{% endif %}
-
-{% if futureCharges|length > 0 or futureResources|length > 0 %}
-    <h2>{{ 'Future budget'|trans }}</h2>
-    
-    <h3>{{ 'Future resources'|trans }}</h3>
-        
-    {% if futureResources|length > 0 %}
-        {{ m.table_elements(futureResources, 'resource') }}
-    {% else %}
-        <span class="chill-no-data-statement">{{ 'No future resources registered'|trans }}</span>
-    {% endif %}
-    
-    <h3>{{ 'Future charges'|trans }}</h3>
-    
-    {% if futureCharges|length > 0 %}
-        {{ m.table_elements(futureCharges, 'charge') }}
-    {% else %}
-        <span class="chill-no-data-statement">{{ 'No future charges registered'|trans }}</span>
-    {% endif %} 
-{% endif %}
-
-{% if (resources|length + charges|length) == 0 or futureCharges|length > 0 or futureResources|length > 0 or pastCharges|length > 0 or pastResources|length > 0 %}
-    {% if is_granted(constant('Chill\\AMLI\\BudgetBundle\\Security\\Authorization\\BudgetElementVoter::CREATE'), person) %}
-        <ul class="record_actions">
-            <li>
-                <a class="btn btn-create" href="{{ path('chill_budget_resource_new', { 'id': person.id} ) }}">{{ 'Create new resource'|trans }}</a>
-            </li>
-            <li>
-                <a class="btn btn-create" href="{{ path('chill_budget_charge_new', { 'id': person.id} ) }}">{{ 'Create new charge'|trans }}</a>
-            </li>
-        </ul>
-    {% endif %}
-{% endif %}
-
-{% endblock %}
-
--- a/src/Bundle/ChillBudgetBundle/Resources/views/Household/index.html.twig
+++ b/src/Bundle/ChillBudgetBundle/Resources/views/Household/index.html.twig
@@ -0,0 +1,92 @@
+{% extends "@ChillPerson/Household/layout.html.twig" %}
+
+{% from 'ChillBudgetBundle:Budget:_macros.html.twig' import table_elements, table_results %}
+
+{% set activeRouteKey = '' %}
+{% set title = 'Budget for household %household%'|trans({ '%household%' : household.id } ) %}
+{% block title title %}
+
+{% block js %}
+{{ encore_entry_script_tags('page_budget') }}
+{% endblock %}
+
+{% block css %}
+    {{ encore_entry_link_tags('page_budget') }}
+{% endblock %}
+
+{% block content %}
+<h1>{{ title }}</h1>
+
+{% include 'ChillBudgetBundle:Budget:_budget.html.twig' with {
+    'resources': resources,
+    'charges': charges,
+    'household': household
+} %}
+
+    {#
+<div class="flex-table">
+    <h3 class="family-title">{{ 'Budget calculator'|trans }}</h3>
+    <div class="item-bloc">
+        {{ table_results(wholeCharges, wholeResources) }}
+    </div>
+</div>
+#}
+
+{% if household.getCurrentMembers|length > 0 %}
+    <h2 class="subtitle">{{ 'Current budget household members'|trans }}</h2>
+
+    {% for hm in household.getCurrentMembers %}
+        {% set member = hm.person %}
+        <div class="accordion" id="member_{{ member.id }}">
+            <div class="accordion-item">
+                <h2 class="accordion-header" id="heading_{{ member.id }}">
+                    <button
+                        class="accordion-button collapsed"
+                        type="button"
+                        data-bs-toggle="collapse"
+                        data-bs-target="#collapse_{{ member.id }}"
+                        aria-expanded="false"
+                        aria-controls="collapse_{{ member.id }}">
+                        <span class="folded">{{ 'Show budget of %name%'|trans({'%name%': member.firstName ~ " " ~ member.lastName }) }} ({{ 'budget.number of elements'|trans({ 'nb_items': member.getBudgetResources|length + member.getBudgetResources|length }) }})</span>
+                        <span class="unfolded text-secondary">{{ 'Hide budget of %name%'|trans({'%name%': member.firstName ~ " " ~ member.lastName }) }}</span>
+                    </button>
+                </h2>
+
+                <div id="collapse_{{ member.id }}"
+                    class="accordion-collapse collapse"
+                    aria-labelledby="heading_{{ member.id }}"
+                    data-bs-parent="#nonCurrent">
+
+                        {% include 'ChillBudgetBundle:Budget:_budget.html.twig' with {
+                            'resources': member.getBudgetResources,
+                            'charges': member.getBudgetCharges,
+                            'person': member
+                        } %}
+
+                    <ul class="record_actions">
+                        {% if is_granted('CHILL_BUDGET_ELEMENT_SEE', member) %}
+                            <li class="btn-budget">
+                                <a class="btn btn-edit" title={{ 'Edit budget'|trans }} href="{{ path('chill_budget_elements_index', { 'id': member.id } ) }}"></a>
+                            </li>
+                        {% endif %}
+                    </ul>
+                </div>
+            </div>
+        </div>
+    {% endfor %}
+{% endif %}
+
+{% if is_granted('CHILL_BUDGET_ELEMENT_CREATE', household) %}
+    <ul class="record_actions sticky-form-buttons">
+        <li>
+            <a class="btn btn-create" href="{{ path('chill_budget_resource_household_new', { 'id': household.id} ) }}">{{ 'Create new resource'|trans }}</a>
+        </li>
+        <li>
+            <a class="btn btn-create" href="{{ path('chill_budget_charge_household_new', { 'id': household.id} ) }}">{{ 'Create new charge'|trans }}</a>
+        </li>
+    </ul>
+{% endif %}
+
+
+{% endblock %}
+
--- a/src/Bundle/ChillBudgetBundle/Resources/views/Person/index.html.twig
+++ b/src/Bundle/ChillBudgetBundle/Resources/views/Person/index.html.twig
@@ -0,0 +1,46 @@
+{% extends "@ChillPerson/Person/layout.html.twig" %}
+
+{% from 'ChillBudgetBundle:Budget:_macros.html.twig' import table_results %}
+
+{% set activeRouteKey = '' %}
+{% set title = 'Budget for %name%'|trans({ '%name%' : person.firstName ~ " " ~ person.lastName } ) %}
+{% block title title %}
+
+{% block js %}
+{{ encore_entry_script_tags('page_budget') }}
+{% endblock %}
+
+{% block css %}
+    {{ encore_entry_link_tags('page_budget') }}
+{% endblock %}
+
+{% block content %}
+<h1>{{ title }}</h1>
+
+{% include 'ChillBudgetBundle:Budget:_budget.html.twig' with {
+    'resources': resources,
+    'charges': charges,
+    'person': person
+} %}
+
+<div class="flex-table">
+    <h3 class="family-title">{{ 'Budget calculator'|trans }}</h2>
+    <div class="item-bloc">
+        {{ table_results(charges, resources) }}
+    </div>
+</div>
+
+{% if is_granted('CHILL_BUDGET_ELEMENT_CREATE', person) %}
+    <ul class="record_actions sticky-form-buttons">
+        <li>
+            <a class="btn btn-create" href="{{ path('chill_budget_resource_new', { 'id': person.id} ) }}">{{ 'Create new resource'|trans }}</a>
+        </li>
+        <li>
+            <a class="btn btn-create" href="{{ path('chill_budget_charge_new', { 'id': person.id} ) }}">{{ 'Create new charge'|trans }}</a>
+        </li>
+    </ul>
+{% endif %}
+
+
+{% endblock %}
+
--- a/src/Bundle/ChillBudgetBundle/Resources/views/Resource/confirm_delete.html.twig
+++ b/src/Bundle/ChillBudgetBundle/Resources/views/Resource/confirm_delete.html.twig
@@ -1,18 +1,29 @@
-{% extends "@ChillPerson/Person/layout.html.twig"  %}
+{% if element.person is not null %}
+    {% set template = '@ChillPerson/Person/layout.html.twig' %}
+    {% set indexPage = 'chill_budget_elements_index' %}
+    {% set activeRouteKey = '' %}
+    {% set person = element.person %}
+    {% set confirm_question = 'Are you sure you want to remove the ressource "%type%" associated to "%name%" ?'|trans({ '%name%' : person.firstname ~ ' ' ~ person.lastname, '%type%': element.type|budget_element_type_display('resource') } ) %}
+{% else %}
+    {% set template = '@ChillPerson/Household/layout.html.twig' %}
+    {% set indexPage = 'chill_budget_elements_household_index' %}
+    {% set activeRouteKey = '' %}
+    {% set household = element.household %}
+    {% set confirm_question = 'Are you sure you want to remove the ressource "%type%" associated to household "%household%" ?'|trans({ '%household%' : household.id, '%type%': element.type|budget_element_type_display('resource') } ) %}
+{% endif %}

-{% set activeRouteKey = '' %}
-{% set person = element.person %}
+{% extends template %}

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

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

 {{ include('ChillMainBundle:Util:confirmation_template.html.twig',
    {
        'title'             : 'Remove resource'|trans,
-        'confirm_question'  : 'Are you sure you want to remove the ressource "%type%" associated to "%name%" ?'|trans({ '%name%' : person.firstname ~ ' ' ~ person.lastname, '%type%': element.type|budget_element_type_display('resource') } ),
-        'cancel_route'      : 'chill_budget_elements_index',
-        'cancel_parameters' : { 'id' : element.person.id },
+        'confirm_question'  : confirm_question,
+        'cancel_route'      : indexPage,
+        'cancel_parameters' : { 'id': person is defined ? person.id : household.id },
        'form'              : delete_form
    } ) }}

--- a/src/Bundle/ChillBudgetBundle/Resources/views/Resource/edit.html.twig
+++ b/src/Bundle/ChillBudgetBundle/Resources/views/Resource/edit.html.twig
@@ -1,10 +1,24 @@
-{% extends "@ChillPerson/Person/layout.html.twig" %}
+{% if element.person is not null %}
+    {% set template = '@ChillPerson/Person/layout.html.twig' %}
+    {% set indexPage = 'chill_budget_elements_index' %}
+    {% set activeRouteKey = '' %}
+    {% set person = element.person %}
+    {% set title = 'Edit resource for %name%'|trans({ '%name%' : person.firstName ~ " " ~ person.lastName } ) %}
+{% else %}
+    {% set template = '@ChillPerson/Household/layout.html.twig' %}
+    {% set indexPage = 'chill_budget_elements_household_index' %}
+    {% set activeRouteKey = '' %}
+    {% set household = element.household %}
+    {% set title = 'Edit resource for household %household%'|trans({ '%household%' : household.id } ) %}
+{% endif %}
+
+{% set title = 'Edit resource'|trans %}
+
+{% extends template %}

-{% set activeRouteKey = '' %}
-{% set title = 'Edit Resource for %name%'|trans({ '%name%' : person.firstName ~ " " ~ person.lastName } ) %}
 {% block title title %}

-{% block personcontent %}
+{% block content %}
 <h1>{{ title }}</h1>

 {{ form_start(form) }}
@@ -17,14 +31,14 @@

 <ul class="record_actions sticky-form-buttons">
    <li class="cancel">
-        <a href="{{ path("chill_budget_elements_index", { 'id': person.id } ) }}" class="btn btn-cancel">
-           {{ 'Back to the list'|trans }}
+        <a href="{{ path(indexPage, { 'id': person is defined ? person.id : household.id } ) }}" class="btn btn-cancel">
+            {{ 'Back to the list'|trans }}
        </a>
    </li>
    <li>
-        {{ form_widget(form.submit, { 'attr' : { 'class': 'btn btn-create' }, 'label': 'Edit' } ) }}
+        {{ form_widget(form.submit, { 'attr' : { 'class': 'btn btn-edit' }, 'label': 'Edit' } ) }}
    </li>
 </ul>
-       
+
 {{ form_end(form) }}
 {% endblock %}
--- a/src/Bundle/ChillBudgetBundle/Resources/views/Resource/new.html.twig
+++ b/src/Bundle/ChillBudgetBundle/Resources/views/Resource/new.html.twig
@@ -1,10 +1,24 @@
-{% extends "@ChillPerson/Person/layout.html.twig" %}
+{% if element.person is not null %}
+    {% set template = '@ChillPerson/Person/layout.html.twig' %}
+    {% set indexPage = 'chill_budget_elements_index' %}
+    {% set activeRouteKey = '' %}
+    {% set person = element.person %}
+    {% set title = 'New Resource for %name%'|trans({ '%name%' : person.firstName ~ " " ~ person.lastName } ) %}
+{% else %}
+    {% set template = '@ChillPerson/Household/layout.html.twig' %}
+    {% set indexPage = 'chill_budget_elements_household_index' %}
+    {% set activeRouteKey = '' %}
+    {% set household = element.household %}
+    {% set title = 'New Resource for household %household%'|trans({ '%household%' : household.id } ) %}
+{% endif %}
+
+{% set title = 'New resource'|trans %}
+
+{% extends template %}

-{% set activeRouteKey = '' %}
-{% set title = 'New Resource for %name%'|trans({ '%name%' : person.firstName ~ " " ~ person.lastName } ) %}
 {% block title title %}

-{% block personcontent %}
+{% block content %}
 <h1>{{ title }}</h1>

 {{ form_start(form) }}
@@ -17,14 +31,14 @@

 <ul class="record_actions sticky-form-buttons">
    <li class="cancel">
-        <a href="{{ path("chill_budget_elements_index", { 'id': person.id } ) }}" class="btn btn-cancel">
-           {{ 'Back to the list'|trans }}
+        <a href="{{ path(indexPage, { 'id': person is defined ? person.id : household.id } ) }}" class="btn btn-cancel">
+            {{ 'Back to the list'|trans }}
        </a>
    </li>
    <li>
        {{ form_widget(form.submit, { 'attr' : { 'class': 'btn btn-create' }, 'label': 'Create' } ) }}
    </li>
 </ul>
-       
+
 {{ form_end(form) }}
 {% endblock %}
--- a/src/Bundle/ChillBudgetBundle/Resources/views/Resource/view.html.twig
+++ b/src/Bundle/ChillBudgetBundle/Resources/views/Resource/view.html.twig
@@ -1,49 +1,68 @@
-{% extends "@ChillPerson/Person/layout.html.twig" %}
+{% if element.person is not null %}
+    {% set template = '@ChillPerson/Person/layout.html.twig' %}
+    {% set indexPage = 'chill_budget_elements_index' %}
+    {% set activeRouteKey = '' %}
+    {% set person = element.person %}
+{% else %}
+    {% set template = '@ChillPerson/Household/layout.html.twig' %}
+    {% set indexPage = 'chill_budget_elements_household_index' %}
+    {% set activeRouteKey = '' %}
+    {% set household = element.household %}
+{% endif %}

-{% set activeRouteKey = '' %}
-{% set person = element.person %}
-{% set title = 'Resource for %name%'|trans({ '%name%' : person.firstName ~ " " ~ person.lastName } ) %}
+{% set title = 'Resource' %}
+
+{% extends template %}

 {% block title title %}

-{% block personcontent %}
-<h1>{{ title }}</h1>
+{% block content %}
+<div class="budget-show">
+    <h1>{{ title }}</h1>

-<dl class="chill_view_data">
-    <dt>{{ 'Type'|trans }}</dt>
-    <dd>{{ element.type|budget_element_type_display('resource') }}</dd>
-
-    <dt>{{ 'Amount'|trans }}</dt>
-    <dd>{{ element.amount|format_currency('EUR') }}</dd>
-
-    <dt>{{ 'Validity period'|trans }}</dt>
-    <dd>
-        {% if element.endDate is not null %}
-            {{ 'Valid since %startDate% until %endDate%'|trans( { '%startDate%': element.startDate|format_date('long'), '%endDate%': familyMember.endDate|format_date('long') } ) }}
-        {% else %}
-            {{ 'Valid since %startDate%'|trans( { '%startDate%': element.startDate|format_date('long') } ) }}
-        {% endif %}
-    </dd>
-
-    <dt>{{ 'Comment'|trans }}</dt>
-    <dd>
-        {%- if element.comment is not empty -%}
-        <blockquote class="chill-user-quote">
-            {{ element.comment }}
-        </blockquote>
-        {%- else -%}
-        <span class="chill-no-data-statement">{{ 'Not given'|trans }}</span>
-        {%- endif -%}
-    </dd>
-</dl>
+    <div class="flex-table">
+        <div class="item-bloc">
+            <div class="item-row">
+                <h2 class="badge-title">
+                    <span class="title_label title_label_resource"></span>
+                    <span class="title_action title_action">{{ element.type|budget_element_type_display('resource') }}</span>
+                </h2>
+            </div>
+            <div class="item-row separator">
+                <dl class="chill_view_data">
+                        <dt class="inline">{{ 'Amount'|trans }}</dt>
+                        <dd>{{ element.amount|format_currency('EUR') }}</dd>
+                        <dt class="inline">{{ 'Validity period'|trans }}</dt>
+                        <dd>
+                            {% if element.endDate is not null %}
+                                {{ 'Valid since %startDate% until %endDate%'|trans( { '%startDate%': element.startDate|format_date('long'), '%endDate%': element.endDate|format_date('long') } ) }}
+                            {% else %}
+                                {{ 'Valid since %startDate%'|trans( { '%startDate%': element.startDate|format_date('long') } ) }}
+                            {% endif %}
+                        </dd>
+                        <dt class="inline">{{ 'Comment'|trans }}</dt>
+                        <dd>
+                            {%- if element.comment is not empty -%}
+                            <blockquote class="chill-user-quote">
+                                {{ element.comment }}
+                            </blockquote>
+                            {%- else -%}
+                            <span class="chill-no-data-statement">{{ 'Not given'|trans }}</span>
+                            {%- endif -%}
+                        </dd>
+                </dl>
+            </div>
+        </div>
+    </div>
+</div>

 <ul class="record_actions sticky-form-buttons">
    <li class="cancel">
-        <a href="{{ path("chill_budget_elements_index", { 'id': person.id } ) }}" class="btn btn-cancel">
-           {{ 'Back to the list'|trans }}
+        <a href="{{ path(indexPage, { 'id': person is defined ? person.id : household.id } ) }}" class="btn btn-cancel">
+            {{ 'Back to the list'|trans }}
        </a>
    </li>
-    {% if is_granted(constant('Chill\\AMLI\\BudgetBundle\\Security\\Authorization\\BudgetElementVoter::UPDATE'), element) %}
+    {% if is_granted('CHILL_BUDGET_ELEMENT_UPDATE', element) %}
        <li>
            <a href="{{ path('chill_budget_resource_edit', { 'id': element.id } ) }}" class="btn btn-edit">{{ 'Edit'|trans }}</a>
        </li>
--- a/src/Bundle/ChillBudgetBundle/Security/Authorization/BudgetElementVoter.php
+++ b/src/Bundle/ChillBudgetBundle/Security/Authorization/BudgetElementVoter.php
@@ -9,15 +9,16 @@

 declare(strict_types=1);

-namespace Chill\AMLI\BudgetBundle\Security\Authorization;
+namespace Chill\BudgetBundle\Security\Authorization;

-use Chill\AMLI\BudgetBundle\Entity\AbstractElement;
-use Chill\MainBundle\Entity\User;
+use Chill\BudgetBundle\Entity\AbstractElement;
 use Chill\MainBundle\Security\Authorization\AbstractChillVoter;
-use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
+use Chill\MainBundle\Security\Authorization\VoterHelperFactoryInterface;
+use Chill\MainBundle\Security\Authorization\VoterHelperInterface;
 use Chill\MainBundle\Security\ProvideRoleHierarchyInterface;
+use Chill\PersonBundle\Entity\Household\Household;
 use Chill\PersonBundle\Entity\Person;
-use Symfony\Component\Security\Core\Role\Role;
+use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;

 use function in_array;

@@ -30,22 +31,24 @@ class BudgetElementVoter extends AbstractChillVoter implements ProvideRoleHierar
    public const ROLES = [
        self::CREATE,
        self::DELETE,
-        self::SHOW,
+        self::SEE,
        self::UPDATE,
    ];

-    public const SHOW = 'CHILL_BUDGET_ELEMENT_SHOW';
+    public const SEE = 'CHILL_BUDGET_ELEMENT_SEE';

    public const UPDATE = 'CHILL_BUDGET_ELEMENT_UPDATE';

-    /**
-     * @var AuthorizationHelper
-     */
-    protected $authorizationHelper;
+    protected VoterHelperInterface $voter;

-    public function __construct(AuthorizationHelper $authorizationHelper)
+    public function __construct(VoterHelperFactoryInterface $voterFactory)
    {
-        $this->authorizationHelper = $authorizationHelper;
+        $this->voter = $voterFactory
+            ->generate(self::class)
+            ->addCheckFor(AbstractElement::class, self::ROLES)
+            ->addCheckFor(Person::class, [self::CREATE, self::SEE])
+            ->addCheckFor(Household::class, [self::CREATE, self::SEE])
+            ->build();
    }

    public function getRoles(): array
@@ -66,18 +69,11 @@ class BudgetElementVoter extends AbstractChillVoter implements ProvideRoleHierar
    protected function supports($attribute, $subject)
    {
        return (in_array($attribute, self::ROLES, true) && $subject instanceof AbstractElement)
-                || ($subject instanceof Person && in_array($attribute, [self::SHOW, self::CREATE], true));
+                || (($subject instanceof Person || $subject instanceof Household) && in_array($attribute, [self::SEE, self::CREATE], true));
    }

-    protected function voteOnAttribute($attribute, $subject, \Symfony\Component\Security\Core\Authentication\Token\TokenInterface $token)
+    protected function voteOnAttribute($attribute, $subject, TokenInterface $token)
    {
-        $user = $token->getUser();
-
-        if (false === $user instanceof User) {
-            return false;
-        }
-
-        return $this->authorizationHelper
-            ->userHasAccess($user, $subject, new Role($attribute));
+        return $this->voter->voteOnAttribute($attribute, $subject, $token);
    }
 }
--- a/src/Bundle/ChillBudgetBundle/Service/Summary/SummaryBudget.php
+++ b/src/Bundle/ChillBudgetBundle/Service/Summary/SummaryBudget.php
@@ -0,0 +1,168 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\BudgetBundle\Service\Summary;
+
+use Chill\BudgetBundle\Config\ConfigRepository;
+use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
+use Chill\PersonBundle\Entity\Household\Household;
+use Chill\PersonBundle\Entity\Person;
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\Query\ResultSetMapping;
+use LogicException;
+use function count;
+
+/**
+ * Helps to find a summary of the budget: the sum of resources and charges.
+ */
+class SummaryBudget implements SummaryBudgetInterface
+{
+    private const QUERY_CHARGE_BY_HOUSEHOLD = 'select SUM(amount) AS sum, string_agg(comment, \'|\') AS comment, type FROM chill_budget.charge WHERE (person_id IN (_ids_) OR household_id = ?) AND NOW() BETWEEN startdate AND COALESCE(enddate, \'infinity\'::timestamp) GROUP BY type';
+
+    private const QUERY_CHARGE_BY_PERSON = 'select SUM(amount) AS sum, string_agg(comment, \'|\') AS comment, type FROM chill_budget.charge WHERE person_id = ? AND NOW() BETWEEN startdate AND COALESCE(enddate, \'infinity\'::timestamp) GROUP BY type';
+
+    private const QUERY_RESOURCE_BY_HOUSEHOLD = 'select SUM(amount) AS sum, string_agg(comment, \'|\') AS comment, type FROM chill_budget.resource WHERE (person_id IN (_ids_) OR household_id = ?) AND NOW() BETWEEN startdate AND COALESCE(enddate, \'infinity\'::timestamp) GROUP BY type';
+
+    private const QUERY_RESOURCE_BY_PERSON = 'select SUM(amount) AS sum, string_agg(comment, \'|\') AS comment, type FROM chill_budget.resource WHERE person_id = ? AND NOW() BETWEEN startdate AND COALESCE(enddate, \'infinity\'::timestamp) GROUP BY type';
+
+    private array $chargeLabels;
+
+    private ConfigRepository $configRepository;
+
+    private EntityManagerInterface $em;
+
+    private array $resourcesLabels;
+
+    private TranslatableStringHelperInterface $translatableStringHelper;
+
+    public function __construct(EntityManagerInterface $em, ConfigRepository $configRepository, TranslatableStringHelperInterface $translatableStringHelper)
+    {
+        $this->em = $em;
+        $this->configRepository = $configRepository;
+        $this->chargeLabels = $configRepository->getChargesLabels();
+        $this->resourcesLabels = $configRepository->getResourcesLabels();
+        $this->translatableStringHelper = $translatableStringHelper;
+    }
+
+    public function getSummaryForHousehold(?Household $household): array
+    {
+        if (null === $household) {
+            return [
+                'resources' => $this->getEmptyResourceArray(),
+                'charges' => $this->getEmptyChargeArray(),
+            ];
+        }
+
+        $personIds = $household->getCurrentPersons()->map(static function (Person $p) { return $p->getId(); });
+        $ids = implode(', ', array_fill(0, count($personIds), '?'));
+
+        $parameters = [...$personIds, $household->getId()];
+
+        $rsm = $this->buildRsm();
+
+        $resources = $this->em->createNativeQuery(strtr(self::QUERY_RESOURCE_BY_HOUSEHOLD, ['_ids_' => $ids]), $rsm)
+            ->setParameters($parameters)
+            ->getResult();
+        $charges = $this->em->createNativeQuery(strtr(self::QUERY_CHARGE_BY_HOUSEHOLD, ['_ids_' => $ids]), $rsm)
+            ->setParameters($parameters)
+            ->getResult();
+
+        return [
+            'resources' => array_merge($this->getEmptyResourceArray(), $this->rowToArray($resources, 'resource')),
+            'charges' => array_merge($this->getEmptyChargeArray(), $this->rowToArray($charges, 'charge')),
+        ];
+    }
+
+    public function getSummaryForPerson(?Person $person): array
+    {
+        if (null === $person) {
+            return [
+                'resources' => $this->getEmptyResourceArray(),
+                'charges' => $this->getEmptyChargeArray(),
+            ];
+        }
+
+        $rsm = $this->buildRsm();
+
+        $resources = $this->em->createNativeQuery(self::QUERY_RESOURCE_BY_PERSON, $rsm)
+            ->setParameters([$person->getId()])
+            ->getResult();
+        $charges = $this->em->createNativeQuery(self::QUERY_CHARGE_BY_PERSON, $rsm)
+            ->setParameters([$person->getId()])
+            ->getResult();
+
+        return [
+            'resources' => array_merge($this->getEmptyResourceArray(), $this->rowToArray($resources, 'resource')),
+            'charges' => array_merge($this->getEmptyChargeArray(), $this->rowToArray($charges, 'charge')),
+        ];
+    }
+
+    private function buildRsm(): ResultSetMapping
+    {
+        $rsm = new ResultSetMapping();
+        $rsm
+            ->addScalarResult('sum', 'sum')
+            ->addScalarResult('type', 'type')
+            ->addScalarResult('comment', 'comment');
+
+        return $rsm;
+    }
+
+    private function getEmptyChargeArray(): array
+    {
+        $keys = $this->configRepository->getChargesKeys();
+        $labels = $this->chargeLabels;
+
+        return array_combine($keys, array_map(function ($i) use ($labels) {
+            return ['sum' => 0.0, 'label' => $this->translatableStringHelper->localize($labels[$i]), 'comment' => ''];
+        }, $keys));
+    }
+
+    private function getEmptyResourceArray(): array
+    {
+        $keys = $this->configRepository->getResourcesKeys();
+        $labels = $this->resourcesLabels;
+
+        return array_combine($keys, array_map(function ($i) use ($labels) {
+            return ['sum' => 0.0, 'label' => $this->translatableStringHelper->localize($labels[$i]), 'comment' => ''];
+        }, $keys));
+    }
+
+    private function rowToArray(array $rows, string $kind): array
+    {
+        switch ($kind) {
+            case 'charge':
+                $label = $this->chargeLabels;
+
+                break;
+
+            case 'resource':
+                $label = $this->resourcesLabels;
+
+                break;
+
+            default:
+                throw new LogicException();
+        }
+
+        $result = [];
+
+        foreach ($rows as $row) {
+            $result[$row['type']] = [
+                'sum' => (float) $row['sum'],
+                'label' => $this->translatableStringHelper->localize($label[$row['type']]),
+                'comment' => (string) $row['comment'],
+            ];
+        }
+
+        return $result;
+    }
+}
--- a/Show More
+++ b/Show More