address render test : more tentatives to use parameter bag (unsuccessful)

address: add country aware renderCountryLine (make tests failing)
address: render address lines in vue AddressRenderBox
2025-09-24 23:55:02 +00:00 · 2022-01-07 10:22:37 +01:00 · 2022-01-06 21:31:02 +01:00 · 2022-01-06 21:15:56 +01:00 · 2022-01-06 18:30:21 +01:00 · 2022-01-06 17:02:17 +01:00
539 changed files with 4321 additions and 22040 deletions
--- a/.env
+++ b/.env
@@ -0,0 +1,64 @@
+##
+##  Manually dump .env files in .env.local.php with
+## `$ composer symfony:dump-env prod`
+##
+
+## Project environment
+APP_ENV=dev
+
+## Enable debug
+APP_DEBUG=true
+
+## Locale
+LOCALE=fr
+
+## Framework secret
+APP_SECRET=ThisTokenIsNotSoSecretChangeIt
+
+## Symfony/swiftmailer
+MAILER_TRANSPORT=smtp
+MAILER_HOST=smtp
+MAILER_PORT=1025
+MAILER_CRYPT=
+MAILER_AUTH=
+MAILER_USER=
+MAILER_PASSWORD=
+MAILER_URL=${MAILER_TRANSPORT}://${MAILER_HOST}:${MAILER_PORT}?encryption=${MAILER_CRYPT}&auth_mode=${MAILER_AUTH}&username=${MAILER_USER}&password=${MAILER_PASSWORD}
+
+## Notifications
+NOTIFICATION_HOST=localhost:8001
+NOTIFICATION_FROM_EMAIL=admin@chill.social
+NOTIFICATION_FROM_NAME=Chill
+
+## Gelf
+GELF_HOST=gelf
+GELF_PORT=12201
+
+## OVH OpenStack Storage User/Role
+OS_USERNAME=
+OS_PASSWORD=
+OS_TENANT_ID=
+OS_REGION_NAME=GRA
+OS_AUTH_URL=https://auth.cloud.ovh.net/v2.0/
+
+## OVH OpenStack Storage Container
+ASYNC_UPLOAD_TEMP_URL_KEY=
+ASYNC_UPLOAD_TEMP_URL_BASE_PATH=
+ASYNC_UPLOAD_TEMP_URL_CONTAINER=
+
+## Redis Cache
+REDIS_HOST=redis
+REDIS_PORT=6379
+REDIS_URL=redis://${REDIS_HOST}:${REDIS_PORT}
+
+## Twilio
+TWILIO_SID=~
+TWILIO_SECRET=~
+
+## DOCKER IMAGES REGISTRY
+#IMAGE_PHP=
+#IMAGE_NGINX=
+
+## DOCKER IMAGES VERSION
+#VERSION=test
+VERSION=prod
--- a/.env.test
+++ b/.env.test
@@ -3,3 +3,4 @@
 # Run tests from root to adapt your own environment
 KERNEL_CLASS='App\Kernel'
 APP_SECRET='$ecretf0rt3st'
+DATABASE_URL=postgresql://postgres:postgres@db:5432/postgres?serverVersion=12&charset=utf8
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -20,8 +20,6 @@ variables:
    # Configure postgres environment variables (https://hub.docker.com/r/_/postgres/)
    POSTGRES_USER: postgres
    POSTGRES_PASSWORD: postgres
-    # configure database access
-    DATABASE_URL: postgresql://postgres:postgres@db:5432/postgres?serverVersion=12&charset=utf8
    # fetch the chill-app using git submodules
    GIT_SUBMODULE_STRATEGY: recursive
    REDIS_HOST: redis
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,135 +9,8 @@ and this project adheres to
 * date versioning for test releases

 ## Unreleased
-* AddPersons: remove ul-li html tags from AddPersons (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/419)

 <!-- write down unreleased development here -->
-* 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)
-* [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)
-
-## Test releases
-
-### 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.
-
-### test release 2021-01-31
-
-* [person] accompanying course: optimisation: do not fetch some resources for the banner (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/409)
-* [person] accompanying course: close modal when edit participation (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/420)
-* [person] accompanying course: treat validation error when editing on-the-fly entities (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/420)
-* [activity] show activity attendee (présence) in the activity list (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/412)
-* [activity] admin: change validation rule for social action visible field (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/413)
-* [parcours]: component added to change the opening date of a parcours (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/411)
-* [search]: listing of parcours display changed (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/410)
-* [user]: page with accompanying periods to which is user is referent (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/408)
-* [person] age added to renderstring + renderbox/ vue component created to display person text (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/389)
-* [household member editor] allow to push to existing household
-
-
-### test release 2021-01-28
-
-* [person] improve filiations vis graph: disable physics, use chill colors for persons-households-course, increase label of relations, remove labels on household arrows and other improvements (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/286, https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/362)
-* [activity] Order activity by date and by id (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/364)
-* [main] increase length of 4 Address fields (change to TEXT, no size limits) (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/277)
-* [main] Add confidential option for address, in edit and view (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/165)
-* [person] name suggestions within create person form when person is created departing from a search input (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/377)
-* [person] Add residential address entity, form and list for each person
-* [aside_activity]: dynamicUserPickerType used (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/399)
-* dispatching list
-
-
-### test release 2021-01-26
-
-* [parcours] comments truncated if too long + link added (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/406)
-* [person]: possibility to add person resources (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/382)
-* [person ressources]: module added
-
-
-### test release 2022-01-24
-
-* [person] name suggestions within create person form when person is created departing from a search input (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/377)
-* [notification: formulaire création] descend la box avec la description dans le bas du formulaire
-* [notification for activity]: fix link to activity
-* [notification] add "URGENT" before accompanying course with emergency = true
-* [notification] add a "read more" button on system notification
-* [notification] add `[Chill]` in the subject of each notification, automatically
-* [notification] add a counter for notification in activity list and accompanying period list, and search results
-* [parcours] bugfix if deathdate is not defined (eg. for a thirdparty) parcours is still displayed. Gave error before.
-* [workflow] add breadcrumb to show steps
-* [popover] add popover html popup mechanism (used by workflow breadcrumb)
-* [templates] improve updatedBy macro in item metadatas
-* [parcours]: bug fix when comment is pinned all other comments remain in the collection (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/385)
-* [workflow]
-  * add My workflow section with my opened subscriptions
-  * apply workflow on documents, accompanyingCourseWork and Evaluations
-* [wopi-link] a new vue component allow to open wopi link in a fullscreen chill-themed modal
-
-### test release 2022-01-19
-* vuejs: add dead information on all on-the-fly person render boxes, in vis graph and other templates (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/271)
-* [thirdparty] fix bug in 3rd party view: types was replaced by thirdPartyTypes
-* [main] location form type: fix unmapped address field (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/246)
-* [activity] fix wrong import of js assets for adding and viewing documents in activity (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/83 & https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/176)
-* [person]: space added between deathdate and age in twig renderbox (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/380)
-* [forms] dynamic picker types for user/person/thirdparty types created (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/386)
-
-### test release 2022-01-17
-
-* [main] Add editableByUser field to locationType entity, adapt the admin template and add this condition in the location-type endpoint (see https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/297)
-* [main] Add mainLocation field to User entity and add it in user form type
-* rewrite page which allow to select activity
-* [main] Add mainLocation field to User entity and add it in user form type
-* [course list in person context] show full username/label for ref
-* [accompanying period work] remove the possibility to  generate document from an accompanying period work
-* vuejs: add validation on required fields for AddPerson, Address and Location components
-* vuejs: treat 422 validation errors in locations and AddPerson components
-* [person]: space added between deathdate and age in twig renderbox (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/380)
-
-## Test releases
-* vuejs: add validation on required fields for AddPerson, Address and Location components
-* vuejs: treat 422 validation errors in locations and AddPerson components
-* [person]: space added between deathdate and age in twig renderbox (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/380)
-
-### test release 2022-01-12
-
-* fix thirdparty normalizer on telephone field: https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/322
-
-### test release 2022-01-11
-
-* vuejs: translate in French all multiselect widgets
-* [address] define address lines according postal standards for France and Belgium (default) and change AddressRender, chill_entity_render_box and AddressRenderBox.vue
 * [household] change translations (champs-libres/departement-de-la-vendee/accent-suivi-developpement#109)
 * [household] add address i18n in household component (champs-libres/departement-de-la-vendee/accent-suivi-developpement#158)
 * [household] add on the fly i18n in household component
@@ -147,9 +20,6 @@ and this project adheres to
 * [household] household member editor: remove markNoAddress button (champs-libres/departement-de-la-vendee/accent-suivi-developpement#109)
 * [person]: ordering fields in add person (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/61)
 * [person]: Add email and alt names in add person (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/61)
-* [accompanyingCourse] Add a delete action and delete buttons to delete a accompanying course when step = DRAFT (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/64)
-* [accompanyingCourse] Add a administrative location in the accompanying course, set the user current location as default, allow to select a location in a select field and do not allow to confirm the accompanying course if location is empty.
-* [accompanyingCourse] Add the administrative location in the available variables for document generation
 * AddAddress: optimize loading: wait for the user finish typing;
 * UserPicker: fix bug with deprecated role
 * docgen: add base context + tests
@@ -165,10 +35,8 @@ and this project adheres to
 * address reference: add index for refid
 * [accompanyingCourse_work] fix styles conflicts + fix bug with remove goal (remove goals one at a time)
 * [accompanyingCourse] improve masonry on resume page, add origin
-* [notification] new notification interface, can be associated to AccompanyingCourse/Period, Activities.
-  * List notifications, show, and comment in User section
-  * Notify button and contextual notification box on associated objects pages
-* [accompanyingCourse] add a comment for each resource associated. A modal allow to save comment. Comment is displayed in on-the-fly show modal of the accompanyingCourse context (edit page + resume page).
+
+## Test releases

 ### test release 2021-12-14

--- a/composer.json
+++ b/composer.json
@@ -33,8 +33,7 @@
        "symfony/form": "^4.4",
        "symfony/framework-bundle": "^4.4",
        "symfony/intl": "^4.4",
-        "symfony/mailer": "^5.4",
-        "symfony/mime": "^5.4",
+        "symfony/mime": "^4.4",
        "symfony/monolog-bundle": "^3.5",
        "symfony/security-bundle": "^4.4",
        "symfony/serializer": "^5.3",
@@ -48,16 +47,13 @@
        "symfony/yaml": "^4.4",
        "twig/extra-bundle": "^3.0",
        "twig/intl-extra": "^3.0",
-        "twig/markdown-extra": "^3.3",
-        "twig/string-extra": "^3.3",
-        "twig/twig": "^3.0"
+        "twig/markdown-extra": "^3.3"
    },
    "require-dev": {
        "doctrine/doctrine-fixtures-bundle": "^3.3",
        "drupol/php-conventions": "^5",
        "fakerphp/faker": "^1.13",
        "nelmio/alice": "^3.8",
-        "phpspec/prophecy-phpunit": "^2.0",
        "phpstan/phpstan-strict-rules": "^1.0",
        "phpunit/phpunit": ">= 7.5",
        "symfony/debug-bundle": "^5.1",
@@ -74,11 +70,8 @@
    "autoload": {
        "psr-4": {
            "Chill\\ActivityBundle\\": "src/Bundle/ChillActivityBundle",
-            "Chill\\AsideActivityBundle\\": "src/Bundle/ChillAsideActivityBundle/src",
            "Chill\\BudgetBundle\\": "src/Bundle/ChillBudgetBundle",
-            "Chill\\CalendarBundle\\": "src/Bundle/ChillCalendarBundle",
            "Chill\\CustomFieldsBundle\\": "src/Bundle/ChillCustomFieldsBundle",
-            "Chill\\DocGeneratorBundle\\": "src/Bundle/ChillDocGeneratorBundle",
            "Chill\\DocStoreBundle\\": "src/Bundle/ChillDocStoreBundle",
            "Chill\\EventBundle\\": "src/Bundle/ChillEventBundle",
            "Chill\\FamilyMemberBundle\\": "src/Bundle/ChillFamilyMemberBundle",
@@ -87,6 +80,9 @@
            "Chill\\ReportBundle\\": "src/Bundle/ChillReportBundle",
            "Chill\\TaskBundle\\": "src/Bundle/ChillTaskBundle",
            "Chill\\ThirdPartyBundle\\": "src/Bundle/ChillThirdPartyBundle",
+            "Chill\\AsideActivityBundle\\": "src/Bundle/ChillAsideActivityBundle/src",
+            "Chill\\DocGeneratorBundle\\": "src/Bundle/ChillDocGeneratorBundle",
+            "Chill\\CalendarBundle\\": "src/Bundle/ChillCalendarBundle",
            "Chill\\WopiBundle\\": "src/Bundle/ChillWopiBundle/src"
        }
    },
@@ -99,10 +95,10 @@
    "config": {
        "allow-plugins": {
            "composer/package-versions-deprecated": true,
+            "phpstan/extension-installer": true,
            "ergebnis/composer-normalize": true,
-            "ocramius/package-versions": true,
            "phpro/grumphp": true,
-            "phpstan/extension-installer": true
+            "ocramius/package-versions": true
        },
        "bin-dir": "bin",
        "optimize-autoloader": true,
@@ -111,8 +107,8 @@
    },
    "scripts": {
        "auto-scripts": {
-            "assets:install %PUBLIC_DIR%": "symfony-cmd",
-            "cache:clear": "symfony-cmd"
+            "cache:clear": "symfony-cmd",
+            "assets:install %PUBLIC_DIR%": "symfony-cmd"
        }
    }
 }
--- a/package.json.txt
+++ b/package.json.txt
@@ -0,0 +1,3 @@
+add npm/yarn dependency in package.json :
+
+"select2-bootstrap-theme": "0.1.0-beta.10",
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -80,6 +80,11 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillPersonBundle/Form/ChoiceLoader/PersonChoiceLoader.php

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

+        -
+            message: "#^Parameter \\$action of method Chill\\\\PersonBundle\\\\Repository\\\\AccompanyingPeriod\\\\AccompanyingPeriodWorkRepository\\:\\:buildQueryBySocialActionWithDescendants\\(\\) has invalid type Chill\\\\PersonBundle\\\\Repository\\\\AccompanyingPeriod\\\\SocialAction\\.$#"
+            count: 1
+            path: src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkRepository.php
+
+        -
+            message: "#^Parameter \\$action of method Chill\\\\PersonBundle\\\\Repository\\\\AccompanyingPeriod\\\\AccompanyingPeriodWorkRepository\\:\\:countBySocialActionWithDescendants\\(\\) has invalid type Chill\\\\PersonBundle\\\\Repository\\\\AccompanyingPeriod\\\\SocialAction\\.$#"
+            count: 1
+            path: src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkRepository.php
+
+        -
+            message: "#^Undefined variable\\: \\$action$#"
+            count: 1
+            path: src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkRepository.php
+
+        -
+            message: "#^Undefined variable\\: \\$limit$#"
+            count: 1
+            path: src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkRepository.php
+
+        -
+            message: "#^Undefined variable\\: \\$offset$#"
+            count: 1
+            path: src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkRepository.php
+
+        -
+            message: "#^Undefined variable\\: \\$orderBy$#"
+            count: 1
+            path: src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkRepository.php
+
        -
            message: "#^Variable variables are not allowed\\.$#"
            count: 4
--- a/phpstan-deprecations.neon
+++ b/phpstan-deprecations.neon
@@ -408,6 +408,24 @@ parameters:
 			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:
 				"""
@@ -909,6 +927,15 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseController.php

+		-
+			message:
+				"""
+					#^Parameter \\$trans of method Chill\\\\PersonBundle\\\\Controller\\\\AccompanyingCourseWorkController\\:\\:__construct\\(\\) has typehint with deprecated interface Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\:
+					since Symfony 4\\.2, use Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface instead$#
+				"""
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseWorkController.php
+
 		-
 			message:
 				"""
--- a/phpstan-types.neon
+++ b/phpstan-types.neon
@@ -315,6 +315,11 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillMainBundle/Security/PasswordRecover/TokenManager.php

+		-
+			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
+			count: 3
+			path: src/Bundle/ChillMainBundle/Templating/Entity/AddressRender.php
+
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
 			count: 1
@@ -400,6 +405,11 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillPersonBundle/Form/Type/PersonPhoneType.php

+		-
+			message: "#^Method Chill\\\\PersonBundle\\\\Repository\\\\AccompanyingPeriod\\\\AccompanyingPeriodWorkRepository\\:\\:buildQueryBySocialActionWithDescendants\\(\\) has invalid return type Chill\\\\PersonBundle\\\\Repository\\\\AccompanyingPeriod\\\\QueryBuilder\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkRepository.php
+
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
 			count: 3
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -6,6 +6,7 @@
         backupGlobals="false"
         colors="true"
         bootstrap="tests/app/tests/bootstrap.php"
+         stopOnFailure="true"
 >
    <php>
        <ini name="error_reporting" value="-1" />
--- a/src/Bundle/ChillActivityBundle/Controller/ActivityController.php
+++ b/src/Bundle/ChillActivityBundle/Controller/ActivityController.php
@@ -31,17 +31,15 @@ use DateTime;
 use Doctrine\ORM\EntityManagerInterface;
 use InvalidArgumentException;
 use Psr\Log\LoggerInterface;
-use RuntimeException;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
-use Symfony\Component\Form\Extension\Core\Type\HiddenType;
 use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Security\Core\Role\Role;
-
 use Symfony\Component\Serializer\SerializerInterface;
+
 use function array_key_exists;

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

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

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

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

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

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

            $view = 'ChillActivityBundle:Activity:listAccompanyingCourse.html.twig';
        }
@@ -418,36 +392,12 @@ final class ActivityController extends AbstractController
            'role' => new Role('CHILL_ACTIVITY_CREATE'),
            'activityType' => $entity->getActivityType(),
            'accompanyingPeriod' => $accompanyingPeriod,
-        ]);
-
-        if ($form->has('documents')) {
-            $form->add('gendocTemplateId', HiddenType::class, [
-                'mapped' => false,
-                'data' => null,
-                'attr' => [
-                    // required for js
-                    'data-template-id' => 'data-template-id',
-                ],
-            ]);
-        }
-
-        $form->handleRequest($request);
+        ])->handleRequest($request);

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

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

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

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

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

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

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

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

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

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

 use Chill\ActivityBundle\Validator\Constraints as ActivityValidator;
-use Chill\DocStoreBundle\Entity\StoredObject;
+use Chill\DocStoreBundle\Entity\Document;
 use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable;
 use Chill\MainBundle\Entity\HasCenterInterface;
@@ -67,7 +67,7 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac

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

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

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

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

@@ -103,7 +100,6 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac

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

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

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

@@ -128,45 +124,42 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac

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

    /**
     * @ORM\ManyToMany(targetEntity="Chill\ActivityBundle\Entity\ActivityReason")
-     * @Groups({"docgen:read"})
     */
    private Collection $reasons;

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

    /**
     * @ORM\Column(type="string", options={"default": ""})
-     * @Groups({"docgen:read"})
     */
    private string $sentReceived = '';

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

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

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

@@ -177,13 +170,12 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac

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

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

@@ -199,7 +191,7 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
        $this->socialActions = new ArrayCollection();
    }

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

@@ -310,18 +302,6 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
        return $this->documents;
    }

-    /**
-     * @Groups({"docgen:read"})
-     */
-    public function getDurationMinute(): int
-    {
-        if (null === $this->durationTime) {
-            return 0;
-        }
-
-        return (int) round(($this->durationTime->getTimestamp() + $this->durationTime->getOffset()) / 60.0, 0);
-    }
-
    public function getDurationTime(): ?DateTime
    {
        return $this->durationTime;
@@ -422,18 +402,6 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
        return $this->travelTime;
    }

-    /**
-     * @Groups({"docgen:read"})
-     */
-    public function getTravelTimeMinute(): int
-    {
-        if (null === $this->travelTime) {
-            return 0;
-        }
-
-        return (int) round(($this->travelTime->getTimestamp() + $this->travelTime->getOffset()) / 60.0, 0);
-    }
-
    /**
     * @deprecated
     */
@@ -457,7 +425,7 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
        return $this->getEmergency();
    }

-    public function removeDocument(StoredObject $document): void
+    public function removeDocument(Document $document): void
    {
        $this->documents->removeElement($document);
    }
--- a/src/Bundle/ChillActivityBundle/Entity/ActivityPresence.php
+++ b/src/Bundle/ChillActivityBundle/Entity/ActivityPresence.php
@@ -12,7 +12,6 @@ declare(strict_types=1);
 namespace Chill\ActivityBundle\Entity;

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

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

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

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

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

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

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

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

@@ -194,6 +190,7 @@ class ActivityType

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

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

-    /**
-     * @Assert\Callback
-     *
-     * @param mixed $payload
-     */
-    public function checkSocialActionsVisibility(ExecutionContextInterface $context, $payload)
-    {
-        if ($this->socialIssuesVisible !== $this->socialActionsVisible) {
-            if (!(2 === $this->socialIssuesVisible && 1 === $this->socialActionsVisible)) {
-                $context
-                    ->buildViolation('The socialActionsVisible value is not compatible with the socialIssuesVisible value')
-                    ->atPath('socialActionsVisible')
-                    ->addViolation();
-            }
-        }
-    }
-
    /**
     * Get active
     * return true if the type is active.
--- a/src/Bundle/ChillActivityBundle/Form/ActivityType.php
+++ b/src/Bundle/ChillActivityBundle/Form/ActivityType.php
@@ -307,7 +307,6 @@ class ActivityType extends AbstractType
                'allow_add' => true,
                'button_add_label' => 'activity.Insert a document',
                'button_remove_label' => 'activity.Remove a document',
-                'empty_collection_explain' => 'No documents',
            ]);
        }

--- a/src/Bundle/ChillActivityBundle/Notification/ActivityNotificationHandler.php
+++ b/src/Bundle/ChillActivityBundle/Notification/ActivityNotificationHandler.php
@@ -1,45 +0,0 @@
-<?php
-
-/**
- * Chill is a software for social workers
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-declare(strict_types=1);
-
-namespace Chill\ActivityBundle\Notification;
-
-use Chill\ActivityBundle\Entity\Activity;
-use Chill\ActivityBundle\Repository\ActivityRepository;
-use Chill\MainBundle\Entity\Notification;
-use Chill\MainBundle\Notification\NotificationHandlerInterface;
-
-final class ActivityNotificationHandler implements NotificationHandlerInterface
-{
-    private ActivityRepository $activityRepository;
-
-    public function __construct(ActivityRepository $activityRepository)
-    {
-        $this->activityRepository = $activityRepository;
-    }
-
-    public function getTemplate(Notification $notification, array $options = []): string
-    {
-        return '@ChillActivity/Activity/showInNotification.html.twig';
-    }
-
-    public function getTemplateData(Notification $notification, array $options = []): array
-    {
-        return [
-            'notification' => $notification,
-            'activity' => $this->activityRepository->find($notification->getRelatedEntityId()),
-        ];
-    }
-
-    public function supports(Notification $notification, array $options = []): bool
-    {
-        return $notification->getRelatedEntityClass() === Activity::class;
-    }
-}
--- a/src/Bundle/ChillActivityBundle/Notification/ActivityNotificationRenderer.php
+++ b/src/Bundle/ChillActivityBundle/Notification/ActivityNotificationRenderer.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\ActivityBundle\Notification;
+
+use Chill\ActivityBundle\Entity\Activity;
+use Chill\MainBundle\Entity\Notification;
+
+final class ActivityNotificationRenderer
+{
+    public function getTemplate()
+    {
+        return '@ChillActivity/Activity/showInNotification.html.twig';
+    }
+
+    public function getTemplateData(Notification $notification)
+    {
+        return ['notification' => $notification];
+    }
+
+    public function supports(Notification $notification, array $options = []): bool
+    {
+        return $notification->getRelatedEntityClass() === Activity::class;
+    }
+}
--- a/src/Bundle/ChillActivityBundle/Resources/public/chill/chillactivity.scss
+++ b/src/Bundle/ChillActivityBundle/Resources/public/chill/chillactivity.scss
@@ -9,9 +9,8 @@ div.new-activity-select-type {
      display: flex;
      flex-direction: row;
      flex-wrap: wrap;
-      justify-content: flex-start;
+      justify-content: center;
      gap: 12px;
-      margin-bottom: 30px;

      div.bloc {
         width: 200px;
@@ -28,28 +27,26 @@ div.new-activity-select-type {
 // precise dashboard specific details

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

 //// ACTIVITY SHOW AND FORM PAGES
--- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/App.vue
+++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/App.vue
@@ -11,7 +11,7 @@ import Location from './components/Location.vue';

 export default {
   name: "App",
-   props: ['hasSocialIssues', 'hasLocation', 'hasPerson'],
+    props: ['hasSocialIssues', 'hasLocation', 'hasPerson'],
   components: {
      ConcernedGroups,
      SocialIssuesAcc,
--- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/ConcernedGroups.vue
+++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/ConcernedGroups.vue
@@ -1,52 +1,45 @@
 <template>
-   <teleport to="#add-persons" v-if="isComponentVisible">
+    <teleport to="#add-persons" v-if="isComponentVisible">

-      <div class="flex-bloc concerned-groups" :class="getContext">
-         <persons-bloc
-               v-for="bloc in contextPersonsBlocs"
-               v-bind:key="bloc.key"
-               v-bind:bloc="bloc"
-               v-bind:blocWidth="getBlocWidth"
-               v-bind:setPersonsInBloc="setPersonsInBloc">
-         </persons-bloc>
-      </div>
-      <div v-if="getContext === 'accompanyingCourse' && suggestedEntities.length > 0">
-         <ul class="list-suggest add-items inline">
-               <li v-for="(p, i) in suggestedEntities" @click="addSuggestedEntity(p)" :key="`suggestedEntities-${i}`">
-                  <person-text v-if="p.type === 'person'" :person="p"></person-text>
-                  <span v-else>{{ p.text }}</span>
-               </li>
-         </ul>
-      </div>
+        <div class="flex-bloc concerned-groups" :class="getContext">
+            <persons-bloc
+                v-for="bloc in contextPersonsBlocs"
+                v-bind:key="bloc.key"
+                v-bind:bloc="bloc"
+                v-bind:blocWidth="getBlocWidth"
+                v-bind:setPersonsInBloc="setPersonsInBloc">
+            </persons-bloc>
+        </div>
+        <div v-if="getContext === 'accompanyingCourse' && suggestedEntities.length > 0">
+            <ul class="list-suggest add-items inline">
+                <li v-for="p in suggestedEntities" @click="addSuggestedEntity(p)">
+                    <span>{{ p.text }}</span>
+                </li>
+            </ul>
+        </div>

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

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

 <script>
 import { mapState, mapGetters } from 'vuex';
 import AddPersons from 'ChillPersonAssets/vuejs/_components/AddPersons.vue';
 import PersonsBloc from './ConcernedGroups/PersonsBloc.vue';
-import PersonText from 'ChillPersonAssets/vuejs/_components/Entity/PersonText.vue';

 export default {
   name: "ConcernedGroups",
   components: {
      AddPersons,
-      PersonsBloc,
-      PersonText
+      PersonsBloc
   },
   data() {
      return {
--- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/ConcernedGroups/PersonBadge.vue
+++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/ConcernedGroups/PersonBadge.vue
@@ -1,29 +1,21 @@
 <template>
   <li>
      <span :title="person.text">
-         <span class="chill_denomination" @click.prevent="$emit('remove', person)">
-            <person-text :person="person" :isCut="true"></person-text>
-         </span>
+         <span class="chill_denomination" @click.prevent="$emit('remove', person)">{{ textCutted }}</span>
      </span>
   </li>
 </template>

 <script>
-import PersonText from 'ChillPersonAssets/vuejs/_components/Entity/PersonText.vue';
-
-
 export default {
   name: "PersonBadge",
   props: ['person'],
-   components: {
-      PersonText
+   computed: {
+      textCutted() {
+         let more = (this.person.text.length > 15) ?'…' : '';
+         return this.person.text.slice(0,15) + more;
+      }
   },
-   // computed: {
-   //    textCutted() {
-   //       let more = (this.person.text.length > 15) ?'…' : '';
-   //       return this.person.text.slice(0,15) + more;
-   //    }
-   // },
   emits: ['remove'],
 }
 </script>
--- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/Location.vue
+++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/Location.vue
@@ -15,16 +15,14 @@
                    :searchable="true"
                    :placeholder="$t('activity.choose_location')"
                    :custom-label="customLabel"
-                    :select-label="$t('multiselect.select_label')"
-                    :deselect-label="$t('multiselect.deselect_label')"
-                    :selected-label="$t('multiselect.selected_label')"
                    :options="availableLocations"
                    group-values="locations"
                    group-label="locationGroup"
                    v-model="location"
                >
                </VueMultiselect>
-                <new-location v-bind:availableLocations="availableLocations"></new-location>
+
+                <new-location v-bind:locations="locations"></new-location>
            </div>
        </div>
    </teleport>
@@ -34,6 +32,7 @@
 import { mapState, mapGetters } from "vuex";
 import VueMultiselect from "vue-multiselect";
 import NewLocation from "./Location/NewLocation.vue";
+import { getLocations, getLocationTypeByDefaultFor, getUserCurrentLocation } from "../api.js";

 export default {
    name: "Location",
--- 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,15 @@
                </template>
                <template v-slot:body>
                    <form>
+                        <div class="form-floating mb-3">
+                            <p v-if="errors.length">
+                                <b>{{ $t('activity.errors') }}</b>
+                                <ul>
+                                    <li v-for="error in errors" :key="error">{{ error }}</li>
+                                </ul>
+                            </p>
+                        </div>
+
                        <div class="form-floating mb-3">
                            <select class="form-select form-select-lg" id="type" required v-model="selectType">
                                <option selected disabled value="">{{ $t('activity.choose_location_type') }}</option>
@@ -53,12 +62,6 @@
                            <input class="form-control form-control-lg" id="email" v-model="inputEmail" placeholder />
                            <label for="email">{{ $t('activity.location_fields.email') }}</label>
                        </div>
-
-                        <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>
@@ -78,8 +81,7 @@
 import Modal from 'ChillMainAssets/vuejs/_components/Modal.vue';
 import AddAddress from "ChillMainAssets/vuejs/Address/components/AddAddress.vue";
 import { mapState } from "vuex";
-import { getLocationTypes } from "../../api";
-import { makeFetch } from 'ChillMainAssets/lib/api/apiMethods';
+import { getLocationTypes, postLocation } from "../../api";

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

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

@@ -21,18 +21,18 @@
               label="text"
               track-by="id"
               open-direction="bottom"
-               :close-on-select="true"
-               :preserve-search="false"
-               :reset-after="true"
-               :hide-selected="true"
-               :taggable="false"
-               :multiple="false"
-               :searchable="true"
-               :allow-empty="true"
-               :show-labels="false"
-               :loading="issueIsLoading"
-               :placeholder="$t('activity.choose_other_social_issue')"
-               :options="socialIssuesOther"
+               v-bind:close-on-select="true"
+               v-bind:preserve-search="false"
+               v-bind:reset-after="true"
+               v-bind:hide-selected="true"
+               v-bind:taggable="false"
+               v-bind:multiple="false"
+               v-bind:searchable="true"
+               v-bind:allow-empty="true"
+               v-bind:show-labels="false"
+               v-bind:loading="issueIsLoading"
+               v-bind:placeholder="$t('activity.choose_other_social_issue')"
+               v-bind:options="socialIssuesOther"
               @select="addIssueInList">
            </VueMultiselect>
            </div>
@@ -58,9 +58,9 @@
                 <check-social-action
                     v-if="socialIssuesSelected.length || socialActionsSelected.length"
                     v-for="action in socialActionsList"
-                     :key="action.id"
-                     :action="action"
-                     :selection="socialActionsSelected"
+                     v-bind:key="action.id"
+                     v-bind:action="action"
+                     v-bind:selection="socialActionsSelected"
                     @updateSelected="updateActionsSelected">
                 </check-social-action>
             </template>
--- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/i18n.js
+++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/i18n.js
@@ -1,5 +1,4 @@
 import { personMessages } from 'ChillPersonAssets/vuejs/_js/i18n'
-import { multiSelectMessages } from 'ChillMainAssets/vuejs/_js/i18n'

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

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

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

 import App from './App.vue';

 const i18n = _createI18n(activityMessages);

-// app for activity
-
 const hasSocialIssues = document.querySelector('#social-issues-acc') !== null;
 const hasLocation = document.querySelector('#location') !== null;
 const hasPerson = document.querySelector('#add-persons') !== null;

 const app = createApp({
-   template: `<app
-       :hasSocialIssues="hasSocialIssues"
-       :hasLocation="hasLocation"
-       :hasPerson="hasPerson"
-    ></app>`,
+   template: `<app :hasSocialIssues="hasSocialIssues", :hasLocation="hasLocation", :hasPerson="hasPerson"></app>`,
    data() {
       return {
           hasSocialIssues,
@@ -33,54 +25,3 @@ const app = createApp({
 .use(i18n)
 .component('app', App)
 .mount('#activity');
-
-
-// app for picking template
-
-const i18nGendoc = _createI18n({});
-
-document.querySelectorAll('div[data-docgen-template-picker]').forEach(el => {
-    fetchTemplates(el.dataset.entityClass).then(templates => {
-        const picker = {
-            template:
-                '<pick-template :templates="this.templates" :preventDefaultMoveToGenerate="true" ' +
-                    ':entityClass="faked" @go-to-generate-document="generateDoc"></pick-template>',
-            components: {
-                PickTemplate,
-            },
-            data() {
-                return {
-                    templates: templates,
-                    entityId: el.dataset.entityId,
-                }
-            },
-            methods: {
-                generateDoc({event, link, template}) {
-                    console.log('generateDoc');
-                    console.log('link', link);
-                    console.log('template', template);
-
-                    let hiddenInput = document.querySelector("input[data-template-id]");
-
-                    if (hiddenInput === null) {
-                        console.error('hidden input not found');
-                        return;
-                    }
-
-                    hiddenInput.value = template;
-
-                    let form = document.querySelector('form[name="chill_activitybundle_activity"');
-
-                    if (form === null) {
-                        console.error('form not found');
-                        return;
-                    }
-
-                    form.submit();
-                }
-            }
-        };
-        createApp(picker).use(i18nGendoc).mount(el);
-    })
-
-});
--- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/store.js
+++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/store.js
@@ -240,9 +240,6 @@ const store = createStore({
            });
            commit("updateActionsSelected", payload);
        },
-        addAvailableLocationGroup({ commit }, payload) {
-            commit("addAvailableLocationGroup", payload);
-        },
        addPersonsInvolved({ commit }, payload) {
            //console.log('### action addPersonsInvolved', payload.result.type);
            switch (payload.result.type) {
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/_list_item.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/_list_item.html.twig
@@ -1,170 +0,0 @@
-{% set t = activity.type %}
-<div class="item-bloc activity-item{% if itemBlocClass is defined %} {{ itemBlocClass }}{% endif %}">
-
-    <div class="item-row">
-        <div class="wrap-list">
-            <div class="wl-row">
-                <div class="wl-col title">
-                    {% if activity.date %}
-                        <p class="date-label">
-                            {{ activity.date|format_date('short') }}
-                        </p>
-                    {% endif %}
-                </div>
-                <div class="wl-col list">
-                    <h2 class="badge-title">
-                        <span class="title_label"></span>
-                        <span class="title_action">
-                            {{ activity.type.name | localize_translatable_string }}
-
-                            {% if activity.emergency %}
-                                <span class="badge bg-danger rounded-pill fs-6 float-end">{{ 'Emergency'|trans|upper }}</span>
-                            {% endif %}
-                        </span>
-                    </h2>
-                </div>
-            </div>
-        </div>
-    </div>
-
-    <div class="item-row column separator">
-        <div class="wrap-list">
-            {% if activity.location and t.locationVisible %}
-                <div class="wl-row">
-                    <div class="wl-col title"><h3>{{ 'location'|trans }}</h3></div>
-                    <div class="wl-col list">
-                        <p class="wl-item">
-                            {{ activity.location.name }}
-                            <span>({{ activity.location.locationType.title|localize_translatable_string }})</span>
-                        </p>
-                    </div>
-                </div>
-            {% endif %}
-
-            {% if activity.attendee and t.attendeeVisible %}
-                <div class="wl-row">
-                    <div class="wl-col title"><h3>{{ 'Attendee'|trans }}</h3></div>
-                    <div class="wl-col list">
-                        <p class="wl-item">
-                            {{ activity.attendee.name|localize_translatable_string }}
-                        </p>
-                    </div>
-                </div>
-            {% endif %}
-
-            {% if activity.sentReceived is not empty and t.sentReceivedVisible %}
-                <div class="wl-row">
-                    <div class="wl-col title"><h3>{{ 'Sent received'|trans }}</h3></div>
-                    <div class="wl-col list">
-                        <p class="wl-item">
-                            {{ activity.sentReceived|capitalize|trans }}
-                        </p>
-                    </div>
-                </div>
-            {% endif %}
-
-            {% if activity.user and t.userVisible %}
-                <div class="wl-row">
-                    <div class="wl-col title"><h3>{{ 'Referrer'|trans }}</h3></div>
-                    <div class="wl-col list">
-                        <p class="wl-item">
-                            {{ activity.user|chill_entity_render_box }}
-                        </p>
-                    </div>
-                </div>
-            {% endif %}
-        </div>
-
-        {% include 'ChillActivityBundle:Activity:concernedGroups.html.twig' with {
-            'context': context,
-            'render': 'wrap-list',
-            'entity': activity,
-            'badge_person': true
-        } %}
-
-        <div class="wrap-list">
-            {%- if activity.reasons is not empty and t.reasonsVisible -%}
-                <div class="wl-row">
-                    <div class="wl-col title">
-                        <h3>{{ 'Reasons'|trans }}</h3>
-                    </div>
-                    <div class="wl-col list">
-                        {% for r in activity.reasons %}
-                            <p class="wl-item reasons">
-                                {{ r|chill_entity_render_box }}
-                            </p>
-                        {% endfor %}
-                    </div>
-                </div>
-            {% endif %}
-
-            {%- if activity.socialIssues is not empty and t.socialIssuesVisible -%}
-                <div class="wl-row">
-                    <div class="wl-col title">
-                        <h3>{{ 'Social issues'|trans }}</h3>
-                    </div>
-                    <div class="wl-col list">
-                        {% for r in activity.socialIssues %}
-                            <p class="wl-item social-issues">
-                                {{ r|chill_entity_render_box }}
-                            </p>
-                        {% endfor %}
-                    </div>
-                </div>
-            {% endif %}
-
-            {%- if activity.socialActions is not empty and t.socialActionsVisible -%}
-                <div class="wl-row">
-                    <div class="wl-col title">
-                        <h3>{{ 'Social actions'|trans }}</h3>
-                    </div>
-                    <div class="wl-col list">
-                        {% for r in activity.socialActions %}
-                            <p class="wl-item social-actions">
-                                {{ r|chill_entity_render_box }}
-                            </p>
-                        {% endfor %}
-                    </div>
-                </div>
-            {% endif %}
-
-            {% if activity.comment.comment is not empty and is_granted('CHILL_ACTIVITY_SEE_DETAILS', activity) %}
-                <div class="wl-row">
-                    <div class="wl-col title">
-                        <h3>{{ 'Comment'|trans }}</h3>
-                    </div>
-                    <div class="wl-col list">
-                        {{ activity.comment|chill_entity_render_box({
-                            'disable_markdown': false,
-                            'limit_lines': 3,
-                            'metadata': false
-                        }) }}
-                    </div>
-                </div>
-            {% endif %}
-
-            {#  Only if ACL SEE_DETAILS AND/OR only on template SHOW ??
-                durationTime
-                travelTime
-                comment
-                documents
-                attendee
-            #}
-        </div>
-    </div>
-
-    <div class="item-row separator">
-        <div class="item-col item-meta">
-            {% set notif_counter = chill_count_notifications('Chill\\ActivityBundle\\Entity\\Activity', activity.id) %}
-            {% if notif_counter.total > 0 %}
-                {{ chill_counter_notifications('Chill\\ActivityBundle\\Entity\\Activity', activity.id) }}
-            {% endif %}
-        </div>
-        <div class="item-col">
-            <ul class="record_actions">
-                {{ recordAction }}
-            </ul>
-        </div>
-    </div>
-
-</div>
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/concernedGroups.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/concernedGroups.html.twig
@@ -3,13 +3,11 @@
    {{ path(pathname, parms) }}
 {% endmacro %}

-{% macro insert_onthefly(type, entity, parent = null) %}
+{% macro insert_onthefly(type, entity) %}
    {% include '@ChillMain/OnTheFly/_insert_vue_onthefly.html.twig' with {
        action: 'show', displayBadge: true,
        targetEntity: { name: type, id: entity.id },
-        buttonText: entity|chill_entity_render_string,
-        isDead: entity.deathdate is defined and entity.deathdate is not null,
-        parent: parent
+        buttonText: entity|chill_entity_render_string
    } %}
 {% endmacro %}

@@ -61,7 +59,7 @@
    }]) %}
 {% endif %}

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

@@ -92,7 +90,7 @@
 </div>
 {% endif %}

-{% if (render == 'row') %}
+{% if (with_display == 'row') %}
 <div class="concerned-groups">
    {% for bloc in blocks %}
    <div class="group">
@@ -117,7 +115,7 @@
 </div>
 {% endif %}

-{% if (render == 'wrap-list') %}
+{% if (with_display == 'wrap-list') %}
 <div class="concerned-groups wrap-list">
    {% for bloc in blocks %}
        <div class="wl-row">
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/edit.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/edit.html.twig
@@ -83,15 +83,15 @@
    {{ form_row(edit_form.comment) }}
 {% endif %}

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

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

 {% set person_id = null %}
 {% if entity.person %}
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/editAccompanyingCourse.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/editAccompanyingCourse.html.twig
@@ -15,7 +15,7 @@

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

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

    {% if activities|length == 0 %}
@@ -70,10 +8,203 @@
    {% else %}
        <div class="flex-table activity-list">
            {% for activity in activities %}
-                {% include 'ChillActivityBundle:Activity:_list_item.html.twig' with {
-                    'context': context,
-                    'recordAction': _self.recordAction(activity, context, person_id, accompanying_course_id)
-                } %}
+                {% set t = activity.type %}
+                <div class="item-bloc">
+
+                    <div class="item-row">
+                        <div class="wrap-list">
+                            <div class="wl-row">
+                                <div class="wl-col title">
+                                    {% if activity.date %}
+                                        <p class="date-label">
+                                            {{ activity.date|format_date('short') }}
+                                        </p>
+                                    {% endif %}
+                                </div>
+                                <div class="wl-col list">
+                                    <h2 class="badge-title">
+                                        <span class="title_label"></span>
+                                        <span class="title_action">
+                                            {{ activity.type.name | localize_translatable_string }}
+
+                                            {% if activity.emergency %}
+                                                <span class="badge bg-danger rounded-pill fs-6 float-end">{{ 'Emergency'|trans|upper }}</span>
+                                            {% endif %}
+                                        </span>
+                                    </h2>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+
+                    <div class="item-row column separator">
+                        <div class="wrap-list">
+                            {% if activity.location and t.locationVisible %}
+                                <div class="wl-row">
+                                    <div class="wl-col title"><h3>{{ 'location'|trans }}</h3></div>
+                                    <div class="wl-col list">
+                                        <p class="wl-item">
+                                            <span>{{ activity.location.locationType.title|localize_translatable_string }}</span>
+                                            {{ activity.location.name }}
+                                        </p>
+                                    </div>
+                                </div>
+                            {% endif %}
+
+                            {% if activity.sentReceived is not empty and t.sentReceivedVisible %}
+                                <div class="wl-row">
+                                    <div class="wl-col title"><h3>{{ 'Sent received'|trans }}</h3></div>
+                                    <div class="wl-col list">
+                                        <p class="wl-item">
+                                            {{ activity.sentReceived|capitalize|trans }}
+                                        </p>
+                                    </div>
+                                </div>
+                            {% endif %}
+
+                            {% if activity.user and t.userVisible %}
+                                <div class="wl-row">
+                                    <div class="wl-col title"><h3>{{ 'Referrer'|trans }}</h3></div>
+                                    <div class="wl-col list">
+                                        <p class="wl-item">
+                                            {{ activity.user.usernameCanonical|chill_entity_render_string|capitalize }}
+                                        </p>
+                                    </div>
+                                </div>
+                            {% endif %}
+                        </div>
+
+                        {% include 'ChillActivityBundle:Activity:concernedGroups.html.twig' with {
+                            'context': context,
+                            'with_display': 'wrap-list',
+                            'entity': activity,
+                            'badge_person': true
+                        } %}
+
+                        <div class="wrap-list">
+                            {%- if activity.reasons is not empty and t.reasonsVisible -%}
+                                <div class="wl-row">
+                                    <div class="wl-col title">
+                                        <h3>{{ 'Reasons'|trans }}</h3>
+                                    </div>
+                                    <div class="wl-col list">
+                                        {% for r in activity.reasons %}
+                                            <p class="wl-item reasons">
+                                                {{ r|chill_entity_render_box }}
+                                            </p>
+                                        {% endfor %}
+                                    </div>
+                                </div>
+                            {% endif %}
+
+                            {%- if activity.socialIssues is not empty and t.socialIssuesVisible -%}
+                                <div class="wl-row">
+                                    <div class="wl-col title">
+                                        <h3>{{ 'Social issues'|trans }}</h3>
+                                    </div>
+                                    <div class="wl-col list">
+                                        {% for r in activity.socialIssues %}
+                                            <p class="wl-item social-issues">
+                                                {{ r|chill_entity_render_box }}
+                                            </p>
+                                        {% endfor %}
+                                    </div>
+                                </div>
+                            {% endif %}
+
+                            {%- if activity.socialActions is not empty and t.socialActionsVisible -%}
+                                <div class="wl-row">
+                                    <div class="wl-col title">
+                                        <h3>{{ 'Social actions'|trans }}</h3>
+                                    </div>
+                                    <div class="wl-col list">
+                                        {% for r in activity.socialActions %}
+                                            <p class="wl-item social-actions">
+                                                {{ r|chill_entity_render_box }}
+                                            </p>
+                                        {% endfor %}
+                                    </div>
+                                </div>
+                            {% endif %}
+
+                            {% if activity.comment.comment is not empty and is_granted('CHILL_ACTIVITY_SEE_DETAILS', activity) %}
+                                <div class="wl-row">
+                                    <div class="wl-col title">
+                                        <h3>{{ 'Comment'|trans }}</h3>
+                                    </div>
+                                    <div class="wl-col list">
+                                        {{ activity.comment|chill_entity_render_box({
+                                            'disable_markdown': false,
+                                            'limit_lines': 3,
+                                            'metadata': false
+                                        }) }}
+                                    </div>
+                                </div>
+                            {% endif %}
+                            
+                            {#  Only if ACL SEE_DETAILS AND/OR only on template SHOW ??
+                                durationTime
+                                travelTime
+                                comment
+                                documents
+                                attendee
+                            #}
+                        </div>
+                    </div>
+
+                    <div class="item-row separator">
+                        <ul class="record_actions">
+                            {% if context == 'person' and activity.accompanyingPeriod is not empty %}
+                                {#
+                                    Disable person_id in following links, for redirect to accompanyingCourse context
+                                #}
+                                {% set person_id = null %}
+                                {% set accompanying_course_id = activity.accompanyingPeriod.id %}
+                                <li>
+                                    <a href="{{ chill_path_add_return_path('chill_activity_activity_list',{
+                                           'accompanying_period_id': accompanying_course_id
+                                       }) }}"
+                                       class="btn btn-primary"
+                                       title="{{ 'See activity in accompanying course context'|trans }}">
+                                       <i class="fa fa-random fa-fw"></i>
+                                       {{ 'Period number %number%'|trans({'%number%': accompanying_course_id}) }}
+                                    </a>
+                                </li>
+                            {% endif %}
+                            <li>
+                                <a href="{{ path('chill_activity_activity_show', {'id': activity.id,
+                                        'person_id': person_id,
+                                        'accompanying_period_id': accompanying_course_id
+                                    }) }}"
+                                   class="btn btn-show"
+                                   title="{{ 'Show'|trans }}"></a>
+                            </li>
+                            {% if no_action is not defined or no_action == false %}
+                                {% if is_granted('CHILL_ACTIVITY_UPDATE', activity) %}
+                                    <li>
+                                        <a href="{{ path('chill_activity_activity_edit', {'id': activity.id,
+                                                'person_id': person_id,
+                                                'accompanying_period_id': accompanying_course_id
+                                            }) }}"
+                                           class="btn btn-update"
+                                           title="{{ 'Edit'|trans }}"></a>
+                                    </li>
+                                {% endif %}
+                                {% if is_granted('CHILL_ACTIVITY_DELETE', activity) %}
+                                    <li>
+                                        <a href="{{ path('chill_activity_activity_delete', {'id': activity.id,
+                                                'person_id': person_id,
+                                                'accompanying_period_id': accompanying_course_id
+                                            }) }}"
+                                           class="btn btn-delete"
+                                           title="{{ 'Delete'|trans }}"></a>
+                                    </li>
+                                {% endif %}
+                            {% endif %}
+                        </ul>
+                    </div>
+
+                </div>
            {% endfor %}
        </div>
    {% endif %}
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/listAccompanyingCourse.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/listAccompanyingCourse.html.twig
@@ -4,17 +4,6 @@

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

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

    {% set person_id = null %}
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/listPerson.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/listPerson.html.twig
@@ -20,16 +20,6 @@

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

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

    {% set person_id = null %}
--- 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,14 +41,14 @@
                        {% if activity.user and t.userVisible %}
                            <li>
                                <span class="item-key">{{ 'Referrer'|trans ~ ': ' }}</span>
-                                <b>{{ activity.user|chill_entity_render_box}}</b>
+                                <b>{{ activity.user.usernameCanonical }}</b>
                            </li>
                        {% endif %}

                        <li class="associated-persons">
                            <span class="item-key">{{ 'Participants'|trans ~ ' : ' }}</span>
                            {% for p in activity.personsAssociated %}
-                                <span class="badge-person">{{ p|chill_entity_render_box({'addAgeBadge': true}) }}</span>
+                                <span class="badge-person">{{ p|chill_entity_render_box }}</span>
                            {% endfor %}
                        </li>
                    </ul>
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/new.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/new.html.twig
@@ -87,7 +87,6 @@

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

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

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

-                    <div class="btn btn-primary">
+                    <div class="bloc btn btn-primary btn-lg btn-block">
                        {{ activityType.name|localize_translatable_string }}
                    </div>
                </a>
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig
@@ -34,7 +34,7 @@
        <div class="item-row separator">
            <dl class="chill_view_data">
                <dt class="inline">{{ 'Referrer'|trans|capitalize }}</dt>
-                <dd>{{ entity.user|chill_entity_render_box }}</dd>
+                <dd>{{ entity.user }}</dd>

                {%- if entity.scope -%}
                    <dt class="inline">{{ 'Scope'|trans }}</dt>
@@ -85,8 +85,8 @@

 {% include 'ChillActivityBundle:Activity:concernedGroups.html.twig' with {
    'context': context,
-    'render': 'bloc',
-    'badge_person': true
+    'with_display': 'bloc',
+    'badge_person': 'true'
 } %}

 <h2 class="chill-blue">{{ 'Activity data'|trans }}</h2>
@@ -103,8 +103,8 @@
                <dd>
                    {% if entity.location is not null %}
                        <p>
+                            <span>{{ entity.location.locationType.title|localize_translatable_string }}</span>
                            {{ entity.location.name }}
-                            <span>({{ entity.location.locationType.title|localize_translatable_string }})</span>
                        </p>
                        <div class="ms-3">{{ entity.location.address|chill_entity_render_box }}</div>
                    {% else %}
@@ -165,7 +165,11 @@
                <dt class="inline">{{ 'Attendee'|trans }}</dt>
                <dd>
                    {% if entity.attendee is not null %}
-                        {{ entity.attendee.name|localize_translatable_string }}
+                        {% if entity.attendee %}
+                            {{ 'present'|trans|capitalize }}
+                        {% else %}
+                            {{ 'not present'|trans|capitalize }}
+                        {% endif %}
                    {% else %}
                        <span class="chill-no-data-statement">{{ 'None'|trans|capitalize }}</span>
                    {% endif %}
@@ -177,13 +181,6 @@
    </div>
 </div>

-<div class="notification notification-list">
-    {% set notifications =  chill_list_notifications('Chill\\ActivityBundle\\Entity\\Activity', entity.id) %}
-    {% if notifications is not empty %}
-        {{ notifications|raw }}
-    {% endif %}
-</div>
-
 {% set person_id = null %}
 {% if person %}
    {% set person_id = person.id %}
@@ -200,21 +197,24 @@
            {{ 'Back to the list'|trans }}
        </a>
    </li>
+    {% if is_granted('CHILL_ACTIVITY_UPDATE', entity) %}
    <li>
-        <a class="btn btn-notify" href="{{ chill_path_add_return_path('chill_main_notification_create', {'entityClass': 'Chill\\ActivityBundle\\Entity\\Activity', 'entityId': entity.id}) }}">
-            {{ 'notification.Notify'|trans }}
+        <a class="btn btn-update" href="{{ path('chill_activity_activity_edit', { 'id': entity.id, 'person_id': person_id, 'accompanying_period_id': accompanying_course_id }) }}">
+            {{ 'Edit'|trans }}
        </a>
    </li>
-    {% if is_granted('CHILL_ACTIVITY_UPDATE', entity) %}
-        <li>
-            <a href="{{ path('chill_activity_activity_edit', { 'id': entity.id, 'person_id': person_id, 'accompanying_period_id': accompanying_course_id }) }}"
-               class="btn btn-update">{{ 'Edit'|trans }}</a>
-        </li>
    {% endif %}
    {% if is_granted('CHILL_ACTIVITY_DELETE', entity) %}
    <li>
-        <a href="{{ path('chill_activity_activity_delete', { 'id': entity.id, 'person_id' : person_id, 'accompanying_period_id': accompanying_course_id } ) }}"
-           class="btn btn-delete" title="{{ 'Delete'|trans }}"></a>
+        <a href="{{ path('chill_activity_activity_delete', { 'id': entity.id, 'person_id' : person_id, 'accompanying_period_id': accompanying_course_id } ) }}" class="btn btn-delete">
+            {{ 'Delete'|trans }}
+        </a>
    </li>
    {% endif %}
 </ul>
+<script>
+    import ShowPane from "../../../../ChillMainBundle/Resources/public/vuejs/Address/components/ShowPane";
+    export default {
+        components: {ShowPane}
+    }
+</script>
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/showAccompanyingCourse.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/showAccompanyingCourse.html.twig
@@ -4,18 +4,6 @@

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

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

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

-{% if activity is not null %}
-    <div class="flex-table">
-        {% if is_granted('CHILL_ACTIVITY_SEE', activity) %}
-            {% include 'ChillActivityBundle:Activity:_list_item.html.twig' with {
-                'recordAction': _self.recordAction(activity),
-                'context': 'accompanyingCourse',
-                'itemBlocClass': 'bg-chill-llight-gray'
-            } %}
-        {% else %}
-            <div class="alert alert-warning border-warning border-1">
-                {{ 'This is the minimal activity data'|trans ~ ': ' ~ activity.id }}<br>
-                {{ 'you are not allowed to see it details'|trans }}
-            </div>
-        {% endif %}
-    </div>
-{% else %}
-    <div class="alert alert-warning border-warning border-1">
-        {{ 'You get notified of an activity which does not exists any more'|trans }}
-    </div>
-{% endif %}
+<a href="{{ path('chill_activity_activity_show', {'id': notification.relatedEntityId })  }}">Go to Activity</a>
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/showPerson.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/showPerson.html.twig
@@ -4,18 +4,6 @@

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

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

 {% block personcontent -%}
@@ -23,20 +11,3 @@
    {% include 'ChillActivityBundle:Activity:show.html.twig' with {'context': 'person'} %}
 </div>
 {% endblock personcontent %}
-
-{% block block_post_menu %}
-    <div class="post-menu pt-4">
-
-        <div class="d-grid gap-2">
-            <a class="btn btn-notify" href="{{ chill_path_add_return_path('chill_main_notification_create', {'entityClass': 'Chill\\ActivityBundle\\Entity\\Activity', 'entityId': entity.id}) }}">
-                {{ 'notification.Notify'|trans }}
-            </a>
-        </div>
-
-        {% set notifications =  chill_list_notifications('Chill\\ActivityBundle\\Entity\\Activity', entity.id) %}
-        {% if notifications is not empty %}
-            {{ notifications|raw }}
-        {% endif %}
-
-    </div>
-{% endblock %}
--- a/src/Bundle/ChillActivityBundle/Service/DocGenerator/ActivityContext.php
+++ b/src/Bundle/ChillActivityBundle/Service/DocGenerator/ActivityContext.php
@@ -1,216 +0,0 @@
-<?php
-
-/**
- * Chill is a software for social workers
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-declare(strict_types=1);
-
-namespace Chill\ActivityBundle\Service\DocGenerator;
-
-use Chill\ActivityBundle\Entity\Activity;
-use Chill\DocGeneratorBundle\Context\DocGeneratorContextWithAdminFormInterface;
-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\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 Doctrine\ORM\EntityManagerInterface;
-use Symfony\Bridge\Doctrine\Form\Type\EntityType;
-use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
-use Symfony\Component\Form\Extension\Core\Type\TextType;
-use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
-use Symfony\Contracts\Translation\TranslatorInterface;
-
-class ActivityContext implements
-    DocGeneratorContextWithAdminFormInterface,
-    DocGeneratorContextWithPublicFormInterface
-{
-    private BaseContextData $baseContextData;
-
-    private DocumentCategoryRepository $documentCategoryRepository;
-
-    private EntityManagerInterface $em;
-
-    private NormalizerInterface $normalizer;
-
-    private PersonRender $personRender;
-
-    private TranslatableStringHelperInterface $translatableStringHelper;
-
-    private TranslatorInterface $translator;
-
-    public function __construct(
-        DocumentCategoryRepository $documentCategoryRepository,
-        NormalizerInterface $normalizer,
-        TranslatableStringHelperInterface $translatableStringHelper,
-        EntityManagerInterface $em,
-        PersonRender $personRender,
-        TranslatorInterface $translator,
-        BaseContextData $baseContextData
-    ) {
-        $this->documentCategoryRepository = $documentCategoryRepository;
-        $this->normalizer = $normalizer;
-        $this->translatableStringHelper = $translatableStringHelper;
-        $this->em = $em;
-        $this->personRender = $personRender;
-        $this->translator = $translator;
-        $this->baseContextData = $baseContextData;
-    }
-
-    public function adminFormReverseTransform(array $data): array
-    {
-        return $data;
-    }
-
-    public function adminFormTransform(array $data): array
-    {
-        return [
-            'mainPerson' => $data['mainPerson'] ?? false,
-            'mainPersonLabel' => $data['mainPersonLabel'] ?? $this->translator->trans('docgen.Main person'),
-            'person1' => $data['person1'] ?? false,
-            'person1Label' => $data['person1Label'] ?? $this->translator->trans('docgen.person 1'),
-            'person2' => $data['person2'] ?? false,
-            'person2Label' => $data['person2Label'] ?? $this->translator->trans('docgen.person 2'),
-        ];
-    }
-
-    public function buildAdminForm(FormBuilderInterface $builder): void
-    {
-        $builder
-            ->add('mainPerson', CheckboxType::class, [
-                'required' => false,
-                'label' => 'docgen.Ask for main person',
-            ])
-            ->add('mainPersonLabel', TextType::class, [
-                'label' => 'main person label',
-                'required' => true,
-            ])
-            ->add('person1', CheckboxType::class, [
-                'required' => false,
-                'label' => 'docgen.Ask for person 1',
-            ])
-            ->add('person1Label', TextType::class, [
-                'label' => 'person 1 label',
-                'required' => true,
-            ])
-            ->add('person2', CheckboxType::class, [
-                'required' => false,
-                'label' => 'docgen.Ask for person 2',
-            ])
-            ->add('person2Label', TextType::class, [
-                'label' => 'person 2 label',
-                'required' => true,
-            ]);
-    }
-
-    /**
-     * @param Activity $entity
-     */
-    public function buildPublicForm(FormBuilderInterface $builder, DocGeneratorTemplate $template, $entity): void
-    {
-        $options = $template->getOptions();
-        $persons = $entity->getPersons();
-
-        foreach (['mainPerson', 'person1', 'person2'] as $key) {
-            if ($options[$key] ?? false) {
-                $builder->add($key, EntityType::class, [
-                    'class' => Person::class,
-                    'choices' => $persons,
-                    'choice_label' => function (Person $p) {
-                        return $this->personRender->renderString($p, []);
-                    },
-                    'multiple' => false,
-                    'expanded' => true,
-                    'label' => $options[$key . 'Label'],
-                ]);
-            }
-        }
-    }
-
-    public function getData(DocGeneratorTemplate $template, $entity, array $contextGenerationData = []): array
-    {
-        if (!$entity instanceof Activity) {
-            throw new UnexpectedTypeException($entity, Activity::class);
-        }
-        $options = $template->getOptions();
-
-        $data = [];
-        $data = array_merge($data, $this->baseContextData->getData());
-        $data['activity'] = $this->normalizer->normalize($entity, 'docgen', ['docgen:expects' => Activity::class, 'groups' => 'docgen:read']);
-
-        $data['course'] = $this->normalizer->normalize($entity->getAccompanyingPeriod(), 'docgen', ['docgen:expects' => AccompanyingPeriod::class, 'groups' => 'docgen:read']);
-        $data['person'] = $this->normalizer->normalize($entity->getPerson(), 'docgen', ['docgen:expects' => Person::class, 'groups' => 'docgen:read']);
-
-        foreach (['mainPerson', 'person1', 'person2'] as $k) {
-            if ($options[$k]) {
-                $data[$k] = $this->normalizer->normalize($contextGenerationData[$k], 'docgen', [
-                    'docgen:expects' => Person::class,
-                    'groups' => 'docgen:read',
-                    'docgen:person:with-household' => true,
-                    'docgen:person:with-relations' => true,
-                ]);
-            }
-        }
-
-        return $data;
-    }
-
-    public function getDescription(): string
-    {
-        return 'docgen.A basic context for activity';
-    }
-
-    public function getEntityClass(): string
-    {
-        return Activity::class;
-    }
-
-    public function getFormData(DocGeneratorTemplate $template, $entity): array
-    {
-        return [
-            'activity' => $entity,
-        ];
-    }
-
-    public static function getKey(): string
-    {
-        return self::class;
-    }
-
-    public function getName(): string
-    {
-        return 'docgen.Activity basic';
-    }
-
-    public function hasAdminForm(): bool
-    {
-        return true;
-    }
-
-    public function hasPublicForm(DocGeneratorTemplate $template, $entity): bool
-    {
-        $options = $template->getOptions();
-
-        return $options['mainPerson'] || $options['person1'] || $options['person2'];
-    }
-
-    /**
-     * @param Activity $entity
-     */
-    public function storeGenerated(DocGeneratorTemplate $template, StoredObject $storedObject, object $entity, array $contextGenerationData): void
-    {
-        $entity->addDocument($storedObject);
-
-        $this->em->persist($storedObject);
-    }
-}
--- 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\Export\Aggregator;
+namespace Chill\ActivityBundle\Tests\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\Export\Aggregator;
+namespace Chill\ActivityBundle\Tests\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\Export\Aggregator;
+namespace Chill\ActivityBundle\Tests\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\Export\Filter;
+namespace Chill\ActivityBundle\Tests\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\Export\Filter;
+namespace Chill\ActivityBundle\Tests\Filter;

 use Chill\MainBundle\Test\Export\AbstractFilterTest;
 use DateTime;
--- a/src/Bundle/ChillActivityBundle/Tests/Security/Authorization/ActivityVoterTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Security/Authorization/ActivityVoterTest.php
@@ -29,13 +29,9 @@ use Symfony\Component\Security\Core\Authorization\Voter\VoterInterface;
 final class ActivityVoterTest extends KernelTestCase
 {
    use PrepareActivityTrait;
-
    use PrepareCenterTrait;
-
    use PreparePersonTrait;
-
    use PrepareScopeTrait;
-
    use PrepareUserTrait;

    /**
--- a/src/Bundle/ChillActivityBundle/config/services.yaml
+++ b/src/Bundle/ChillActivityBundle/config/services.yaml
@@ -32,8 +32,3 @@ services:
        autowire: true
        autoconfigure: true
        resource: '../Validator/Constraints/'
-
-    Chill\ActivityBundle\Service\DocGenerator\:
-        autowire: true
-        autoconfigure: true
-        resource: '../Service/DocGenerator/'
--- a/src/Bundle/ChillActivityBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillActivityBundle/translations/messages.fr.yml
@@ -76,7 +76,7 @@ activity:
    Insert a document: Insérer un document
    Remove a document: Supprimer le document
    comment: Commentaire
-No documents: Pas de documents
+

 #timeline
 '%user% has done an %activity_type%': '%user% a effectué une activité de type "%activity_type%"'
@@ -224,11 +224,3 @@ Aggregate by activity reason: Aggréger par sujet de l'activité
 Last activities: Les dernières activités

 See activity in accompanying course context: Voir l'activité dans le contexte du parcours d'accompagnement
-
-You get notified of an activity which does not exists any more: Cette notification ne correspond pas à une activité valide.
-you are not allowed to see it details: La notification fait référence à une activité à laquelle vous n'avez pas accès.
-This is the minimal activity data: Activité n°
-
-docgen:
-    Activity basic: Echange
-    A basic context for activity: Contexte pour les échanges
--- a/src/Bundle/ChillActivityBundle/translations/validators.fr.yml
+++ b/src/Bundle/ChillActivityBundle/translations/validators.fr.yml
@@ -20,4 +20,3 @@ For this type of activity, you must add at least one social action: Pour ce type

 # admin
 This parameter must be equal to social issue parameter: Ce paramètre doit être égal au paramètre "Visibilité du champs Problématiques sociales"
-The socialActionsVisible value is not compatible with the socialIssuesVisible value: Cette valeur du paramètre "Visibilité du champs Actions sociales" n'est pas compatible avec la valeur du paramètre "Visibilité du champs Problématiques sociales"
--- a/src/Bundle/ChillAsideActivityBundle/src/Controller/AsideActivityController.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Controller/AsideActivityController.php
@@ -32,8 +32,6 @@ final class AsideActivityController extends CRUDController
    {
        $asideActivity = new AsideActivity();

-        $asideActivity->setAgent($this->getUser());
-
        $duration = $request->query->get('duration', '300');
        $duration = DateTime::createFromFormat('U', $duration);
        $asideActivity->setDuration($duration);
--- a/src/Bundle/ChillAsideActivityBundle/src/Entity/AsideActivityCategory.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Entity/AsideActivityCategory.php
@@ -167,6 +167,7 @@ class AsideActivityCategory
        }

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

        return $this;
    }
--- a/src/Bundle/ChillAsideActivityBundle/src/Form/AsideActivityFormType.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Form/AsideActivityFormType.php
@@ -14,9 +14,9 @@ namespace Chill\AsideActivityBundle\Form;
 use Chill\AsideActivityBundle\Entity\AsideActivity;
 use Chill\AsideActivityBundle\Entity\AsideActivityCategory;
 use Chill\AsideActivityBundle\Templating\Entity\CategoryRender;
+use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Form\Type\ChillDateType;
 use Chill\MainBundle\Form\Type\ChillTextareaType;
-use Chill\MainBundle\Form\Type\PickUserDynamicType;
 use DateInterval;
 use DateTime;
 use DateTimeImmutable;
@@ -68,10 +68,22 @@ final class AsideActivityFormType extends AbstractType
        ];

        $builder
-            ->add('agent', PickUserDynamicType::class, [
-                'label' => 'For agent',
-                'required' => true,
-            ])
+            ->add(
+                'agent',
+                EntityType::class,
+                [
+                    'label' => 'For agent',
+                    'required' => true,
+                    'class' => User::class,
+                    'data' => $this->storage->getToken()->getUser(),
+                    'query_builder' => static function (EntityRepository $er) {
+                        return $er->createQueryBuilder('u')->where('u.enabled = true');
+                    },
+                    'attr' => ['class' => 'select2 '],
+                    'placeholder' => 'Choose the agent for whom this activity is created',
+                    'choice_label' => 'username',
+                ]
+            )
            ->add(
                'date',
                ChillDateType::class,
--- a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/new.html.twig
+++ b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/new.html.twig
@@ -1,15 +1,5 @@
 {% extends '@ChillMain/Admin/layout.html.twig' %}

-{% block js %}
-    {{ parent() }}
-    {{ encore_entry_script_tags('mod_pickentity_type') }}
-{% endblock %}
-
-{% block css %}
-    {{ parent() }}
-    {{ encore_entry_link_tags('mod_pickentity_type') }}
-{% endblock %}
-
 {% block title %}
 {% include('@ChillMain/CRUD/_new_title.html.twig') %}
 {% endblock %}
@@ -18,5 +8,4 @@
 {% embed '@ChillMain/CRUD/_new_content.html.twig' %}
    {% block content_form_actions_save_and_show %}{% endblock %}
 {% endembed %}
-{% endblock %}
-
+{% endblock %}
--- a/src/Bundle/ChillCalendarBundle/Form/CalendarType.php
+++ b/src/Bundle/ChillCalendarBundle/Form/CalendarType.php
@@ -97,6 +97,8 @@ class CalendarType extends AbstractType
                    return $res;
                },
                static function (?string $dateAsString): DateTimeImmutable {
+                    dump($dateAsString);
+
                    return new DateTimeImmutable($dateAsString);
                }
            ));
--- a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/_components/CalendarUserSelector/CalendarUserSelector.vue
+++ b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/_components/CalendarUserSelector/CalendarUserSelector.vue
@@ -13,9 +13,6 @@
        :close-on-select="false"
        :allow-empty="true"
        :model-value="value"
-        :select-label="$t('multiselect.select_label')"
-        :deselect-label="$t('multiselect.deselect_label')"
-        :selected-label="$t('multiselect.selected_label')"
        @select="selectUsers"
        @remove="unSelectUsers"
        @close="coloriseSelectedValues"
--- a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/_components/CalendarUserSelector/js/i18n.js
+++ b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/_components/CalendarUserSelector/js/i18n.js
@@ -1,17 +1,13 @@
-import { multiSelectMessages } from 'ChillMainAssets/vuejs/_js/i18n'
-
 const calendarUserSelectorMessages = {
-  fr: {
-    choose_your_calendar_user: "Afficher les plages de disponibilités",
-    select_user: "Sélectionnez des calendriers",
-    show_my_calendar: "Afficher mon calendrier",
-    show_weekends: "Afficher les week-ends"
-  }
-};
+    fr: {
+      choose_your_calendar_user: "Afficher les plages de disponibilités",
+      select_user: "Sélectionnez des calendriers",
+      show_my_calendar: "Afficher mon calendrier",
+      show_weekends: "Afficher les week-ends"
+    }
+ };
 
-Object.assign(calendarUserSelectorMessages.fr, multiSelectMessages.fr);
-
-export {
-  calendarUserSelectorMessages
-};
+ export {
+   calendarUserSelectorMessages
+ };
 
--- a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/listByAccompanyingCourse.html.twig
+++ b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/listByAccompanyingCourse.html.twig
@@ -94,7 +94,7 @@
                    <div class="item-col">
                        {% include 'ChillActivityBundle:Activity:concernedGroups.html.twig' with {
                            'context': accompanyingCourse,
-                            'render': 'row',
+                            'with_display': 'row',
                            'entity': calendar
                        } %}
                    </div>
--- a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/show.html.twig
+++ b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/show.html.twig
@@ -6,7 +6,7 @@
 </dl>

 <h2 class="chill-red">{{ 'Concerned groups'|trans }}</h2>
-{% include 'ChillActivityBundle:Activity:concernedGroups.html.twig' with {'context': context, 'render': 'bloc' } %}
+{% include 'ChillActivityBundle:Activity:concernedGroups.html.twig' with {'context': context, 'with_display': 'bloc' } %}


 <h2 class="chill-red">{{ 'Calendar data'|trans }}</h2>
@@ -108,13 +108,13 @@
    {# TODO
    {% if is_granted('CHILL_ACTIVITY_DELETE', entity) %}
    #}
-
+    
    <li>
        <a href="{{ path('chill_calendar_calendar_delete', { 'id': entity.id, 'accompanying_period_id': accompanying_course_id, 'user_id': user_id } ) }}" class="btn btn-delete">
            {{ 'Delete'|trans }}
        </a>
    </li>
-
+    
    {#
    {% endif %}
    #}
--- a/src/Bundle/ChillCustomFieldsBundle/Tests/CustomFields/CustomFieldsChoiceTest.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Tests/CustomFields/CustomFieldsChoiceTest.php
@@ -9,7 +9,7 @@

 declare(strict_types=1);

-namespace Chill\CustomFieldsBundle\Tests\CustomFields;
+namespace Chill\CustomFieldsBundle\Tests;

 use Chill\CustomFieldsBundle\CustomFields\CustomFieldChoice;
 use Chill\CustomFieldsBundle\Entity\CustomField;
--- a/src/Bundle/ChillCustomFieldsBundle/Tests/CustomFields/CustomFieldsNumberTest.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Tests/CustomFields/CustomFieldsNumberTest.php
@@ -9,7 +9,7 @@

 declare(strict_types=1);

-namespace Chill\CustomFieldsBundle\Tests\CustomFields;
+namespace Chill\CustomFieldsBundle\Tests;

 use Chill\CustomFieldsBundle\CustomFields\CustomFieldNumber;
 use Chill\CustomFieldsBundle\Entity\CustomField;
--- a/src/Bundle/ChillCustomFieldsBundle/Tests/CustomFields/CustomFieldsTextTest.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Tests/CustomFields/CustomFieldsTextTest.php
@@ -9,11 +9,10 @@

 declare(strict_types=1);

-namespace Chill\CustomFieldsBundle\Tests\CustomFields;
+namespace Chill\CustomFieldsBundle\Tests;

 use Chill\CustomFieldsBundle\CustomFields\CustomFieldText;
 use Chill\CustomFieldsBundle\Entity\CustomField;
-use Chill\CustomFieldsBundle\Tests\CustomFieldTestHelper;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;

 /**
--- a/src/Bundle/ChillCustomFieldsBundle/Tests/Routing/RoutingLoaderTest.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Tests/Routing/RoutingLoaderTest.php
@@ -9,7 +9,7 @@

 declare(strict_types=1);

-namespace Chill\CustomFieldsBundle\Tests\Routing;
+namespace Chill\CustomFieldsBundle\Tests;

 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 use Symfony\Component\HttpFoundation\Response;
--- a/src/Bundle/ChillDocGeneratorBundle/Controller/DocGeneratorTemplateController.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Controller/DocGeneratorTemplateController.php
@@ -276,6 +276,7 @@ final class DocGeneratorTemplateController extends AbstractController
            fwrite($templateResource, $dataDecrypted);
            rewind($templateResource);
        }
+
        $datas = $context->getData($template, $entity, $contextGenerationData);

        try {
--- a/src/Bundle/ChillDocGeneratorBundle/GeneratorDriver/RelatorioDriver.php
+++ b/src/Bundle/ChillDocGeneratorBundle/GeneratorDriver/RelatorioDriver.php
@@ -46,6 +46,7 @@ class RelatorioDriver implements DriverInterface
            'template' => new DataPart($template, $templateName ?? uniqid('template_'), $resourceType),
        ];
        $form = new FormDataPart($formFields);
+        dump(json_encode($data));

        try {
            $response = $this->relatorioClient->request('POST', $this->url, [
--- a/src/Bundle/ChillDocGeneratorBundle/Resources/public/lib/document-generator.js
+++ b/src/Bundle/ChillDocGeneratorBundle/Resources/public/lib/document-generator.js
@@ -1,13 +0,0 @@
-
-const buildLink = function(templateId, entityId, entityClass) {
-    const
-        entityIdEncoded = encodeURI(entityId),
-        returnPath = encodeURIComponent(window.location.pathname + window.location.search + window.location.hash),
-        entityClassEncoded = encodeURI(entityClass),
-        url = `/fr/doc/gen/generate/from/${templateId}/for/${entityClassEncoded}/${entityIdEncoded}?returnPath=${returnPath}`
-    ;
-    console.log('computed Url');
-    return url;
-};
-
-export {buildLink};
--- a/src/Bundle/ChillDocGeneratorBundle/Resources/public/vuejs/_components/PickTemplate.vue
+++ b/src/Bundle/ChillDocGeneratorBundle/Resources/public/vuejs/_components/PickTemplate.vue
@@ -17,11 +17,11 @@
                            <select class="form-select" v-model="template">
                                <option disabled selected value="">{{ $t('choose_a_template') }}</option>
                                <template v-for="t in templates">
-                                    <option v-bind:value="t.id">{{ t.name.fr || 'Aucun nom défini' }}</option>
+                                    <option  v-bind:value="t.id">{{ t.name.fr }}</option>
                                </template>
                            </select>
-                            <a v-if="canGenerate" class="btn btn-update btn-sm change-icon" :href="buildUrlGenerate" @click.prevent="clickGenerate($event, buildUrlGenerate)"><i class="fa fa-fw fa-cog"></i></a>
-                            <a v-else class="btn btn-update btn-sm change-icon" href="#" disabled ><i class="fa fa-fw fa-cog"></i></a>
+                            <button v-if="canGenerate" class="btn btn-update btn-sm change-icon" type="button" @click="generateDocument"><i class="fa fa-fw fa-cog"></i></button>
+                            <button v-else class="btn btn-update btn-sm change-icon" type="button" disabled ><i class="fa fa-fw fa-cog"></i></button>
                        </div>
                    </div>
                </div>
@@ -39,27 +39,23 @@

 <script>

-import {buildLink} from 'ChillDocGeneratorAssets/lib/document-generator';
-
 export default {
    name: "PickTemplate",
    props: {
        entityId: [String, Number],
        entityClass: {
            type: String,
-            required: false,
-        },
-        templates: {
-            type: Array,
            required: true,
        },
-        preventDefaultMoveToGenerate: {
-            type: Boolean,
+        templates: {
+            required: true,
+        },
+        // beforeMove execute "something" before
+        beforeMove: {
+            type: Function,
            required: false,
-            default: false,
        }
    },
-    emits: ['goToGenerateDocument'],
    data() {
        return {
            template: null,
@@ -77,37 +73,62 @@ export default {
            return true;
        },
        getDescription() {
-            if (null === this.template) {
-                return '';
-            }
-            let desc = this.templates.find(t => t.id === this.template);
-            if (null === desc) {
-                return '';
-            }
-            return desc.description || '';
+            return this.templates.find(t => t.id === this.template).description || '';
        },
-        buildUrlGenerate() {
-            if (null === this.template) {
-                return '#';
-            }
-
-            return buildLink(this.template, this.entityId, this.entityClass);
-        }
    },
    methods: {
-        clickGenerate(event, link) {
-            if (!this.preventDefaultMoveToGenerate) {
-                window.location.assign(link);
+        generateDocument() {
+            console.log('generateDocument');
+            console.log('beforeMove', this.beforeMove);
+            if (this.beforeMove != null) {
+                console.log('execute before move');
+                let r = this.beforeMove();
+                if (r instanceof Promise) {
+                    r.then((obj) => this.goToGenerate(obj));
+                } else {
+                    this.goToGenerate();
+                }
+            } else {
+                this.goToGenerate();
+            }
+        },
+        goToGenerate(obj) {
+            console.log('goToGenerate');
+            console.log('obj', obj);
+            console.log('entityId', this.entityId);
+            let
+                realId = this.entityId,
+                realEntityClass = this.entityClass
+            ;
+
+            if (obj !== undefined) {
+                if (obj.entityId !== undefined) {
+                    realId = obj.entityId;
+                }
+                if (obj.entityClass !== undefined) {
+                    realEntityClass = obj.entityClass;
+                }
            }

-            this.$emit('goToGenerateDocument', {event, link, template: this.template});
+            console.log('realId', realId);
+            console.log('realEntityClass', realEntityClass);
+
+            const
+                entityId = encodeURI(realId),
+                returnPath = encodeURIComponent(window.location.pathname + window.location.search + window.location.hash),
+                fqdnEntityClass = encodeURI(realEntityClass),
+                url = `/fr/doc/gen/generate/from/${this.template}/for/${fqdnEntityClass}/${entityId}?returnPath=${returnPath}`
+            ;
+
+            console.log('I will generate your doc at', url);
+            window.location.assign(url);
        },
    },
    i18n: {
        messages: {
            fr: {
                generate_document: 'Générer un document',
-                select_a_template: 'Choisir un modèle',
+                select_a_template: 'Choisir un gabarit',
                choose_a_template: 'Choisir',
            }
        }
--- a/src/Bundle/ChillDocGeneratorBundle/Resources/views/Admin/DocGeneratorTemplate/index.html.twig
+++ b/src/Bundle/ChillDocGeneratorBundle/Resources/views/Admin/DocGeneratorTemplate/index.html.twig
@@ -23,7 +23,11 @@
                            <input type="hidden" name="entityClassName" value="{{ contextManager.getContextByKey(entity.context).entityClass|e('html_attr') }}" />
                            <input type="text" name="entityId" />

-                            <button type="submit" class="btn btn-mini btn-misc"><i class="fa fa-cog"></i>{{ 'docgen.test generate'|trans }}</button>
+                            <ul class="record_actions">
+                                <li>
+                                    <button type="submit" class="btn btn-mini btn-neutral">{{ 'docgen.test generate'|trans }}</button>
+                                </li>
+                            </ul>
                        </form>
                    </td>
                    <td>
--- a/src/Bundle/ChillDocGeneratorBundle/Serializer/Helper/NormalizeNullValueHelper.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Serializer/Helper/NormalizeNullValueHelper.php
@@ -11,11 +11,9 @@ declare(strict_types=1);

 namespace Chill\DocGeneratorBundle\Serializer\Helper;

-use Symfony\Component\Serializer\Mapping\ClassMetadata;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;

 use function array_merge;
-use function is_array;

 class NormalizeNullValueHelper
 {
@@ -32,7 +30,7 @@ class NormalizeNullValueHelper
        $this->discriminatorValue = $discriminatorValue;
    }

-    public function normalize(array $attributes, string $format = 'docgen', ?array $context = [], ?ClassMetadata $classMetadata = null)
+    public function normalize(array $attributes, string $format = 'docgen', ?array $context = [])
    {
        $data = [];
        $data['isNull'] = true;
@@ -60,7 +58,7 @@ class NormalizeNullValueHelper

                    default:
                        $data[$key] = $this->normalizer->normalize(null, $format, array_merge(
-                            $this->getContextForAttribute($key, $context, $classMetadata),
+                            $context,
                            ['docgen:expects' => $class]
                        ));

@@ -71,25 +69,4 @@ class NormalizeNullValueHelper

        return $data;
    }
-
-    private function getContextForAttribute(string $key, array $initialContext, ?ClassMetadata $classMetadata): array
-    {
-        if (null === $classMetadata) {
-            return $initialContext;
-        }
-
-        $attributeMetadata = $classMetadata->getAttributesMetadata()[$key] ?? null;
-
-        if (null !== $attributeMetadata) {
-            /** @var \Symfony\Component\Serializer\Mapping\AttributeMetadata $attributeMetadata */
-            $initialContext = array_merge(
-                $initialContext,
-                $attributeMetadata->getNormalizationContextForGroups(
-                    is_array($initialContext['groups']) ? $initialContext['groups'] : [$initialContext['groups']]
-                )
-            );
-        }
-
-        return $initialContext;
-    }
 }
--- a/src/Bundle/ChillDocGeneratorBundle/Serializer/Normalizer/CollectionDocGenNormalizer.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Serializer/Normalizer/CollectionDocGenNormalizer.php
@@ -26,7 +26,7 @@ class CollectionDocGenNormalizer implements ContextAwareNormalizerInterface, Nor

    /**
     * @param Collection $object
-     * @param string|null $format
+     * @param null|string $format
     *
     * @return array|ArrayObject|bool|float|int|string|void|null
     */
--- a/src/Bundle/ChillDocGeneratorBundle/Serializer/Normalizer/DocGenObjectNormalizer.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Serializer/Normalizer/DocGenObjectNormalizer.php
@@ -66,7 +66,7 @@ class DocGenObjectNormalizer implements NormalizerAwareInterface, NormalizerInte
        if (!$this->classMetadataFactory->hasMetadataFor($classMetadataKey)) {
            throw new LogicException(sprintf(
                'This object does not have metadata: %s. Add groups on this entity to allow to serialize with the format %s and groups %s',
-                is_object($object) ? get_class($object) : '(todo' /*$context['docgen:expects'],*/ ,
+                is_object($object) ? get_class($object) : '(todo' /*$context['docgen:expects'],*/,
                $format,
                implode(', ', ($context['groups'] ?? []))
            ));
@@ -196,7 +196,7 @@ class DocGenObjectNormalizer implements NormalizerAwareInterface, NormalizerInte

        $normalizer = new NormalizeNullValueHelper($this->normalizer, $typeKey, $typeValue);

-        return $normalizer->normalize($keys, $format, $context, $metadata);
+        return $normalizer->normalize($keys, $format, $context);
    }

    /**
@@ -260,13 +260,9 @@ class DocGenObjectNormalizer implements NormalizerAwareInterface, NormalizerInte
            /** @var AttributeMetadata $attribute */
            $value = $this->propertyAccess->getValue($object, $attribute->getName());
            $key = $attribute->getSerializedName() ?? $attribute->getName();
-            $objectContext = array_merge(
-                $context,
-                $attribute->getNormalizationContextForGroups(
-                    is_array($context['groups']) ? $context['groups'] : [$context['groups']]
-                )
-            );
-            $isTranslatable = $objectContext['is-translatable'] ?? false;
+            $isTranslatable = $attribute->getNormalizationContextForGroups(
+                is_array($context['groups']) ? $context['groups'] : [$context['groups']]
+            )['is-translatable'] ?? false;

            if ($isTranslatable) {
                $data[$key] = $this->translatableStringHelper
@@ -277,7 +273,7 @@ class DocGenObjectNormalizer implements NormalizerAwareInterface, NormalizerInte
                foreach ($value as $k => $v) {
                    $arr[$k] =
                        $this->normalizer->normalize($v, $format, array_merge(
-                            $objectContext,
+                            $context,
                            $attribute->getNormalizationContextForGroups($expectedGroups)
                        ));
                }
@@ -285,11 +281,11 @@ class DocGenObjectNormalizer implements NormalizerAwareInterface, NormalizerInte
            } elseif (is_object($value)) {
                $data[$key] =
                    $this->normalizer->normalize($value, $format, array_merge(
-                        $objectContext,
+                        $context,
                        $attribute->getNormalizationContextForGroups($expectedGroups)
                    ));
            } elseif (null === $value) {
-                $data[$key] = $this->normalizeNullOutputValue($format, $objectContext, $attribute, $reflection);
+                $data[$key] = $this->normalizeNullOutputValue($format, $context, $attribute, $reflection);
            } else {
                $data[$key] = $value;
            }
--- a/src/Bundle/ChillDocGeneratorBundle/tests/Serializer/Normalizer/DocGenObjectNormalizerTest.php
+++ b/src/Bundle/ChillDocGeneratorBundle/tests/Serializer/Normalizer/DocGenObjectNormalizerTest.php
@@ -14,7 +14,6 @@ namespace Chill\DocGeneratorBundle\tests\Serializer\Normalizer;
 use Chill\MainBundle\Entity\Scope;
 use Chill\MainBundle\Entity\User;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
-use Symfony\Component\Serializer\Annotation as Serializer;
 use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;

@@ -34,49 +33,6 @@ final class DocGenObjectNormalizerTest extends KernelTestCase
        $this->normalizer = self::$container->get(NormalizerInterface::class);
    }

-    public function testChangeContextOnAttribute()
-    {
-        $object = new TestableParentClass();
-        $actual = $this->normalizer->normalize(
-            $object,
-            'docgen',
-            ['groups' => 'docgen:read']
-        );
-
-        $this->assertIsArray($actual);
-        $this->assertArrayHasKey('child', $actual);
-        $this->assertIsArray($actual['child']);
-        $this->assertArrayHasKey('foo', $actual['child']);
-        $this->assertEquals('bar', $actual['child']['foo']);
-        $this->assertArrayNotHasKey('baz', $actual['child']);
-
-        // test with child = null
-        $object->child = null;
-        $actual = $this->normalizer->normalize(
-            $object,
-            'docgen',
-            ['groups' => 'docgen:read']
-        );
-        $this->assertIsArray($actual);
-        $this->assertArrayHasKey('child', $actual);
-        $this->assertIsArray($actual['child']);
-        $this->assertArrayHasKey('foo', $actual['child']);
-        $this->assertEquals('', $actual['child']['foo']);
-        $this->assertArrayNotHasKey('baz', $actual['child']);
-
-        $actual = $this->normalizer->normalize(
-            null,
-            'docgen',
-            ['groups' => 'docgen:read', 'docgen:expects' => TestableParentClass::class],
-        );
-        $this->assertIsArray($actual);
-        $this->assertArrayHasKey('child', $actual);
-        $this->assertIsArray($actual['child']);
-        $this->assertArrayHasKey('foo', $actual['child']);
-        $this->assertEquals('', $actual['child']['foo']);
-        $this->assertArrayNotHasKey('baz', $actual['child']);
-    }
-
    public function testNormalizationBasic()
    {
        $scope = new Scope();
@@ -143,30 +99,3 @@ final class DocGenObjectNormalizerTest extends KernelTestCase
        $this->assertEquals($expected, $normalized, 'test normalization fo an user with null center');
    }
 }
-
-class TestableParentClass
-{
-    /**
-     * @Serializer\Groups("docgen:read")
-     * @Serializer\Context(normalizationContext={"groups": "docgen:read:foo"}, groups={"docgen:read"})
-     */
-    public ?TestableChildClass $child;
-
-    public function __construct()
-    {
-        $this->child = new TestableChildClass();
-    }
-}
-
-class TestableChildClass
-{
-    /**
-     * @Serializer\Groups("docgen:read")
-     */
-    public string $baz = 'bloup';
-
-    /**
-     * @Serializer\Groups("docgen:read:foo")
-     */
-    public string $foo = 'bar';
-}
--- a/src/Bundle/ChillDocGeneratorBundle/tests/Service/Context/BaseContextDataTest.php
+++ b/src/Bundle/ChillDocGeneratorBundle/tests/Service/Context/BaseContextDataTest.php
@@ -13,7 +13,6 @@ namespace Chill\DocGeneratorBundle\tests\Service\Context;

 use Chill\DocGeneratorBundle\Service\Context\BaseContextData;
 use Chill\MainBundle\Entity\User;
-use Prophecy\PhpUnit\ProphecyTrait;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Symfony\Component\Security\Core\Security;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
@@ -24,8 +23,6 @@ use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 */
 final class BaseContextDataTest extends KernelTestCase
 {
-    use ProphecyTrait;
-
    protected function setUp(): void
    {
        parent::setUp();
--- a/src/Bundle/ChillDocGeneratorBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillDocGeneratorBundle/translations/messages.fr.yml
@@ -7,7 +7,6 @@ docgen:
    Context: Contexte
    New template: Nouveau gabarit
    Edit template: Modifier gabarit
-    test generate: Tester la génération
    With context: 'Avec le contexte :'


--- a/src/Bundle/ChillDocStoreBundle/Controller/DocumentAccompanyingCourseController.php
+++ b/src/Bundle/ChillDocStoreBundle/Controller/DocumentAccompanyingCourseController.php
@@ -13,9 +13,7 @@ namespace Chill\DocStoreBundle\Controller;

 use Chill\DocStoreBundle\Entity\AccompanyingCourseDocument;
 use Chill\DocStoreBundle\Form\AccompanyingCourseDocumentType;
-use Chill\DocStoreBundle\Repository\AccompanyingCourseDocumentRepository;
 use Chill\DocStoreBundle\Security\Authorization\AccompanyingCourseDocumentVoter;
-use Chill\MainBundle\Pagination\PaginatorFactory;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use DateTime;
@@ -31,15 +29,20 @@ use Symfony\Contracts\Translation\TranslatorInterface;
 */
 class DocumentAccompanyingCourseController extends AbstractController
 {
-    protected AuthorizationHelper $authorizationHelper;
+    /**
+     * @var AuthorizationHelper
+     */
+    protected $authorizationHelper;

-    protected EventDispatcherInterface $eventDispatcher;
+    /**
+     * @var EventDispatcherInterface
+     */
+    protected $eventDispatcher;

-    protected TranslatorInterface $translator;
-
-    private AccompanyingCourseDocumentRepository $courseRepository;
-
-    private PaginatorFactory $paginatorFactory;
+    /**
+     * @var TranslatorInterface
+     */
+    protected $translator;

    /**
     * DocumentAccompanyingCourseController constructor.
@@ -47,15 +50,11 @@ class DocumentAccompanyingCourseController extends AbstractController
    public function __construct(
        TranslatorInterface $translator,
        EventDispatcherInterface $eventDispatcher,
-        AuthorizationHelper $authorizationHelper,
-        PaginatorFactory $paginatorFactory,
-        AccompanyingCourseDocumentRepository $courseRepository
+        AuthorizationHelper $authorizationHelper
    ) {
        $this->translator = $translator;
        $this->eventDispatcher = $eventDispatcher;
        $this->authorizationHelper = $authorizationHelper;
-        $this->paginatorFactory = $paginatorFactory;
-        $this->courseRepository = $courseRepository;
    }

    /**
@@ -131,15 +130,11 @@ class DocumentAccompanyingCourseController extends AbstractController

        $this->denyAccessUnlessGranted(AccompanyingCourseDocumentVoter::SEE, $course);

-        $total = $this->courseRepository->countByCourse($course);
-        $pagination = $this->paginatorFactory->create($total);
-
-        $documents = $this->courseRepository
+        $documents = $em
+            ->getRepository('ChillDocStoreBundle:AccompanyingCourseDocument')
            ->findBy(
                ['course' => $course],
-                ['date' => 'DESC'],
-                $pagination->getItemsPerPage(),
-                $pagination->getCurrentPageFirstItemNumber()
+                ['date' => 'DESC']
            );

        return $this->render(
@@ -147,7 +142,6 @@ class DocumentAccompanyingCourseController extends AbstractController
            [
                'documents' => $documents,
                'accompanyingCourse' => $course,
-                'pagination' => $pagination,
            ]
        );
    }
--- a/src/Bundle/ChillDocStoreBundle/Controller/DocumentPersonController.php
+++ b/src/Bundle/ChillDocStoreBundle/Controller/DocumentPersonController.php
@@ -13,8 +13,7 @@ namespace Chill\DocStoreBundle\Controller;

 use Chill\DocStoreBundle\Entity\PersonDocument;
 use Chill\DocStoreBundle\Form\PersonDocumentType;
-use Chill\DocStoreBundle\Repository\PersonDocumentACLAwareRepositoryInterface;
-use Chill\MainBundle\Pagination\PaginatorFactory;
+use Chill\DocStoreBundle\Security\Authorization\PersonDocumentVoter;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Privacy\PrivacyEvent;
@@ -25,7 +24,7 @@ use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Annotation\Route;
-use Symfony\Contracts\Translation\TranslatorInterface;
+use Symfony\Component\Translation\TranslatorInterface;

 /**
 * Class DocumentPersonController.
@@ -36,15 +35,20 @@ use Symfony\Contracts\Translation\TranslatorInterface;
 */
 class DocumentPersonController extends AbstractController
 {
-    protected AuthorizationHelper $authorizationHelper;
+    /**
+     * @var AuthorizationHelper
+     */
+    protected $authorizationHelper;

-    protected EventDispatcherInterface $eventDispatcher;
+    /**
+     * @var EventDispatcherInterface
+     */
+    protected $eventDispatcher;

-    protected TranslatorInterface $translator;
-
-    private PaginatorFactory $paginatorFactory;
-
-    private PersonDocumentACLAwareRepositoryInterface $personDocumentACLAwareRepository;
+    /**
+     * @var TranslatorInterface
+     */
+    protected $translator;

    /**
     * DocumentPersonController constructor.
@@ -52,15 +56,11 @@ class DocumentPersonController extends AbstractController
    public function __construct(
        TranslatorInterface $translator,
        EventDispatcherInterface $eventDispatcher,
-        AuthorizationHelper $authorizationHelper,
-        PaginatorFactory $paginatorFactory,
-        PersonDocumentACLAwareRepositoryInterface $personDocumentACLAwareRepository
+        AuthorizationHelper $authorizationHelper
    ) {
        $this->translator = $translator;
        $this->eventDispatcher = $eventDispatcher;
        $this->authorizationHelper = $authorizationHelper;
-        $this->paginatorFactory = $paginatorFactory;
-        $this->personDocumentACLAwareRepository = $personDocumentACLAwareRepository;
    }

    /**
@@ -156,15 +156,19 @@ class DocumentPersonController extends AbstractController

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

-        $total = $this->personDocumentACLAwareRepository->countByPerson($person);
-        $pagination = $this->paginatorFactory->create($total);
+        $reachableScopes = $this->authorizationHelper
+            ->getReachableScopes(
+                $this->getUser(),
+                PersonDocumentVoter::SEE,
+                $person->getCenter()
+            );

-        $documents = $this->personDocumentACLAwareRepository->findByPerson(
-            $person,
-            [],
-            $pagination->getItemsPerPage(),
-            $pagination->getCurrentPageFirstItemNumber()
-        );
+        $documents = $em
+            ->getRepository('ChillDocStoreBundle:PersonDocument')
+            ->findBy(
+                ['person' => $person, 'scope' => $reachableScopes],
+                ['date' => 'DESC']
+            );

        $event = new PrivacyEvent($person, [
            'element_class' => PersonDocument::class,
@@ -177,7 +181,6 @@ class DocumentPersonController extends AbstractController
            [
                'documents' => $documents,
                'person' => $person,
-                'pagination' => $pagination,
            ]
        );
    }
--- a/src/Bundle/ChillDocStoreBundle/DependencyInjection/ChillDocStoreExtension.php
+++ b/src/Bundle/ChillDocStoreBundle/DependencyInjection/ChillDocStoreExtension.php
@@ -38,7 +38,6 @@ class ChillDocStoreExtension extends Extension implements PrependExtensionInterf
        $loader->load('services/menu.yaml');
        $loader->load('services/fixtures.yaml');
        $loader->load('services/form.yaml');
-        $loader->load('services/templating.yaml');
    }

    public function prepend(ContainerBuilder $container)
--- a/src/Bundle/ChillDocStoreBundle/Entity/Document.php
+++ b/src/Bundle/ChillDocStoreBundle/Entity/Document.php
@@ -11,13 +11,7 @@ declare(strict_types=1);

 namespace Chill\DocStoreBundle\Entity;

-use Chill\DocGeneratorBundle\Entity\DocGeneratorTemplate;
-use Chill\MainBundle\Doctrine\Model\TrackCreationInterface;
-use Chill\MainBundle\Doctrine\Model\TrackCreationTrait;
-use Chill\MainBundle\Doctrine\Model\TrackUpdateInterface;
-use Chill\MainBundle\Doctrine\Model\TrackUpdateTrait;
 use Chill\MainBundle\Entity\HasScopeInterface;
-use Chill\MainBundle\Entity\Scope;
 use Chill\MainBundle\Entity\User;
 use DateTimeInterface;
 use Doctrine\ORM\Mapping as ORM;
@@ -26,12 +20,8 @@ use Symfony\Component\Validator\Constraints as Assert;
 /**
 * @ORM\MappedSuperclass
 */
-class Document implements HasScopeInterface, TrackCreationInterface, TrackUpdateInterface
+class Document implements HasScopeInterface
 {
-    use TrackCreationTrait;
-
-    use TrackUpdateTrait;
-
    /**
     * @ORM\ManyToOne(targetEntity="Chill\DocStoreBundle\Entity\DocumentCategory")
     * @ORM\JoinColumns({
@@ -77,11 +67,6 @@ class Document implements HasScopeInterface, TrackCreationInterface, TrackUpdate
     */
    private $scope;

-    /**
-     * @ORM\ManyToOne(targetEntity="Chill\DocGeneratorBundle\Entity\DocGeneratorTemplate")
-     */
-    private $template;
-
    /**
     * @ORM\Column(type="text")
     * @Assert\Length(
@@ -97,6 +82,9 @@ class Document implements HasScopeInterface, TrackCreationInterface, TrackUpdate
     */
    private $user;

+    /**
+     * @return DocumentCategory
+     */
    public function getCategory(): ?DocumentCategory
    {
        return $this->category;
@@ -127,16 +115,11 @@ class Document implements HasScopeInterface, TrackCreationInterface, TrackUpdate
     *
     * @return \Chill\MainBundle\Entity\Scope
     */
-    public function getScope(): ?Scope
+    public function getScope()
    {
        return $this->scope;
    }

-    public function getTemplate(): ?DocGeneratorTemplate
-    {
-        return $this->template;
-    }
-
    public function getTitle(): ?string
    {
        return $this->title;
@@ -182,13 +165,6 @@ class Document implements HasScopeInterface, TrackCreationInterface, TrackUpdate
        return $this;
    }

-    public function setTemplate(?DocGeneratorTemplate $template): self
-    {
-        $this->template = $template;
-
-        return $this;
-    }
-
    public function setTitle(string $title): self
    {
        $this->title = $title;
--- a/src/Bundle/ChillDocStoreBundle/Form/PersonDocumentType.php
+++ b/src/Bundle/ChillDocStoreBundle/Form/PersonDocumentType.php
@@ -18,12 +18,10 @@ use Chill\MainBundle\Form\Type\ChillDateType;
 use Chill\MainBundle\Form\Type\ChillTextareaType;
 use Chill\MainBundle\Form\Type\ScopePickerType;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
-use Chill\MainBundle\Security\Resolver\ScopeResolverDispatcher;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\Persistence\ObjectManager;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
-use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
@@ -53,25 +51,14 @@ class PersonDocumentType extends AbstractType
     */
    protected $user;

-    private ParameterBagInterface $parameterBag;
-
-    private ScopeResolverDispatcher $scopeResolverDispatcher;
-
    public function __construct(
-        TranslatableStringHelper $translatableStringHelper,
-        ScopeResolverDispatcher $scopeResolverDispatcher,
-        ParameterBagInterface $parameterBag
+        TranslatableStringHelper $translatableStringHelper
    ) {
        $this->translatableStringHelper = $translatableStringHelper;
-        $this->scopeResolverDispatcher = $scopeResolverDispatcher;
-        $this->parameterBag = $parameterBag;
    }

    public function buildForm(FormBuilderInterface $builder, array $options)
    {
-        $document = $options['data'];
-        $isScopeConcerned = $this->scopeResolverDispatcher->isConcerned($document);
-
        $builder
            ->add('title', TextType::class)
            ->add('description', ChillTextareaType::class, [
@@ -80,6 +67,10 @@ class PersonDocumentType extends AbstractType
            ->add('object', StoredObjectType::class, [
                'error_bubbling' => true,
            ])
+            ->add('scope', ScopePickerType::class, [
+                'center' => $options['center'],
+                'role' => $options['role'],
+            ])
            ->add('date', ChillDateType::class)
            ->add('category', EntityType::class, [
                'placeholder' => 'Choose a document category',
@@ -93,13 +84,6 @@ class PersonDocumentType extends AbstractType
                    return $entity ? $this->translatableStringHelper->localize($entity->getName()) : '';
                },
            ]);
-
-        if ($isScopeConcerned && $this->parameterBag->get('chill_main')['acl']['form_show_scopes']) {
-            $builder->add('scope', ScopePickerType::class, [
-                'center' => $options['center'],
-                'role' => $options['role'],
-            ]);
-        }
    }

    public function configureOptions(OptionsResolver $resolver)
--- a/src/Bundle/ChillDocStoreBundle/Repository/AccompanyingCourseDocumentRepository.php
+++ b/src/Bundle/ChillDocStoreBundle/Repository/AccompanyingCourseDocumentRepository.php
@@ -1,75 +0,0 @@
-<?php
-
-/**
- * Chill is a software for social workers
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-declare(strict_types=1);
-
-namespace Chill\DocStoreBundle\Repository;
-
-use Chill\DocStoreBundle\Entity\AccompanyingCourseDocument;
-use Chill\PersonBundle\Entity\AccompanyingPeriod;
-use Doctrine\ORM\EntityManagerInterface;
-use Doctrine\ORM\EntityRepository;
-use Doctrine\ORM\QueryBuilder;
-use Doctrine\Persistence\ObjectRepository;
-
-class AccompanyingCourseDocumentRepository implements ObjectRepository
-{
-    private EntityManagerInterface $em;
-
-    private EntityRepository $repository;
-
-    public function __construct(EntityManagerInterface $em)
-    {
-        $this->em = $em;
-        $this->repository = $em->getRepository(AccompanyingCourseDocument::class);
-    }
-
-    public function buildQueryByCourse(AccompanyingPeriod $course): QueryBuilder
-    {
-        $qb = $this->repository->createQueryBuilder('d');
-
-        $qb
-            ->where($qb->expr()->eq('d.course', ':course'))
-            ->setParameter('course', $course);
-
-        return $qb;
-    }
-
-    public function countByCourse(AccompanyingPeriod $course): int
-    {
-        $qb = $this->buildQueryByCourse($course)->select('COUNT(d)');
-
-        return $qb->getQuery()->getSingleScalarResult();
-    }
-
-    public function find($id): ?AccompanyingCourseDocument
-    {
-        return $this->repository->find($id);
-    }
-
-    public function findAll(): array
-    {
-        return $this->repository->findAll();
-    }
-
-    public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null)
-    {
-        return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
-    }
-
-    public function findOneBy(array $criteria): ?AccompanyingCourseDocument
-    {
-        return $this->findOneBy($criteria);
-    }
-
-    public function getClassName()
-    {
-        return AccompanyingCourseDocument::class;
-    }
-}
--- a/src/Bundle/ChillDocStoreBundle/Repository/PersonDocumentACLAwareRepository.php
+++ b/src/Bundle/ChillDocStoreBundle/Repository/PersonDocumentACLAwareRepository.php
@@ -1,90 +0,0 @@
-<?php
-
-/**
- * Chill is a software for social workers
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-declare(strict_types=1);
-
-namespace Chill\DocStoreBundle\Repository;
-
-use Chill\DocStoreBundle\Entity\PersonDocument;
-use Chill\DocStoreBundle\Security\Authorization\PersonDocumentVoter;
-use Chill\MainBundle\Security\Authorization\AuthorizationHelperInterface;
-use Chill\MainBundle\Security\Resolver\CenterResolverDispatcher;
-use Chill\PersonBundle\Entity\Person;
-use Doctrine\ORM\EntityManagerInterface;
-use Doctrine\ORM\QueryBuilder;
-use Symfony\Component\Security\Core\Security;
-
-class PersonDocumentACLAwareRepository implements PersonDocumentACLAwareRepositoryInterface
-{
-    private AuthorizationHelperInterface $authorizationHelper;
-
-    private CenterResolverDispatcher $centerResolverDispatcher;
-
-    private EntityManagerInterface $em;
-
-    private Security $security;
-
-    public function __construct(EntityManagerInterface $em, AuthorizationHelperInterface $authorizationHelper, CenterResolverDispatcher $centerResolverDispatcher, Security $security)
-    {
-        $this->em = $em;
-        $this->authorizationHelper = $authorizationHelper;
-        $this->centerResolverDispatcher = $centerResolverDispatcher;
-        $this->security = $security;
-    }
-
-    public function buildQueryByPerson(Person $person): QueryBuilder
-    {
-        $qb = $this->em->getRepository(PersonDocument::class)->createQueryBuilder('d');
-
-        $qb
-            ->where($qb->expr()->eq('d.person', ':person'))
-            ->setParameter('person', $person);
-
-        return $qb;
-    }
-
-    public function countByPerson(Person $person): int
-    {
-        $qb = $this->buildQueryByPerson($person)->select('COUNT(d)');
-
-        $this->addACL($qb, $person);
-
-        return $qb->getQuery()->getSingleScalarResult();
-    }
-
-    public function findByPerson(Person $person, array $orderBy = [], int $limit = 20, int $offset = 0): array
-    {
-        $qb = $this->buildQueryByPerson($person)->select('d');
-
-        $this->addACL($qb, $person);
-
-        foreach ($orderBy as [$field, $order]) {
-            $qb->addOrderBy($field, $order);
-        }
-
-        $qb->setFirstResult($offset)->setMaxResults($limit);
-
-        return $qb->getQuery()->getResult();
-    }
-
-    private function addACL(QueryBuilder $qb, Person $person): void
-    {
-        $center = $this->centerResolverDispatcher->resolveCenter($person);
-
-        $reachableScopes = $this->authorizationHelper
-            ->getReachableScopes(
-                $this->security->getUser(),
-                PersonDocumentVoter::SEE,
-                $center
-            );
-
-        $qb->andWhere($qb->expr()->in('d.scope', ':scopes'))
-            ->setParameter('scopes', $reachableScopes);
-    }
-}
--- a/src/Bundle/ChillDocStoreBundle/Repository/PersonDocumentACLAwareRepositoryInterface.php
+++ b/src/Bundle/ChillDocStoreBundle/Repository/PersonDocumentACLAwareRepositoryInterface.php
@@ -1,21 +0,0 @@
-<?php
-
-/**
- * Chill is a software for social workers
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-declare(strict_types=1);
-
-namespace Chill\DocStoreBundle\Repository;
-
-use Chill\PersonBundle\Entity\Person;
-
-interface PersonDocumentACLAwareRepositoryInterface
-{
-    public function countByPerson(Person $person): int;
-
-    public function findByPerson(Person $person, array $orderBy = [], int $limit = 20, int $offset = 0): array;
-}
--- a/src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/_workflow.html.twig
+++ b/src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/_workflow.html.twig
@@ -1,64 +0,0 @@
-{% import "@ChillDocStore/Macro/macro.html.twig" as m %}
-{% import "@ChillDocStore/Macro/macro_mimeicon.html.twig" as mm %}
-
-<div class="flex-table accompanying_course_work-list">
-    <div class="item-bloc document-item bg-chill-llight-gray">
-        <div class="row justify-content-center my-4">
-            <div class="col-2">
-                <i class="fa fa-4x fa-file-text-o text-success"></i>
-            </div>
-            <div class="col-8">
-                <h3>{{ document.title }}</h3>
-
-                {{ mm.mimeIcon(document.object.type) }}
-
-                {% if document.description is not empty %}
-                    <blockquote class="chill-user-quote mt-4">
-                        {{ document.description }}
-                    </blockquote>
-                {% endif %}
-
-            </div>
-        </div>
-    </div>
-</div>
-
-{% set freezed = false %}
-{% for step in entity_workflow.stepsChained %}
-    {% if loop.last %}
-        {% if step.previous is not null and step.previous.freezeAfter == true %}
-            {% set freezed = true %}
-        {% endif %}
-    {% endif %}
-{% endfor %}
-
-{% if display_action is defined and display_action == true %}
-    <ul class="record_actions">
-        {% if document.course != null and is_granted('CHILL_PERSON_ACCOMPANYING_PERIOD_SEE', document.course) %}
-            <li>
-                <a href="{{ path('chill_person_accompanying_course_index', {'accompanying_period_id': document.course.id}) }}" class="btn btn-show change-icon">
-                    <i class="fa fa-random"></i> {{ 'Course number'|trans }} {{ document.course.id }}
-                </a>
-            </li>
-        {% endif %}
-        <li>
-            {{ m.download_button(document.object, document.title) }}
-        </li>
-        <li>
-        {% if chill_document_is_editable(document.object) %}
-            {% if not freezed %}
-                {{ document.object|chill_document_edit_button({'title': document.title|e('html') }) }}
-            {% else %}
-                <a class="btn btn-wopilink disabled" href="#" title="{{ 'workflow.freezed document'|trans }}">
-                    {{ 'Update document'|trans }}
-                </a>
-            {% endif %}
-        {% endif %}
-        {% if is_granted('CHILL_ACCOMPANYING_COURSE_DOCUMENT_SEE', document) and document.course != null %}
-            <li>
-                <a href="{{ chill_path_add_return_path('accompanying_course_document_show', {'course': document.course.id, 'id': document.id}) }}" class="btn btn-show"></a>
-            </li>
-        {% endif %}
-        </li>
-    </ul>
-{% endif %}
--- a/src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/_workflow.title.html.twig
+++ b/src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/_workflow.title.html.twig
@@ -1,19 +0,0 @@
-{% import '@ChillMain/Workflow/macro_breadcrumb.html.twig' as m %}
-
-<div class="flex-grow-1 {% if add_classes is defined %}{{ add_classes }}{% else %}h2{% endif %}">
-    <div>
-        {% if concerne is defined and concerne == true %}
-            <span class="item-key">{{ 'Concerne'|trans }}: </span>
-        {% endif %}
-    
-        {{ 'workflow.Document (n°%doc%)'|trans({'%doc%': document.id}) }}
-    
-        {% if description is defined and description == true %}
-            {{ ' — ' ~ document.title }}
-        {% endif %}
-    </div>
-    
-    {% if breadcrumb is defined and breadcrumb == true %}
-        {{ m.breadcrumb(_context) }}
-    {% endif %}
-</div>
--- a/src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/edit.html.twig
+++ b/src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/edit.html.twig
@@ -19,7 +19,7 @@
 	{{ form_row(form.description) }}
 	{{ form_row(form.object, { 'label': 'Document', 'existing': document.object }) }}

-	<ul class="record_actions sticky-form-buttons">
+	<ul class="record_actions">
 		<li class="cancel">
 			<a href="{{ path('accompanying_course_document_index', {'course': accompanyingCourse.id}) }}" class="btn btn-cancel">
 				{{ 'Back to the list' | trans }}
--- a/src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/index.html.twig
+++ b/src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/index.html.twig
@@ -2,6 +2,8 @@

 {% set activeRouteKey = '' %}

+{% import "@ChillDocStore/Macro/macro.html.twig" as m %}
+
 {% block title %}
 	{{ 'Documents' }}
 {% endblock %}
@@ -9,35 +11,64 @@
 {% block js %}
 	{{ parent() }}
 	{{ encore_entry_script_tags('mod_async_upload') }}
-    {{ encore_entry_script_tags('mod_docgen_picktemplate') }}
+  {{ encore_entry_script_tags('mod_docgen_picktemplate') }}
 {% endblock %}

 {% block css %}
 	{{ parent() }}
 	{{ encore_entry_link_tags('mod_async_upload') }}
-    {{ encore_entry_link_tags('mod_docgen_picktemplate') }}
+  {{ encore_entry_link_tags('mod_docgen_picktemplate') }}
 {% endblock %}

 {% block content %}
-<div class="col-md-10 col-xxl">
 	<h1>{{ 'Documents' }}</h1>

-	{% if documents|length == 0 %}
-            <p class="chill-no-data-statement">{{ 'No documents'|trans }}</p>
-    {% else %}
-		<div class="flex-table chill-task-list">
+	<table class="table table-bordered border-dark table-striped">
+
+		<thead>
+			<tr>
+				<th>{{ 'Title' | trans }}</th>
+				<th>{{ 'Category'|trans }}</th>
+				<th>{{ 'Actions' | trans }}</th>
+			</tr>
+		</thead>
+		<tbody>
 			{% for document in documents %}
-				{% include 'ChillDocStoreBundle:List:list_item.html.twig' %}
+				<tr>
+					<td>{{ document.title }}</td>
+					<td>{% if document.category %}{{ document.category.name|localize_translatable_string }}{% endif %}</td>
+					<td>
+						<ul class="record_actions">
+							{% if is_granted('CHILL_ACCOMPANYING_COURSE_DOCUMENT_SEE_DETAILS', document) %}
+								<li>
+									{{ m.download_button(document.object, document.title) }}
+								</li>
+								<li>
+									<a href="{{ chill_path_add_return_path('accompanying_course_document_show', {'course': accompanyingCourse.id, 'id': document.id}) }}" class="btn btn-show"></a>
+								</li>
+							{% endif %}
+							{% if is_granted('CHILL_ACCOMPANYING_COURSE_DOCUMENT_UPDATE', document) %}
+								<li>
+									<a href="{{ path('accompanying_course_document_edit', {'course': accompanyingCourse.id, 'id': document.id }) }}" class="btn btn-update"></a>
+								</li>
+							{% endif %}
+						</ul>
+					</td>
+				</tr>
+			{% else %}
+				<tr>
+					<td colspan="9" style="text-align:center;">
+						<span class="chill-no-data-statement">{{ 'Any document found'|trans }}</span>
+					</td>
+				</tr>
 			{% endfor %}
-		</div>
-    {% endif %}
+		</tbody>
+	</table>

-	{{ chill_pagination(pagination) }}
-
-	<div data-docgen-template-picker="data-docgen-template-picker" data-entity-class="Chill\PersonBundle\Entity\AccompanyingPeriod" data-entity-id="{{ accompanyingCourse.id }}"></div>
+    <div data-docgen-template-picker="data-docgen-template-picker" data-entity-class="Chill\PersonBundle\Entity\AccompanyingPeriod" data-entity-id="{{ accompanyingCourse.id }}"></div>

 	{% if is_granted('CHILL_ACCOMPANYING_COURSE_DOCUMENT_CREATE', accompanyingCourse) %}
-		<ul class="record_actions sticky-form-buttons">
+		<ul class="record_actions">
 			<li class="create">
 				<a href="{{ path('accompanying_course_document_new', {'course': accompanyingCourse.id}) }}" class="btn btn-create">
 					{{ 'Create'|trans }}
@@ -45,6 +76,4 @@
 			</li>
 		</ul>
 	{% endif %}
-
-</div>
 {% endblock %}
--- a/src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/show.html.twig
+++ b/src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/show.html.twig
@@ -3,82 +3,64 @@
 {% set activeRouteKey = '' %}

 {% import "@ChillDocStore/Macro/macro.html.twig" as m %}
-{% import "@ChillDocStore/Macro/macro_mimeicon.html.twig" as mm %}

 {% block title %}
 	{# {{ 'Detail of document of %name%'|trans({ '%name%': accompanyingCourse|chill_entity_render_string } ) }} #}
-    {{ 'Document %title%' | trans({ '%title%': document.title }) }}
+{% endblock %}
+
+
+{% block js %}
+	{{ parent() }}
+	{{ encore_entry_script_tags('mod_async_upload') }}
 {% endblock %}

 {% block css %}
    {{ parent() }}
    {{ encore_entry_link_tags('mod_async_upload') }}
-    {{ encore_entry_link_tags('mod_entity_workflow_pick') }}
 {% endblock %}

 {% block content %}
-<div class="document-show">
-    <h1>{{ block('title') }}</h1>

-    {{ mm.mimeIcon(document.object.type) }}
+	<h1>{{ 'Document %title%' | trans({ '%title%': document.title }) }}</h1>

-    <dl class="chill_view_data mt-4">
-        <dt>{{ 'Title'|trans }}</dt>
-        <dd>{{ document.title }}</dd>
+	<dl class="chill_view_data">
+		<dt>{{ 'Title'|trans }}</dt>
+		<dd>{{ document.title }}</dd>

        {% if document.category is not null %}
            <dt>{{ 'Category'|trans }}</dt>
            <dd>{{ document.category.name|localize_translatable_string }}</dd>
        {% endif %}

-        <dt>{{ 'Description' | trans }}</dt>
-        <dd>
-            {% if document.description is empty %}
-                <span class="chill-no-data-statement">{{ 'Any description'|trans }}</span>
-            {% else %}
-                <blockquote class="chill-user-quote">
-                    {{ document.description|chill_markdown_to_html }}
-                </blockquote>
-            {% endif %}
-        </dd>
-    </dl>
+		<dt>{{ 'Description' | trans }}</dt>
+		<dd>
+			{% if document.description is empty %}
+				<span class="chill-no-data-statement">{{ 'Any description'|trans }}</span>
+			{% else %}
+				<blockquote class="chill-user-quote">
+					{{ document.description|chill_markdown_to_html }}
+				</blockquote>
+			{% endif %}
+		</dd>

-    <ul class="record_actions sticky-form-buttons">
-        <li class="cancel">
-            <a href="{{ path('accompanying_course_document_index', {'course': accompanyingCourse.id}) }}" class="btn btn-cancel">
-                {{ 'Back to the list' | trans }}
-            </a>
-        </li>
-        <li>
-            {{ m.download_button(document.object, document.title) }}
-        </li>
-        {% if chill_document_is_editable(document.object) %}
-            <li>
-                {{ document.object|chill_document_edit_button }}
-            </li>
-        {% endif %}
-        {% if is_granted('CHILL_ACCOMPANYING_COURSE_DOCUMENT_UPDATE', document) %}
-            <li>
-                <a href="{{ path('accompanying_course_document_edit', {'id': document.id, 'course': accompanyingCourse.id}) }}"
-                   class="btn btn-edit" title="{{ 'Edit attributes' | trans }}"></a>
-            </li>
-        {% endif %}
-        {% set workflows_frame = chill_entity_workflow_list('Chill\\DocStoreBundle\\Entity\\AccompanyingCourseDocument', document.id) %}
-        {% if workflows_frame is not empty %}
-            <li>
-                {{ workflows_frame|raw }}
-            </li>
-        {% endif %}
-    </ul>
-</div>
-{% endblock %}
+	</dl>

-{% block block_post_menu %}
-    <div class="post-menu pt-4"></div>
-{% endblock %}
+	<ul class="record_actions">
+		<li class="cancel">
+			<a href="{{ path('accompanying_course_document_index', {'course': accompanyingCourse.id}) }}" class="btn btn-cancel">
+				{{ 'Back to the list' | trans }}
+			</a>
+		</li>

-{% block js %}
-    {{ parent() }}
-    {{ encore_entry_script_tags('mod_async_upload') }}
-    {{ encore_entry_script_tags('mod_entity_workflow_pick') }}
-{% endblock %}
+		<li>
+			{{ m.download_button(document.object, document.title) }}
+		</li>
+
+		{% if is_granted('CHILL_ACCOMPANYING_COURSE_DOCUMENT_UPDATE', document) %}
+			<li>
+				<a href="{{ path('accompanying_course_document_edit', {'id': document.id, 'course': accompanyingCourse.id}) }}" class="btn btn-edit">
+					{{ 'Edit' | trans }}
+				</a>
+			</li>
+		{% endif %}
+	{% endblock %}
--- a/src/Bundle/ChillDocStoreBundle/Resources/views/Button/wopi_edit_document.html.twig
+++ b/src/Bundle/ChillDocStoreBundle/Resources/views/Button/wopi_edit_document.html.twig
@@ -1,9 +0,0 @@
-
-{# Twig way
-    TODO: une route, un template avec un header CHILL et un iframe
-#}
-<a href="{{ chill_path_add_return_path('chill_wopi_file_edit', {'fileId': document.uuid}) }}"
-    class="btn btn-wopilink">
-    {{ 'online_edit_document'|trans }}
-</a>
-
--- a/src/Bundle/ChillDocStoreBundle/Resources/views/List/list_item.html.twig
+++ b/src/Bundle/ChillDocStoreBundle/Resources/views/List/list_item.html.twig
@@ -1,83 +0,0 @@
-{% import "@ChillDocStore/Macro/macro.html.twig" as m %}
-{% import "@ChillDocStore/Macro/macro_mimeicon.html.twig" as mm %}
-<div class="item-bloc">
-    <div class="item-row">
-        <div class="item-col">
-            <div class="denomination h2">
-                {{ document.title }}
-            </div>
-            <div>
-                {{ mm.mimeIcon(document.object.type) }}
-            </div>
-            <div>
-                <p>{{ document.category.name|localize_translatable_string }}</p>
-            </div>
-            {% if document.template is not null %}
-                <div>
-                    <p>{{ document.template.name.fr }}</p>
-                </div>
-            {% endif %}
-        </div>
-
-        <div class="item-col">
-            <div class="container">
-                {% if document.date is not null %}
-                    <div class="dates row" style="float: right;">
-                        <span>{{ document.createdAt|format_date('short') }}</span>
-                    </div>
-                {% endif %}
-            </div>
-        </div>
-    </div>
-    {% if document.description is not empty %}
-        <div class="item-row separator">
-            <blockquote class="chill-user-quote">
-                {{ document.description|chill_markdown_to_html }}
-            </blockquote>
-        </div>
-    {% endif %}
-    <div class="item-row separator">
-        <div class="item-col item-meta">
-            <div class="updatedBy">
-                {{ 'Created by'|trans }}:
-                <span class="user">{{ document.createdBy|chill_entity_render_string }}</span>
-                <span class="date">le {{ document.createdAt|format_date('long') }}</span>
-            </div>
-        </div>
-    </div>
-    <div>
-    {% if document.course is defined %}
-        <ul class="record_actions">
-            {% if is_granted('CHILL_ACCOMPANYING_COURSE_DOCUMENT_SEE_DETAILS', document) %}
-                <li>
-                    {{ m.download_button(document.object, document.title) }}
-                </li>
-                <li>
-                    <a href="{{ chill_path_add_return_path('accompanying_course_document_show', {'course': accompanyingCourse.id, 'id': document.id}) }}" class="btn btn-show"></a>
-                </li>
-            {% endif %}
-            {% if is_granted('CHILL_ACCOMPANYING_COURSE_DOCUMENT_UPDATE', document) %}
-                <li>
-                    <a href="{{ path('accompanying_course_document_edit', {'course': accompanyingCourse.id, 'id': document.id }) }}" class="btn btn-update"></a>
-                </li>
-            {% endif %}
-        </ul>
-    {% else %}
-        <ul class="record_actions">
-            {% if is_granted('CHILL_PERSON_DOCUMENT_SEE_DETAILS', document) %}
-                <li>
-                    {{ m.download_button(document.object, document.title) }}
-                </li>
-                <li>
-                    <a href="{{ path('person_document_show', {'person': person.id, 'id': document.id}) }}" class="btn btn-show"></a>
-                </li>
-            {% endif %}
-            {% if is_granted('CHILL_PERSON_DOCUMENT_UPDATE', document) %}
-                <li>
-                    <a href="{{ path('person_document_edit', {'person': person.id, 'id': document.id}) }}" class="btn btn-update"></a>
-                </li>
-            {% endif %}
-        </ul>
-    {% endif %}
-    </div>
-</div>
--- a/src/Bundle/ChillDocStoreBundle/Resources/views/Macro/macro_mimeicon.html.twig
+++ b/src/Bundle/ChillDocStoreBundle/Resources/views/Macro/macro_mimeicon.html.twig
@@ -1,55 +0,0 @@
-{% macro mimeIcon(type) %}
-    
-    {# mapping
-        forkawesome and mime type  https://gist.github.com/colemanw/9c9a12aae16a4bfe2678de86b661d922
-    #}
-    {% set mapmime = {
-        'image': 'fa-file-image-o',
-        'audio': 'fa-file-audio-o',
-        'video': 'fa-file-video-o',
-        'application/pdf': 'fa-file-pdf-o',
-        'application/msword': 'fa-file-word-o',
-        'application/vnd.ms-word': 'fa-file-word-o',
-        'application/vnd.oasis.opendocument.text': 'fa-file-word-o',
-        'application/vnd.openxmlformats-officedocument.wordprocessingml': 'fa-file-word-o',
-        'application/vnd.ms-excel': 'fa-file-excel-o',
-        'application/vnd.openxmlformats-officedocument.spreadsheetml': 'fa-file-excel-o',
-        'application/vnd.oasis.opendocument.spreadsheet': 'fa-file-excel-o',
-        'application/vnd.ms-powerpoint': 'fa-file-powerpoint-o',
-        'application/vnd.openxmlformats-officedocument.presentationml': 'fa-file-powerpoint-o',
-        'application/vnd.oasis.opendocument.presentation': 'fa-file-powerpoint-o',
-        'text/plain': 'fa-file-text-o',
-        'text/html': 'fa-file-code-o',
-        'application/json': 'fa-file-code-o',
-        'application/gzip': 'fa-file-archive-o',
-        'application/zip': 'fa-file-archive-o',
-    } %}
-    
-    {% set icon = 'fa-file-o' %}
-    {% for key,val in mapmime %}
-        {% if type starts with key %}
-            {% set icon = val %}
-        {% endif %}
-    {% endfor %}
-    
-    {# TODO improve mapping
-        mime type and friendly name  https://gist.github.com/rosskmurphy/3724501
-    #}
-    {% set maptype = {
-        'fa-file-word-o': 'office document/texte',
-        'fa-file-excel-o': 'office document/tableur',
-        'fa-file-powerpoint-o': 'office document/presentation',
-    } %}
-    
-    {% set label = type %}
-    {% for key, val in maptype %}
-        {% if icon == key %}
-            {% set label = val %}
-        {% endif %}
-    {% endfor %}
-    
-    <div class="metadata">
-        <i class="fa {{ icon }} fa-lg me-1"></i>
-        {{ label|capitalize }}
-    </div>
-{% endmacro %}
--- a/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/edit.html.twig
+++ b/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/edit.html.twig
@@ -30,9 +30,7 @@
    {{ form_row(form.title) }}
    {{ form_row(form.date) }}
    {{ form_row(form.category) }}
-    {% if form.scope is defined %}
-        {{ form_row(form.scope) }}
-    {% endif %}
+    {{ form_row(form.scope) }}
    {{ form_row(form.description) }}
    {{ form_row(form.object, { 'label': 'Document', 'existing': document.object }) }}

--- a/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/index.html.twig
+++ b/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/index.html.twig
@@ -30,24 +30,54 @@
 {% endblock %}

 {% block personcontent %}
-
-<div class="col-md-10 col-xxl">
 	<h1>{{ 'Documents for %name%'|trans({ '%name%': person|chill_entity_render_string } ) }}</h1>

-	{% if documents|length == 0 %}
-            <p class="chill-no-data-statement">{{ 'No documents'|trans }}</p>
-    {% else %}
-		<div class="flex-table chill-task-list">
-			{% for document in documents %}
-				{% include 'ChillDocStoreBundle:List:list_item.html.twig' %}
-			{% endfor %}
-		</div>
-    {% endif %}
+	<table class="table table-bordered border-dark table-striped">

-	{{ chill_pagination(pagination) }}
+		<thead>
+			<tr>
+				<th>{{ 'Title' | trans }}</th>
+				<th>{{ 'Category'|trans }}</th>
+				<th>{{ 'Circle' | trans }}</th>
+				<th>{{ 'Actions' | trans }}</th>
+			</tr>
+		</thead>
+		<tbody>
+			{% for document in documents %}
+				<tr>
+					<td>{{ document.title }}</td>
+					<td>{{ document.category.name|localize_translatable_string }}</td>
+					<td>{{ document.scope.name|localize_translatable_string }}</td>
+					<td>
+						<ul class="record_actions">
+							{% if is_granted('CHILL_PERSON_DOCUMENT_SEE_DETAILS', document) %}
+								<li>
+									{{ m.download_button(document.object, document.title) }}
+								</li>
+								<li>
+									<a href="{{ path('person_document_show', {'person': person.id, 'id': document.id}) }}" class="btn btn-show"></a>
+								</li>
+							{% endif %}
+							{% if is_granted('CHILL_PERSON_DOCUMENT_UPDATE', document) %}
+								<li>
+									<a href="{{ path('person_document_edit', {'person': person.id, 'id': document.id}) }}" class="btn btn-update"></a>
+								</li>
+							{% endif %}
+						</ul>
+					</td>
+				</tr>
+			{% else %}
+				<tr>
+					<td colspan="9" style="text-align:center;">
+						<span class="chill-no-data-statement">{{ 'Any document found'|trans }}</span>
+					</td>
+				</tr>
+			{% endfor %}
+		</tbody>
+	</table>

 	{% if is_granted('CHILL_PERSON_DOCUMENT_CREATE', person) %}
-		<ul class="record_actions sticky-form-buttons">
+		<ul class="record_actions">
 			<li class="create">
 				<a href="{{ path('person_document_new', {'person': person.id}) }}" class="btn btn-create">
 					{{ 'Create new document' | trans }}
@@ -55,6 +85,4 @@
 			</li>
 		</ul>
 	{% endif %}
-
-</div>
 {% endblock %}
--- a/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/show.html.twig
+++ b/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/show.html.twig
@@ -19,7 +19,6 @@
 {% set activeRouteKey = '' %}

 {% import "@ChillDocStore/Macro/macro.html.twig" as m %}
-{% import "@ChillDocStore/Macro/macro_mimeicon.html.twig" as mm %}

 {% block title %}{{ 'Detail of document of %name%'|trans({ '%name%': person|chill_entity_render_string } ) }}{% endblock %}

@@ -30,16 +29,12 @@
 {% block personcontent %}
    <h1>{{ 'Document %title%' | trans({ '%title%': document.title }) }}</h1>

-    {{ mm.mimeIcon(document.object.type) }}
-
    <dl class="chill_view_data">
        <dt>{{ 'Title'|trans }}</dt>
        <dd>{{ document.title }}</dd>

-        {% if document.scope is not null %}
        <dt>{{ 'Scope' | trans }}</dt>
        <dd>{{ document.scope.name | localize_translatable_string }}</dd>
-        {% endif %}

        <dt>{{ 'Category'|trans }}</dt>
        <dd>{{ document.category.name|localize_translatable_string }}</dd>
@@ -57,7 +52,7 @@

    </dl>

-    <ul class="record_actions sticky-form-buttons">
+    <ul class="record_actions">
        <li class="cancel">
            <a href="{{ path('person_document_index', {'person': person.id}) }}" class="btn btn-cancel">
                {{ 'Back to the list' | trans }}
@@ -68,12 +63,6 @@
            {{ m.download_button(document.object, document.title) }}
        </li>

-        {% if chill_document_is_editable(document.object) %}
-            <li>
-                {{ document.object|chill_document_edit_button }}
-            </li>
-        {% endif %}
-
        {% if is_granted('CHILL_PERSON_DOCUMENT_UPDATE', document) %}
            <li>
                <a href="{{ path('person_document_edit', {'id': document.id, 'person': person.id}) }}" class="btn btn-edit">
--- a/src/Bundle/ChillDocStoreBundle/Templating/WopiEditTwigExtension.php
+++ b/src/Bundle/ChillDocStoreBundle/Templating/WopiEditTwigExtension.php
@@ -1,36 +0,0 @@
-<?php
-
-/**
- * Chill is a software for social workers
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-declare(strict_types=1);
-
-namespace Chill\DocStoreBundle\Templating;
-
-use Twig\Extension\AbstractExtension;
-use Twig\TwigFilter;
-use Twig\TwigFunction;
-
-class WopiEditTwigExtension extends AbstractExtension
-{
-    public function getFilters(): array
-    {
-        return [
-            new TwigFilter('chill_document_edit_button', [WopiEditTwigExtensionRuntime::class, 'renderEditButton'], [
-                'needs_environment' => true,
-                'is_safe' => ['html'],
-            ]),
-        ];
-    }
-
-    public function getFunctions(): array
-    {
-        return [
-            new TwigFunction('chill_document_is_editable', [WopiEditTwigExtensionRuntime::class, 'isEditable']),
-        ];
-    }
-}
--- a/src/Bundle/ChillDocStoreBundle/Templating/WopiEditTwigExtensionRuntime.php
+++ b/src/Bundle/ChillDocStoreBundle/Templating/WopiEditTwigExtensionRuntime.php
@@ -1,55 +0,0 @@
-<?php
-
-/**
- * Chill is a software for social workers
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-declare(strict_types=1);
-
-namespace Chill\DocStoreBundle\Templating;
-
-use ChampsLibres\WopiLib\Contract\Service\Discovery\DiscoveryInterface;
-use Chill\DocStoreBundle\Entity\StoredObject;
-use Twig\Environment;
-use Twig\Extension\RuntimeExtensionInterface;
-use function array_key_exists;
-
-class WopiEditTwigExtensionRuntime implements RuntimeExtensionInterface
-{
-    public const TEMPLATE = '@ChillDocStore/Button/wopi_edit_document.html.twig';
-
-    private DiscoveryInterface $discovery;
-
-    public function __construct(DiscoveryInterface $discovery)
-    {
-        $this->discovery = $discovery;
-    }
-
-    public function isEditable(StoredObject $document): bool
-    {
-        $mime_type = $this->discovery->discoverMimeType($document->getType());
-
-        if ([] === $mime_type) {
-            return false;
-        }
-
-        foreach ($mime_type as $item) {
-            if (array_key_exists('default', $item) && 'true' === $item['default']) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    public function renderEditButton(Environment $environment, StoredObject $document, ?array $options = null): string
-    {
-        return $environment->render(self::TEMPLATE, [
-            'document' => $document,
-            'options' => $options,
-        ]);
-    }
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
nobohan	5e1dfee70f	address render test : more tentatives to use parameter bag (unsuccessful)	2022-01-07 10:22:37 +01:00
nobohan	73f11ccb1a	address: add country aware renderCountryLine (make tests failing)	2022-01-06 21:31:02 +01:00
nobohan	d14edd469e	address: render address lines in vue AddressRenderBox	2022-01-06 21:15:56 +01:00
nobohan	fd40ae0198	address: fix address lines in case of noAddress + add test	2022-01-06 18:30:21 +01:00
nobohan	7d20f842a2	address: use renderAdress::renderLines in twig template	2022-01-06 17:02:17 +01:00
nobohan	e82a71b833	address: use address lines in address normalizer + fix tests (for distribution)	2022-01-06 15:29:42 +01:00
nobohan	3b20ac85d9	address: more unit test for address render template	2022-01-06 15:14:47 +01:00
nobohan	6bae7606dd	address: add unit test for address render template	2022-01-06 15:08:59 +01:00
nobohan	4c4a003977	address: render lines: code style fixed	2022-01-06 11:55:32 +01:00
nobohan	077317c2bf	address: renderLines	2022-01-06 11:51:10 +01:00
nobohan	3c2ebee12a	address: render distribution in street line + init renderLines function	2022-01-05 18:42:27 +01:00