improve workflow decision form

add age/ person text component

See merge request Chill-Projet/chill-bundles!308

.env.test

@@ -3,4 +3,3 @@
 # Run tests from root to adapt your own environment
 KERNEL_CLASS='App\Kernel'
 APP_SECRET='$ecretf0rt3st'
-DATABASE_URL=postgresql://postgres:postgres@db:5432/postgres?serverVersion=12&charset=utf8

.gitlab-ci.yml

@@ -20,6 +20,8 @@ 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

CHANGELOG.md

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

composer.json

@@ -33,7 +33,8 @@
         "symfony/form": "^4.4",
         "symfony/framework-bundle": "^4.4",
         "symfony/intl": "^4.4",
-        "symfony/mime": "^4.4",
+        "symfony/mailer": "^5.4",
+        "symfony/mime": "^5.4",
         "symfony/monolog-bundle": "^3.5",
         "symfony/security-bundle": "^4.4",
         "symfony/serializer": "^5.3",
@@ -47,13 +48,16 @@
         "symfony/yaml": "^4.4",
         "twig/extra-bundle": "^3.0",
         "twig/intl-extra": "^3.0",
-        "twig/markdown-extra": "^3.3"
+        "twig/markdown-extra": "^3.3",
+        "twig/string-extra": "^3.3",
+        "twig/twig": "^3.0"
     },
     "require-dev": {
         "doctrine/doctrine-fixtures-bundle": "^3.3",
         "drupol/php-conventions": "^5",
         "fakerphp/faker": "^1.13",
         "nelmio/alice": "^3.8",
+        "phpspec/prophecy-phpunit": "^2.0",
         "phpstan/phpstan-strict-rules": "^1.0",
         "phpunit/phpunit": ">= 7.5",
         "symfony/debug-bundle": "^5.1",
@@ -70,8 +74,11 @@
     "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",
@@ -80,9 +87,6 @@
             "Chill\\ReportBundle\\": "src/Bundle/ChillReportBundle",
             "Chill\\TaskBundle\\": "src/Bundle/ChillTaskBundle",
             "Chill\\ThirdPartyBundle\\": "src/Bundle/ChillThirdPartyBundle",
-            "Chill\\AsideActivityBundle\\": "src/Bundle/ChillAsideActivityBundle/src",
-            "Chill\\DocGeneratorBundle\\": "src/Bundle/ChillDocGeneratorBundle",
-            "Chill\\CalendarBundle\\": "src/Bundle/ChillCalendarBundle",
             "Chill\\WopiBundle\\": "src/Bundle/ChillWopiBundle/src"
         }
     },
@@ -95,10 +99,10 @@
     "config": {
         "allow-plugins": {
             "composer/package-versions-deprecated": true,
-            "phpstan/extension-installer": true,
             "ergebnis/composer-normalize": true,
+            "ocramius/package-versions": true,
             "phpro/grumphp": true,
-            "ocramius/package-versions": true
+            "phpstan/extension-installer": true
         },
         "bin-dir": "bin",
         "optimize-autoloader": true,
@@ -107,8 +111,8 @@
     },
     "scripts": {
         "auto-scripts": {
-            "cache:clear": "symfony-cmd",
-            "assets:install %PUBLIC_DIR%": "symfony-cmd"
+            "assets:install %PUBLIC_DIR%": "symfony-cmd",
+            "cache:clear": "symfony-cmd"
         }
     }
 }

package.json.txt

@@ -1,3 +0,0 @@
-add npm/yarn dependency in package.json :
-
-"select2-bootstrap-theme": "0.1.0-beta.10",

phpstan-baseline.neon

@@ -80,11 +80,6 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillPersonBundle/Form/ChoiceLoader/PersonChoiceLoader.php
 
-		-
-			message: "#^Foreach overwrites \\$action with its value variable\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkRepository.php
-
 		-
 			message: "#^Foreach overwrites \\$action with its value variable\\.$#"
 			count: 1

phpstan-critical.neon

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

phpstan-types.neon

@@ -315,11 +315,6 @@ 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
@@ -405,11 +400,6 @@ 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

phpunit.xml.dist

@@ -6,7 +6,6 @@
          backupGlobals="false"
          colors="true"
          bootstrap="tests/app/tests/bootstrap.php"
-         stopOnFailure="true"
 >
     <php>
         <ini name="error_reporting" value="-1" />

src/Bundle/ChillActivityBundle/Controller/ActivityController.php

@@ -31,6 +31,7 @@ use DateTime;
 use Doctrine\ORM\EntityManagerInterface;
 use InvalidArgumentException;
 use Psr\Log\LoggerInterface;
+use RuntimeException;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\Form\Extension\Core\Type\SubmitType;
@@ -38,8 +39,8 @@ use Symfony\Component\Form\FormInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Security\Core\Role\Role;
-use Symfony\Component\Serializer\SerializerInterface;
 
+use Symfony\Component\Serializer\SerializerInterface;
 use function array_key_exists;
 
 final class ActivityController extends AbstractController
@@ -255,7 +256,7 @@ final class ActivityController extends AbstractController
         if ($person instanceof Person) {
             $this->denyAccessUnlessGranted(ActivityVoter::SEE, $person);
             $activities = $this->activityACLAwareRepository
-                ->findByPerson($person, ActivityVoter::SEE, 0, null);
+                ->findByPerson($person, ActivityVoter::SEE, 0, null, ['date' => 'DESC', 'id' => 'DESC']);
 
             $event = new PrivacyEvent($person, [
                 'element_class' => Activity::class,
@@ -268,7 +269,7 @@ final class ActivityController extends AbstractController
             $this->denyAccessUnlessGranted(ActivityVoter::SEE, $accompanyingPeriod);
 
             $activities = $this->activityACLAwareRepository
-                ->findByAccompanyingPeriod($accompanyingPeriod, ActivityVoter::SEE);
+                ->findByAccompanyingPeriod($accompanyingPeriod, ActivityVoter::SEE, 0, null, ['date' => 'DESC', 'id' => 'DESC']);
 
             $view = 'ChillActivityBundle:Activity:listAccompanyingCourse.html.twig';
         }
@@ -471,20 +472,21 @@ final class ActivityController extends AbstractController
 
     public function showAction(Request $request, int $id): Response
     {
-        $view = null;
+        $entity = $this->activityRepository->find($id);
 
-        [$person, $accompanyingPeriod] = $this->getEntity($request);
+        if (null === $entity) {
+            throw $this->createNotFoundException('Unable to find Activity entity.');
+        }
+
+        $accompanyingPeriod = $entity->getAccompanyingPeriod();
+        $person = $entity->getPerson();
 
         if ($accompanyingPeriod instanceof AccompanyingPeriod) {
             $view = 'ChillActivityBundle:Activity:showAccompanyingCourse.html.twig';
         } elseif ($person instanceof Person) {
             $view = 'ChillActivityBundle:Activity:showPerson.html.twig';
-        }
-
-        $entity = $this->activityRepository->find($id);
-
-        if (null === $entity) {
-            throw $this->createNotFoundException('Unable to find Activity entity.');
+        } else {
+            throw new RuntimeException('the activity should be linked with a period or person');
         }
 
         if (null !== $accompanyingPeriod) {
@@ -493,8 +495,7 @@ final class ActivityController extends AbstractController
             $entity->personsNotAssociated = $entity->getPersonsNotAssociated();
         }
 
-        // TODO revoir le Voter de Activity pour tenir compte qu'une activité peut appartenir a une période
-        // $this->denyAccessUnlessGranted('CHILL_ACTIVITY_SEE', $entity);
+        $this->denyAccessUnlessGranted(ActivityVoter::SEE, $entity);
 
         $deleteForm = $this->createDeleteForm($entity->getId(), $person, $accompanyingPeriod);
 

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\Document;
+use Chill\DocStoreBundle\Entity\StoredObject;
 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"})
+     * @Groups({"read", "docgen:read"})
      * @SerializedName("activityType")
      * @ORM\JoinColumn(name="type_id")
      */
@@ -75,16 +75,19 @@ 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;
 
@@ -100,6 +103,7 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
 
     /**
      * @ORM\Column(type="boolean", options={"default": false})
+     * @Groups({"docgen:read"})
      */
     private bool $emergency = false;
 
@@ -107,13 +111,13 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
      * @ORM\Id
      * @ORM\Column(name="id", type="integer")
      * @ORM\GeneratedValue(strategy="AUTO")
-     * @Groups({"read"})
+     * @Groups({"read", "docgen:read"})
      */
     private ?int $id = null;
 
     /**
      * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\Location")
-     * @groups({"read"})
+     * @groups({"read", "docgen:read"})
      */
     private ?Location $location = null;
 
@@ -124,42 +128,45 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
 
     /**
      * @ORM\ManyToMany(targetEntity="Chill\PersonBundle\Entity\Person")
-     * @Groups({"read"})
+     * @Groups({"read", "docgen:read"})
      */
     private ?Collection $persons = null;
 
     /**
      * @ORM\ManyToMany(targetEntity="Chill\ActivityBundle\Entity\ActivityReason")
+     * @Groups({"docgen:read"})
      */
     private Collection $reasons;
 
     /**
      * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\Scope")
+     * @Groups({"docgen:read"})
      */
     private ?Scope $scope = null;
 
     /**
      * @ORM\Column(type="string", options={"default": ""})
+     * @Groups({"docgen:read"})
      */
     private string $sentReceived = '';
 
     /**
      * @ORM\ManyToMany(targetEntity="Chill\PersonBundle\Entity\SocialWork\SocialAction")
      * @ORM\JoinTable(name="chill_activity_activity_chill_person_socialaction")
-     * @Groups({"read"})
+     * @Groups({"read", "docgen:read"})
      */
     private Collection $socialActions;
 
     /**
      * @ORM\ManyToMany(targetEntity="Chill\PersonBundle\Entity\SocialWork\SocialIssue")
      * @ORM\JoinTable(name="chill_activity_activity_chill_person_socialissue")
-     * @Groups({"read"})
+     * @Groups({"read", "docgen:read"})
      */
     private Collection $socialIssues;
 
     /**
      * @ORM\ManyToMany(targetEntity="Chill\ThirdPartyBundle\Entity\ThirdParty")
-     * @Groups({"read"})
+     * @Groups({"read", "docgen:read"})
      */
     private ?Collection $thirdParties = null;
 
@@ -170,12 +177,13 @@ 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"})
+     * @Groups({"read", "docgen:read"})
      */
     private ?Collection $users = null;
 
@@ -191,7 +199,7 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
         $this->socialActions = new ArrayCollection();
     }
 
-    public function addDocument(Document $document): self
+    public function addDocument(StoredObject $document): self
     {
         $this->documents[] = $document;
 
@@ -302,6 +310,18 @@ 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;
@@ -402,6 +422,18 @@ 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
      */
@@ -425,7 +457,7 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
         return $this->getEmergency();
     }
 
-    public function removeDocument(Document $document): void
+    public function removeDocument(StoredObject $document): void
     {
         $this->documents->removeElement($document);
     }

src/Bundle/ChillActivityBundle/Entity/ActivityPresence.php

@@ -12,6 +12,7 @@ declare(strict_types=1);
 namespace Chill\ActivityBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
+use Symfony\Component\Serializer\Annotation as Serializer;
 
 /**
  * Class ActivityPresence.
@@ -31,11 +32,14 @@ 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 = [];
 

src/Bundle/ChillActivityBundle/Entity/ActivityType.php

@@ -13,8 +13,10 @@ 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.
@@ -118,6 +120,7 @@ class ActivityType
      * @ORM\Id
      * @ORM\Column(name="id", type="integer")
      * @ORM\GeneratedValue(strategy="AUTO")
+     * @Groups({"docgen:read"})
      */
     private ?int $id;
 
@@ -133,7 +136,8 @@ class ActivityType
 
     /**
      * @ORM\Column(type="json")
-     * @Groups({"read"})
+     * @Groups({"read", "docgen:read"})
+     * @Serializer\Context({"is-translatable": true}, groups={"docgen:read"})
      */
     private array $name = [];
 
@@ -190,7 +194,6 @@ 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;
 
@@ -260,6 +263,23 @@ 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.

src/Bundle/ChillActivityBundle/Form/ActivityType.php

@@ -307,6 +307,7 @@ 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',
             ]);
         }
 

src/Bundle/ChillActivityBundle/Notification/ActivityNotificationHandler.php

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

src/Bundle/ChillActivityBundle/Notification/ActivityNotificationRenderer.php

@@ -1,33 +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\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;
-    }
-}

src/Bundle/ChillActivityBundle/Resources/public/chill/chillactivity.scss

@@ -9,8 +9,9 @@ div.new-activity-select-type {
       display: flex;
       flex-direction: row;
       flex-wrap: wrap;
-      justify-content: center;
+      justify-content: flex-start;
       gap: 12px;
+      margin-bottom: 30px;
 
       div.bloc {
          width: 200px;
@@ -27,26 +28,28 @@ 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

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,

src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/ConcernedGroups.vue

@@ -1,45 +1,48 @@
 <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 in suggestedEntities" @click="addSuggestedEntity(p)">
-                    <span>{{ 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, 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>
 
-        <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>
+      <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
+      PersonsBloc,
+      PersonText
    },
    data() {
       return {

src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/ConcernedGroups/PersonBadge.vue

@@ -1,21 +1,29 @@
 <template>
    <li>
       <span :title="person.text">
-         <span class="chill_denomination" @click.prevent="$emit('remove', person)">{{ textCutted }}</span>
+         <span class="chill_denomination" @click.prevent="$emit('remove', person)">
+            <person-text :person="person" :isCut="true"></person-text>
+         </span>
       </span>
    </li>
 </template>
 
 <script>
+import PersonText from 'ChillPersonAssets/vuejs/_components/Entity/PersonText.vue';
+
+
 export default {
    name: "PersonBadge",
    props: ['person'],
-   computed: {
-      textCutted() {
-         let more = (this.person.text.length > 15) ?'…' : '';
-         return this.person.text.slice(0,15) + more;
-      }
+   components: {
+      PersonText
    },
+   // computed: {
+   //    textCutted() {
+   //       let more = (this.person.text.length > 15) ?'…' : '';
+   //       return this.person.text.slice(0,15) + more;
+   //    }
+   // },
    emits: ['remove'],
 }
 </script>

src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/Location.vue

@@ -15,14 +15,16 @@
                     :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:locations="locations"></new-location>
+                <new-location v-bind:availableLocations="availableLocations"></new-location>
             </div>
         </div>
     </teleport>
@@ -32,7 +34,6 @@
 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",

src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/Location/NewLocation.vue

@@ -18,15 +18,6 @@
                 </template>
                 <template v-slot:body>
                     <form>
-                        <div class="form-floating mb-3">
-                            <p v-if="errors.length">
-                                <b>{{ $t('activity.errors') }}</b>
-                                <ul>
-                                    <li v-for="error in errors" :key="error">{{ error }}</li>
-                                </ul>
-                            </p>
-                        </div>
-
                         <div class="form-floating mb-3">
                             <select class="form-select form-select-lg" id="type" required v-model="selectType">
                                 <option selected disabled value="">{{ $t('activity.choose_location_type') }}</option>
@@ -62,6 +53,12 @@
                             <input class="form-control form-control-lg" id="email" v-model="inputEmail" placeholder />
                             <label for="email">{{ $t('activity.location_fields.email') }}</label>
                         </div>
+
+                        <div class="alert alert-warning" v-if="errors.length">
+                            <ul>
+                                <li v-for="(e, i) in errors" :key="i">{{ e }}</li>
+                            </ul>
+                        </div>
                     </form>
                 </template>
                 <template v-slot:footer>
@@ -81,7 +78,8 @@
 import Modal from 'ChillMainAssets/vuejs/_components/Modal.vue';
 import AddAddress from "ChillMainAssets/vuejs/Address/components/AddAddress.vue";
 import { mapState } from "vuex";
-import { getLocationTypes, postLocation } from "../../api";
+import { getLocationTypes } from "../../api";
+import { makeFetch } from 'ChillMainAssets/lib/api/apiMethods';
 
 export default {
     name: "NewLocation",
@@ -89,7 +87,7 @@ export default {
         Modal,
         AddAddress,
     },
-    props: ['locations'],
+    props: ['availableLocations'],
     data() {
         return {
             errors: [],
@@ -223,7 +221,6 @@ export default {
         },
         saveNewLocation() {
             if (this.checkForm()) {
-                console.log('saveNewLocation', this.selected);
                 let body = {
                     type: 'location',
                     name: this.selected.name,
@@ -242,23 +239,28 @@ export default {
                         }
                     });
                 }
-                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);
+
+                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');
                         }
-                    );
+                    })
             };
         },
         submitNewAddress(payload) {
-            console.log('submitNewAddress', payload);
             this.selected.addressId = payload.addressId;
             this.addAddress.context.addressId = payload.addressId;
             this.addAddress.context.edit = true;

src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc.vue

@@ -9,9 +9,9 @@
 
             <check-social-issue
                v-for="issue in socialIssuesList"
-               v-bind:key="issue.id"
-               v-bind:issue="issue"
-               v-bind:selection="socialIssuesSelected"
+               :key="issue.id"
+               :issue="issue"
+               :selection="socialIssuesSelected"
                @updateSelected="updateIssuesSelected">
             </check-social-issue>
 
@@ -21,18 +21,18 @@
                label="text"
                track-by="id"
                open-direction="bottom"
-               v-bind:close-on-select="true"
-               v-bind:preserve-search="false"
-               v-bind:reset-after="true"
-               v-bind:hide-selected="true"
-               v-bind:taggable="false"
-               v-bind:multiple="false"
-               v-bind:searchable="true"
-               v-bind:allow-empty="true"
-               v-bind:show-labels="false"
-               v-bind:loading="issueIsLoading"
-               v-bind:placeholder="$t('activity.choose_other_social_issue')"
-               v-bind:options="socialIssuesOther"
+               :close-on-select="true"
+               :preserve-search="false"
+               :reset-after="true"
+               :hide-selected="true"
+               :taggable="false"
+               :multiple="false"
+               :searchable="true"
+               :allow-empty="true"
+               :show-labels="false"
+               :loading="issueIsLoading"
+               :placeholder="$t('activity.choose_other_social_issue')"
+               :options="socialIssuesOther"
                @select="addIssueInList">
             </VueMultiselect>
             </div>
@@ -58,9 +58,9 @@
                  <check-social-action
                      v-if="socialIssuesSelected.length || socialActionsSelected.length"
                      v-for="action in socialActionsList"
-                     v-bind:key="action.id"
-                     v-bind:action="action"
-                     v-bind:selection="socialActionsSelected"
+                     :key="action.id"
+                     :action="action"
+                     :selection="socialActionsSelected"
                      @updateSelected="updateActionsSelected">
                  </check-social-action>
              </template>

src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/i18n.js

@@ -1,4 +1,5 @@
 import { personMessages } from 'ChillPersonAssets/vuejs/_js/i18n'
+import { multiSelectMessages } from 'ChillMainAssets/vuejs/_js/i18n'
 
 const activityMessages = {
    fr: {
@@ -33,12 +34,11 @@ const activityMessages = {
           },
           create_address: 'Créer une adresse',
           edit_address: "Modifier l'adresse"
-
       }
    }
 }
 
-Object.assign(activityMessages.fr, personMessages.fr);
+Object.assign(activityMessages.fr, personMessages.fr, multiSelectMessages.fr);
 
 export {
    activityMessages

src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/index.js

@@ -12,7 +12,11 @@ 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,

src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/store.js

@@ -240,6 +240,9 @@ 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) {

src/Bundle/ChillActivityBundle/Resources/views/Activity/_list_item.html.twig

@@ -0,0 +1,170 @@
+{% 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_string|capitalize }}
+                        </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>

src/Bundle/ChillActivityBundle/Resources/views/Activity/concernedGroups.html.twig

@@ -3,11 +3,13 @@
     {{ path(pathname, parms) }}
 {% endmacro %}
 
-{% macro insert_onthefly(type, entity) %}
+{% macro insert_onthefly(type, entity, parent = null) %}
     {% include '@ChillMain/OnTheFly/_insert_vue_onthefly.html.twig' with {
         action: 'show', displayBadge: true,
         targetEntity: { name: type, id: entity.id },
-        buttonText: entity|chill_entity_render_string
+        buttonText: entity|chill_entity_render_string,
+        isDead: entity.deathdate is defined and entity.deathdate is not null,
+        parent: parent
     } %}
 {% endmacro %}
 
@@ -59,7 +61,7 @@
     }]) %}
 {% endif %}
 
-{% if (with_display == 'bloc') %}
+{% if (render == 'bloc') %}
 <div class="{{ context }} flex-bloc concerned-groups">
     {% for bloc in blocks %}
 
@@ -90,7 +92,7 @@
 </div>
 {% endif %}
 
-{% if (with_display == 'row') %}
+{% if (render == 'row') %}
 <div class="concerned-groups">
     {% for bloc in blocks %}
     <div class="group">
@@ -115,7 +117,7 @@
 </div>
 {% endif %}
 
-{% if (with_display == 'wrap-list') %}
+{% if (render == 'wrap-list') %}
 <div class="concerned-groups wrap-list">
     {% for bloc in blocks %}
         <div class="wl-row">

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

src/Bundle/ChillActivityBundle/Resources/views/Activity/editAccompanyingCourse.html.twig

@@ -15,7 +15,7 @@
 
 {% block js %}
     {{ parent() }}
-    {{ encore_entry_link_tags('mod_async_upload') }}
+    {{ encore_entry_script_tags('mod_async_upload') }}
     <script type="text/javascript">
         window.addEventListener('DOMContentLoaded', function (e) {
             chill.displayAlertWhenLeavingModifiedForm('form[name="{{ edit_form.vars.form.vars.name }}"]',
@@ -24,10 +24,12 @@
         window.activity = {{ activity_json|json_encode|raw }};
     </script>
     {{ encore_entry_script_tags('vue_activity') }}
+    {{ encore_entry_script_tags('mod_docgen_picktemplate') }}
 {% endblock %}
 
 {% block css %}
     {{ parent() }}
     {{ encore_entry_link_tags('mod_async_upload') }}
     {{ encore_entry_link_tags('vue_activity') }}
+    {{ encore_entry_link_tags('mod_docgen_picktemplate') }}
 {% endblock %}

src/Bundle/ChillActivityBundle/Resources/views/Activity/editPerson.html.twig

@@ -30,7 +30,7 @@
 {% endblock %}
 
 {% block js %}
-    {{ encore_entry_link_tags('mod_async_upload') }}
+    {{ encore_entry_script_tags('mod_async_upload') }}
     <script type="text/javascript">
         window.addEventListener('DOMContentLoaded', function (e) {
             chill.displayAlertWhenLeavingModifiedForm('form[name="{{ edit_form.vars.form.vars.name }}"]',
@@ -39,9 +39,11 @@
         window.activity = {{ activity_json|json_encode|raw }};
     </script>
     {{ encore_entry_script_tags('vue_activity') }}
+    {{ encore_entry_script_tags('mod_docgen_picktemplate') }}
 {% endblock %}
 
 {% block css %}
     {{ encore_entry_link_tags('mod_async_upload') }}
     {{ encore_entry_link_tags('vue_activity') }}
+    {{ encore_entry_link_tags('mod_docgen_picktemplate') }}
 {% endblock %}

src/Bundle/ChillActivityBundle/Resources/views/Activity/list.html.twig

@@ -1,3 +1,65 @@
+{% 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 %}
@@ -8,203 +70,10 @@
     {% else %}
         <div class="flex-table activity-list">
             {% for activity in activities %}
-                {% 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>
+                {% include 'ChillActivityBundle:Activity:_list_item.html.twig' with {
+                    'context': context,
+                    'recordAction': _self.recordAction(activity, context, person_id, accompanying_course_id)
+                } %}
             {% endfor %}
         </div>
     {% endif %}

src/Bundle/ChillActivityBundle/Resources/views/Activity/listAccompanyingCourse.html.twig

@@ -4,6 +4,17 @@
 
 {% 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 %}

src/Bundle/ChillActivityBundle/Resources/views/Activity/listPerson.html.twig

@@ -20,6 +20,16 @@
 
 {% 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 %}

src/Bundle/ChillActivityBundle/Resources/views/Activity/list_recent.html.twig

@@ -48,7 +48,7 @@
                         <li class="associated-persons">
                             <span class="item-key">{{ 'Participants'|trans ~ ' : ' }}</span>
                             {% for p in activity.personsAssociated %}
-                                <span class="badge-person">{{ p|chill_entity_render_box }}</span>
+                                <span class="badge-person">{{ p|chill_entity_render_box({'addAgeBadge': true}) }}</span>
                             {% endfor %}
                         </li>
                     </ul>

src/Bundle/ChillActivityBundle/Resources/views/Activity/newPerson.html.twig

@@ -14,7 +14,7 @@
 {% endblock %}
 
 {% block js %}
-    {{ encore_entry_link_tags('mod_async_upload') }}
+    {{ 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 }}"]',

src/Bundle/ChillActivityBundle/Resources/views/Activity/selectType.html.twig

@@ -25,7 +25,7 @@
                     'activityData': activityData
                 }) }}">
 
-                    <div class="bloc btn btn-primary btn-lg btn-block">
+                    <div class="btn btn-primary">
                         {{ activityType.name|localize_translatable_string }}
                     </div>
                 </a>

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 }}</dd>
+                <dd>{{ entity.user|chill_entity_render_box }}</dd>
 
                 {%- if entity.scope -%}
                     <dt class="inline">{{ 'Scope'|trans }}</dt>
@@ -85,8 +85,8 @@
 
 {% include 'ChillActivityBundle:Activity:concernedGroups.html.twig' with {
     'context': context,
-    'with_display': 'bloc',
-    'badge_person': 'true'
+    'render': '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,11 +165,7 @@
                 <dt class="inline">{{ 'Attendee'|trans }}</dt>
                 <dd>
                     {% if entity.attendee is not null %}
-                        {% if entity.attendee %}
-                            {{ 'present'|trans|capitalize }}
-                        {% else %}
-                            {{ 'not present'|trans|capitalize }}
-                        {% endif %}
+                        {{ entity.attendee.name|localize_translatable_string }}
                     {% else %}
                         <span class="chill-no-data-statement">{{ 'None'|trans|capitalize }}</span>
                     {% endif %}
@@ -181,6 +177,13 @@
     </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 %}
@@ -197,24 +200,21 @@
             {{ 'Back to the list'|trans }}
         </a>
     </li>
-    {% if is_granted('CHILL_ACTIVITY_UPDATE', entity) %}
     <li>
-        <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 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>
     </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">
-            {{ '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" title="{{ 'Delete'|trans }}"></a>
     </li>
     {% endif %}
 </ul>
-<script>
-    import ShowPane from "../../../../ChillMainBundle/Resources/public/vuejs/Address/components/ShowPane";
-    export default {
-        components: {ShowPane}
-    }
-</script>

src/Bundle/ChillActivityBundle/Resources/views/Activity/showAccompanyingCourse.html.twig

@@ -4,6 +4,18 @@
 
 {% 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 -%}
@@ -11,3 +23,7 @@
     {% include 'ChillActivityBundle:Activity:show.html.twig' with {'context': 'accompanyingCourse'} %}
 </div>
 {% endblock content %}
+
+{% block block_post_menu %}
+<div class="post-menu pt-4"></div>
+{% endblock %}

src/Bundle/ChillActivityBundle/Resources/views/Activity/showInNotification.html.twig

@@ -1,2 +1,27 @@
+{% 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 %}
 
-<a href="{{ path('chill_activity_activity_show', {'id': notification.relatedEntityId })  }}">Go to Activity</a>
+{% 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 %}

src/Bundle/ChillActivityBundle/Resources/views/Activity/showPerson.html.twig

@@ -4,6 +4,18 @@
 
 {% 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 -%}
@@ -11,3 +23,20 @@
     {% 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 %}

src/Bundle/ChillActivityBundle/Service/DocGenerator/ActivityContext.php

@@ -0,0 +1,220 @@
+<?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\Document;
+use Chill\DocStoreBundle\Entity\StoredObject;
+use Chill\DocStoreBundle\Repository\DocumentCategoryRepository;
+use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
+use Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\Templating\Entity\PersonRender;
+use 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
+    {
+        $doc = new StoredObject();
+        // TODO push document to remote
+
+        $this->em->persist($doc);
+
+        $entity->addDocument($doc);
+    }
+}

src/Bundle/ChillActivityBundle/Tests/Security/Authorization/ActivityVoterTest.php

@@ -29,9 +29,13 @@ use Symfony\Component\Security\Core\Authorization\Voter\VoterInterface;
 final class ActivityVoterTest extends KernelTestCase
 {
     use PrepareActivityTrait;
+
     use PrepareCenterTrait;
+
     use PreparePersonTrait;
+
     use PrepareScopeTrait;
+
     use PrepareUserTrait;
 
     /**

src/Bundle/ChillActivityBundle/config/services.yaml

@@ -32,3 +32,8 @@ services:
         autowire: true
         autoconfigure: true
         resource: '../Validator/Constraints/'
+
+    Chill\ActivityBundle\Service\DocGenerator\:
+        autowire: true
+        autoconfigure: true
+        resource: '../Service/DocGenerator/'

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,3 +224,11 @@ 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

src/Bundle/ChillActivityBundle/translations/validators.fr.yml

@@ -20,3 +20,4 @@ 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"

src/Bundle/ChillAsideActivityBundle/src/Controller/AsideActivityController.php

@@ -32,6 +32,8 @@ 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);

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,22 +68,10 @@ final class AsideActivityFormType extends AbstractType
         ];
 
         $builder
-            ->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('agent', PickUserDynamicType::class, [
+                'label' => 'For agent',
+                'required' => true,
+            ])
             ->add(
                 'date',
                 ChillDateType::class,

src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/new.html.twig

@@ -1,5 +1,15 @@
 {% 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 %}
@@ -8,4 +18,5 @@
 {% embed '@ChillMain/CRUD/_new_content.html.twig' %}
     {% block content_form_actions_save_and_show %}{% endblock %}
 {% endembed %}
-{% endblock %}
+{% endblock %}
+

src/Bundle/ChillCalendarBundle/Resources/public/vuejs/_components/CalendarUserSelector/CalendarUserSelector.vue

@@ -13,6 +13,9 @@
         :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"

src/Bundle/ChillCalendarBundle/Resources/public/vuejs/_components/CalendarUserSelector/js/i18n.js

@@ -1,13 +1,17 @@
+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"
+  }
+};
  
- export {
-   calendarUserSelectorMessages
- };
+Object.assign(calendarUserSelectorMessages.fr, multiSelectMessages.fr);
+
+export {
+  calendarUserSelectorMessages
+};
  

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,
-                            'with_display': 'row',
+                            'render': 'row',
                             'entity': calendar
                         } %}
                     </div>

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, 'with_display': 'bloc' } %}
+{% include 'ChillActivityBundle:Activity:concernedGroups.html.twig' with {'context': context, 'render': '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 %}
     #}

src/Bundle/ChillDocGeneratorBundle/Controller/DocGeneratorTemplateController.php

@@ -276,7 +276,6 @@ final class DocGeneratorTemplateController extends AbstractController
             fwrite($templateResource, $dataDecrypted);
             rewind($templateResource);
         }
-
         $datas = $context->getData($template, $entity, $contextGenerationData);
 
         try {

src/Bundle/ChillDocGeneratorBundle/GeneratorDriver/RelatorioDriver.php

@@ -46,7 +46,6 @@ 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, [

src/Bundle/ChillDocGeneratorBundle/Resources/public/vuejs/_components/PickTemplate.vue

@@ -17,7 +17,7 @@
                             <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 }}</option>
+                                    <option v-bind:value="t.id">{{ t.name.fr || 'Aucun nom défini' }}</option>
                                 </template>
                             </select>
                             <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>
@@ -48,6 +48,7 @@ export default {
             required: true,
         },
         templates: {
+            type: Array,
             required: true,
         },
         // beforeMove execute "something" before
@@ -73,7 +74,11 @@ export default {
             return true;
         },
         getDescription() {
-            return this.templates.find(t => t.id === this.template).description || '';
+            let desc = this.templates.find(t => t.id === this.template);
+            if (null === desc) {
+                return '';
+            }
+            return desc.description || '';
         },
     },
     methods: {

src/Bundle/ChillDocGeneratorBundle/Resources/views/Admin/DocGeneratorTemplate/index.html.twig

@@ -23,11 +23,7 @@
                             <input type="hidden" name="entityClassName" value="{{ contextManager.getContextByKey(entity.context).entityClass|e('html_attr') }}" />
                             <input type="text" name="entityId" />
 
-                            <ul class="record_actions">
-                                <li>
-                                    <button type="submit" class="btn btn-mini btn-neutral">{{ 'docgen.test generate'|trans }}</button>
-                                </li>
-                            </ul>
+                            <button type="submit" class="btn btn-mini btn-misc"><i class="fa fa-cog"></i>{{ 'docgen.test generate'|trans }}</button>
                         </form>
                     </td>
                     <td>

src/Bundle/ChillDocGeneratorBundle/Serializer/Helper/NormalizeNullValueHelper.php

@@ -11,9 +11,11 @@ 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
 {
@@ -30,7 +32,7 @@ class NormalizeNullValueHelper
         $this->discriminatorValue = $discriminatorValue;
     }
 
-    public function normalize(array $attributes, string $format = 'docgen', ?array $context = [])
+    public function normalize(array $attributes, string $format = 'docgen', ?array $context = [], ?ClassMetadata $classMetadata = null)
     {
         $data = [];
         $data['isNull'] = true;
@@ -58,7 +60,7 @@ class NormalizeNullValueHelper
 
                     default:
                         $data[$key] = $this->normalizer->normalize(null, $format, array_merge(
-                            $context,
+                            $this->getContextForAttribute($key, $context, $classMetadata),
                             ['docgen:expects' => $class]
                         ));
 
@@ -69,4 +71,25 @@ 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;
+    }
 }

src/Bundle/ChillDocGeneratorBundle/Serializer/Normalizer/CollectionDocGenNormalizer.php

@@ -26,7 +26,7 @@ class CollectionDocGenNormalizer implements ContextAwareNormalizerInterface, Nor
 
     /**
      * @param Collection $object
-     * @param null|string $format
+     * @param string|null $format
      *
      * @return array|ArrayObject|bool|float|int|string|void|null
      */

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);
+        return $normalizer->normalize($keys, $format, $context, $metadata);
     }
 
     /**
@@ -260,9 +260,13 @@ class DocGenObjectNormalizer implements NormalizerAwareInterface, NormalizerInte
             /** @var AttributeMetadata $attribute */
             $value = $this->propertyAccess->getValue($object, $attribute->getName());
             $key = $attribute->getSerializedName() ?? $attribute->getName();
-            $isTranslatable = $attribute->getNormalizationContextForGroups(
-                is_array($context['groups']) ? $context['groups'] : [$context['groups']]
-            )['is-translatable'] ?? false;
+            $objectContext = array_merge(
+                $context,
+                $attribute->getNormalizationContextForGroups(
+                    is_array($context['groups']) ? $context['groups'] : [$context['groups']]
+                )
+            );
+            $isTranslatable = $objectContext['is-translatable'] ?? false;
 
             if ($isTranslatable) {
                 $data[$key] = $this->translatableStringHelper
@@ -273,7 +277,7 @@ class DocGenObjectNormalizer implements NormalizerAwareInterface, NormalizerInte
                 foreach ($value as $k => $v) {
                     $arr[$k] =
                         $this->normalizer->normalize($v, $format, array_merge(
-                            $context,
+                            $objectContext,
                             $attribute->getNormalizationContextForGroups($expectedGroups)
                         ));
                 }
@@ -281,11 +285,11 @@ class DocGenObjectNormalizer implements NormalizerAwareInterface, NormalizerInte
             } elseif (is_object($value)) {
                 $data[$key] =
                     $this->normalizer->normalize($value, $format, array_merge(
-                        $context,
+                        $objectContext,
                         $attribute->getNormalizationContextForGroups($expectedGroups)
                     ));
             } elseif (null === $value) {
-                $data[$key] = $this->normalizeNullOutputValue($format, $context, $attribute, $reflection);
+                $data[$key] = $this->normalizeNullOutputValue($format, $objectContext, $attribute, $reflection);
             } else {
                 $data[$key] = $value;
             }

src/Bundle/ChillDocGeneratorBundle/tests/Serializer/Normalizer/DocGenObjectNormalizerTest.php

@@ -14,6 +14,7 @@ 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;
 
@@ -33,6 +34,49 @@ 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();
@@ -99,3 +143,30 @@ 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';
+}

src/Bundle/ChillDocGeneratorBundle/tests/Service/Context/BaseContextDataTest.php

@@ -13,6 +13,7 @@ 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;
@@ -23,6 +24,8 @@ use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
  */
 final class BaseContextDataTest extends KernelTestCase
 {
+    use ProphecyTrait;
+
     protected function setUp(): void
     {
         parent::setUp();

src/Bundle/ChillDocGeneratorBundle/translations/messages.fr.yml

@@ -7,6 +7,7 @@ docgen:
     Context: Contexte
     New template: Nouveau gabarit
     Edit template: Modifier gabarit
+    test generate: Tester la génération
     With context: 'Avec le contexte :'
 
 

src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/_workflow.html.twig

@@ -0,0 +1,61 @@
+{% import "@ChillDocStore/Macro/macro.html.twig" as m %}
+
+<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>
+                <small>{{ document.object.type }}</small>
+            
+                {% if document.description is not empty %}
+                    <blockquote class="chill-user-quote mt-2">
+                        {{ 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">
+        <li>
+            {{ m.download_button(document.object, document.title) }}
+        </li>
+        <li>
+        {% if not freezed %}
+            {% set button = {
+                'changeIcon': 'fa-unlock',
+            } %}{#
+                'changeClass'   string
+                'noText'        boolean
+            #}
+            {# vue component #}
+            <span
+                data-module="wopi-link"
+                data-wopi-url="{{ path('chill_wopi_file_edit', {'fileId': document.object.uuid}) }}"
+                data-doc-title="{{ document.title|e('html_attr') }}"
+                data-doc-type="{{ document.object.type|e('html_attr') }}"
+                data-button="{{ button|json_encode }}"
+            ></span>
+        {% else %}
+            <a class="btn btn-update change-icon disabled" href="#" title="{{ 'workflow.freezed document'|trans }}">
+                <i class="fa fa-lock me-2"></i>{{ 'Update document'|trans }}
+            </a>
+        {% endif %}
+        </li>
+    </ul>
+{% endif %}

src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/_workflow.title.html.twig

@@ -0,0 +1,19 @@
+{% 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>

src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/show.html.twig

@@ -6,61 +6,72 @@
 
 {% block title %}
 	{# {{ 'Detail of document of %name%'|trans({ '%name%': accompanyingCourse|chill_entity_render_string } ) }} #}
-{% endblock %}
-
-
-{% block js %}
-	{{ parent() }}
-	{{ encore_entry_script_tags('mod_async_upload') }}
+    {{ 'Document %title%' | trans({ '%title%': document.title }) }}
 {% endblock %}
 
 {% block css %}
     {{ parent() }}
     {{ encore_entry_link_tags('mod_async_upload') }}
+    {{ encore_entry_link_tags('mod_entity_workflow_pick') }}
 {% endblock %}
 
 {% block content %}
-
-	<h1>{{ 'Document %title%' | trans({ '%title%': document.title }) }}</h1>
-
-	<dl class="chill_view_data">
-		<dt>{{ 'Title'|trans }}</dt>
-		<dd>{{ document.title }}</dd>
-
+<div class="document-show">
+    <h1>{{ block('title') }}</h1>
+    
+    <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>
+    
+    <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 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 %}
+        {% 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 %}
+ 
+{% block block_post_menu %}
+    <div class="post-menu pt-4"></div>
+{% endblock %}
 
-		<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>
-
-	<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>
-
-		<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 %}
+{% block js %}
+    {{ parent() }}
+    {{ encore_entry_script_tags('mod_async_upload') }}
+    {{ encore_entry_script_tags('mod_entity_workflow_pick') }}
+{% endblock %}

src/Bundle/ChillDocStoreBundle/Workflow/AccompanyingCourseDocumentWorkflowHandler.php

@@ -0,0 +1,74 @@
+<?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\Workflow;
+
+use Chill\DocStoreBundle\Entity\AccompanyingCourseDocument;
+use Chill\MainBundle\Entity\Workflow\EntityWorkflow;
+use Chill\MainBundle\Workflow\EntityWorkflowHandlerInterface;
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\EntityRepository;
+
+class AccompanyingCourseDocumentWorkflowHandler implements EntityWorkflowHandlerInterface
+{
+    private EntityRepository $repository;
+
+    /**
+     * TODO: injecter le repository directement.
+     */
+    public function __construct(EntityManagerInterface $em)
+    {
+        $this->repository = $em->getRepository(AccompanyingCourseDocument::class);
+    }
+
+    public function getRelatedEntity(EntityWorkflow $entityWorkflow): ?AccompanyingCourseDocument
+    {
+        return $this->repository->find($entityWorkflow->getRelatedEntityId());
+    }
+
+    public function getRoleShow(EntityWorkflow $entityWorkflow): ?string
+    {
+        return null;
+    }
+
+    public function getTemplate(EntityWorkflow $entityWorkflow, array $options = []): string
+    {
+        return '@ChillDocStore/AccompanyingCourseDocument/_workflow.html.twig';
+    }
+
+    public function getTemplateData(EntityWorkflow $entityWorkflow, array $options = []): array
+    {
+        return [
+            'entity_workflow' => $entityWorkflow,
+            'document' => $this->getRelatedEntity($entityWorkflow),
+        ];
+    }
+
+    public function getTemplateTitle(EntityWorkflow $entityWorkflow, array $options = []): string
+    {
+        return '@ChillDocStore/AccompanyingCourseDocument/_workflow.title.html.twig';
+    }
+
+    public function getTemplateTitleData(EntityWorkflow $entityWorkflow, array $options = []): array
+    {
+        return $this->getTemplateData($entityWorkflow, $options);
+    }
+
+    public function supports(EntityWorkflow $entityWorkflow, array $options = []): bool
+    {
+        return $entityWorkflow->getRelatedEntityClass() === AccompanyingCourseDocument::class;
+    }
+
+    public function supportsFreeze(EntityWorkflow $entityWorkflow, array $options = []): bool
+    {
+        return true;
+    }
+}

src/Bundle/ChillDocStoreBundle/config/services.yaml

@@ -27,3 +27,8 @@ services:
     autoconfigure: true
     tags:
       - { name: chill.role }
+
+  Chill\DocStoreBundle\Workflow\:
+      resource: './../Workflow/'
+      autoconfigure: true
+      autowire: true

src/Bundle/ChillDocStoreBundle/translations/messages.fr.yml

@@ -9,6 +9,7 @@ Create new document: Créer un nouveau document
 New document for %name%: Nouveau document pour %name%
 Editing document for %name%: Modification d'un document pour %name%
 Edit Document: Modification d'un document
+Update document: Modifier le document
 Existing document: Document existant
 No document to download: Aucun document à télécharger
 'Choose a document category': Choisissez une catégorie de document

src/Bundle/ChillMainBundle/ChillMainBundle.php

@@ -22,6 +22,7 @@ use Chill\MainBundle\DependencyInjection\CompilerPass\TimelineCompilerClass;
 use Chill\MainBundle\DependencyInjection\CompilerPass\WidgetsCompilerPass;
 use Chill\MainBundle\DependencyInjection\ConfigConsistencyCompilerPass;
 use Chill\MainBundle\DependencyInjection\RoleProvidersCompilerPass;
+use Chill\MainBundle\Notification\NotificationHandlerInterface;
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
 use Chill\MainBundle\Search\SearchApiInterface;
 use Chill\MainBundle\Security\ProvideRoleInterface;
@@ -29,6 +30,8 @@ use Chill\MainBundle\Security\Resolver\CenterResolverInterface;
 use Chill\MainBundle\Security\Resolver\ScopeResolverInterface;
 use Chill\MainBundle\Templating\Entity\ChillEntityRenderInterface;
 use Chill\MainBundle\Templating\Entity\CompilerPass as RenderEntityCompilerPass;
+use Chill\MainBundle\Templating\UI\NotificationCounterInterface;
+use Chill\MainBundle\Workflow\EntityWorkflowHandlerInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
@@ -50,6 +53,12 @@ class ChillMainBundle extends Bundle
             ->addTag('chill.render_entity');
         $container->registerForAutoconfiguration(SearchApiInterface::class)
             ->addTag('chill.search_api_provider');
+        $container->registerForAutoconfiguration(NotificationHandlerInterface::class)
+            ->addTag('chill_main.notification_handler');
+        $container->registerForAutoconfiguration(NotificationCounterInterface::class)
+            ->addTag('chill.count_notification.user');
+        $container->registerForAutoconfiguration(EntityWorkflowHandlerInterface::class)
+            ->addTag('chill_main.workflow_handler');
 
         $container->addCompilerPass(new SearchableServicesCompilerPass());
         $container->addCompilerPass(new ConfigConsistencyCompilerPass());

src/Bundle/ChillMainBundle/Controller/LocationTypeApiController.php

@@ -24,6 +24,7 @@ class LocationTypeApiController extends ApiController
         $query->andWhere(
             $query->expr()->andX(
                 $query->expr()->eq('e.availableForUsers', "'TRUE'"),
+                $query->expr()->eq('e.editableByUsers', "'TRUE'"),
                 $query->expr()->eq('e.active', "'TRUE'"),
             )
         );

src/Bundle/ChillMainBundle/Controller/NotificationApiController.php

@@ -0,0 +1,138 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\MainBundle\Controller;
+
+use Chill\MainBundle\Entity\Notification;
+use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Pagination\PaginatorFactory;
+use Chill\MainBundle\Repository\NotificationRepository;
+use Chill\MainBundle\Security\Authorization\NotificationVoter;
+use Chill\MainBundle\Serializer\Model\Collection;
+use Chill\MainBundle\Serializer\Model\Counter;
+use Doctrine\ORM\EntityManagerInterface;
+use RuntimeException;
+use Symfony\Component\HttpFoundation\JsonResponse;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Security\Core\Exception\AccessDeniedException;
+use Symfony\Component\Security\Core\Security;
+use Symfony\Component\Serializer\SerializerInterface;
+use UnexpectedValueException;
+
+/**
+ * @Route("/api/1.0/main/notification")
+ */
+class NotificationApiController
+{
+    private EntityManagerInterface $entityManager;
+
+    private NotificationRepository $notificationRepository;
+
+    private PaginatorFactory $paginatorFactory;
+
+    private Security $security;
+
+    private SerializerInterface $serializer;
+
+    public function __construct(
+        EntityManagerInterface $entityManager,
+        NotificationRepository $notificationRepository,
+        PaginatorFactory $paginatorFactory,
+        Security $security,
+        SerializerInterface $serializer
+    ) {
+        $this->entityManager = $entityManager;
+        $this->notificationRepository = $notificationRepository;
+        $this->paginatorFactory = $paginatorFactory;
+        $this->security = $security;
+        $this->serializer = $serializer;
+    }
+
+    /**
+     * @Route("/{id}/mark/read", name="chill_api_main_notification_mark_read", methods={"POST"})
+     */
+    public function markAsRead(Notification $notification): JsonResponse
+    {
+        return $this->markAs('read', $notification);
+    }
+
+    /**
+     * @Route("/{id}/mark/unread", name="chill_api_main_notification_mark_unread", methods={"POST"})
+     */
+    public function markAsUnread(Notification $notification): JsonResponse
+    {
+        return $this->markAs('unread', $notification);
+    }
+
+    /**
+     * @Route("/my/unread")
+     */
+    public function myUnreadNotifications(Request $request): JsonResponse
+    {
+        $total = $this->notificationRepository->countUnreadByUser($this->security->getUser());
+
+        if ($request->query->getBoolean('countOnly')) {
+            return new JsonResponse(
+                $this->serializer->serialize(new Counter($total), 'json', ['groups' => ['read']]),
+                JsonResponse::HTTP_OK,
+                [],
+                true
+            );
+        }
+        $paginator = $this->paginatorFactory->create($total);
+        $notifications = $this->notificationRepository->findUnreadByUser(
+            $this->security->getUser(),
+            $paginator->getItemsPerPage(),
+            $paginator->getCurrentPageFirstItemNumber()
+        );
+        $collection = new Collection($notifications, $paginator);
+
+        return new JsonResponse(
+            $this->serializer->serialize($collection, 'json', ['groups' => ['read']]),
+            JsonResponse::HTTP_OK,
+            [],
+            true
+        );
+    }
+
+    private function markAs(string $target, Notification $notification): JsonResponse
+    {
+        if (!$this->security->isGranted(NotificationVoter::NOTIFICATION_TOGGLE_READ_STATUS, $notification)) {
+            throw new AccessDeniedException('Not allowed to toggle read status of notification');
+        }
+
+        $user = $this->security->getUser();
+
+        if (!$user instanceof User) {
+            throw new RuntimeException('not possible to mark as read by this user');
+        }
+
+        switch ($target) {
+            case 'read':
+                $notification->markAsReadBy($user);
+
+                break;
+
+            case 'unread':
+                $notification->markAsUnreadBy($user);
+
+                break;
+
+            default:
+                throw new UnexpectedValueException("target not supported: {$target}");
+        }
+
+        $this->entityManager->flush();
+
+        return new JsonResponse(null, JsonResponse::HTTP_ACCEPTED, [], false);
+    }
+}

src/Bundle/ChillMainBundle/Controller/NotificationController.php

@@ -11,59 +11,292 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Controller;
 
-use Chill\MainBundle\Notification\NotificationRenderer;
+use Chill\MainBundle\Entity\Notification;
+use Chill\MainBundle\Entity\NotificationComment;
+use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Form\NotificationCommentType;
+use Chill\MainBundle\Form\NotificationType;
+use Chill\MainBundle\Notification\Exception\NotificationHandlerNotFound;
+use Chill\MainBundle\Notification\NotificationHandlerManager;
 use Chill\MainBundle\Pagination\PaginatorFactory;
 use Chill\MainBundle\Repository\NotificationRepository;
+use Chill\MainBundle\Security\Authorization\NotificationVoter;
+use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\HttpFoundation\RedirectResponse;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
+use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\Security\Core\Security;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 /**
  * @Route("/{_locale}/notification")
  */
 class NotificationController extends AbstractController
 {
-    private $security;
+    private EntityManagerInterface $em;
 
-    public function __construct(Security $security)
-    {
+    private NotificationHandlerManager $notificationHandlerManager;
+
+    private NotificationRepository $notificationRepository;
+
+    private PaginatorFactory $paginatorFactory;
+
+    private Security $security;
+
+    private TranslatorInterface $translator;
+
+    public function __construct(
+        EntityManagerInterface $em,
+        Security $security,
+        NotificationRepository $notificationRepository,
+        NotificationHandlerManager $notificationHandlerManager,
+        PaginatorFactory $paginatorFactory,
+        TranslatorInterface $translator
+    ) {
+        $this->em = $em;
         $this->security = $security;
+        $this->notificationRepository = $notificationRepository;
+        $this->notificationHandlerManager = $notificationHandlerManager;
+        $this->paginatorFactory = $paginatorFactory;
+        $this->translator = $translator;
     }
 
     /**
-     * @Route("/show", name="chill_main_notification_show")
+     * @Route("/create", name="chill_main_notification_create")
      */
-    public function showAction(
-        NotificationRepository $notificationRepository,
-        NotificationRenderer $notificationRenderer,
-        PaginatorFactory $paginatorFactory
-    ) {
+    public function createAction(Request $request): Response
+    {
+        $this->denyAccessUnlessGranted('IS_AUTHENTICATED_REMEMBERED');
+
+        if (!$this->security->getUser() instanceof User) {
+            throw new AccessDeniedHttpException('You must be authenticated and a user to create a notification');
+        }
+
+        if (!$request->query->has('entityClass')) {
+            throw new BadRequestHttpException('Missing entityClass parameter');
+        }
+
+        if (!$request->query->has('entityId')) {
+            throw new BadRequestHttpException('missing entityId parameter');
+        }
+
+        $notification = new Notification();
+        $notification
+            ->setRelatedEntityClass($request->query->get('entityClass'))
+            ->setRelatedEntityId($request->query->getInt('entityId'))
+            ->setSender($this->security->getUser());
+
+        try {
+            $handler = $this->notificationHandlerManager->getHandler($notification);
+        } catch (NotificationHandlerNotFound $e) {
+            throw new BadRequestHttpException('no handler for this notification');
+        }
+
+        $form = $this->createForm(NotificationType::class, $notification);
+
+        $form->handleRequest($request);
+
+        if ($form->isSubmitted() && $form->isValid()) {
+            $this->em->persist($notification);
+            $this->em->flush();
+
+            $this->addFlash('success', $this->translator->trans('notification.Notification created'));
+
+            if ($request->query->has('returnPath')) {
+                return new RedirectResponse($request->query->get('returnPath'));
+            }
+
+            return $this->redirectToRoute('chill_main_homepage');
+        }
+
+        return $this->render('@ChillMain/Notification/create.html.twig', [
+            'form' => $form->createView(),
+            'handler' => $handler,
+            'notification' => $notification,
+        ]);
+    }
+
+    /**
+     * @Route("/{id}/edit", name="chill_main_notification_edit")
+     */
+    public function editAction(Notification $notification, Request $request): Response
+    {
+        $this->denyAccessUnlessGranted(NotificationVoter::NOTIFICATION_UPDATE, $notification);
+
+        $form = $this->createForm(NotificationType::class, $notification);
+
+        $form->handleRequest($request);
+
+        if ($form->isSubmitted() && $form->isValid()) {
+            $this->em->flush();
+
+            $this->addFlash('success', $this->translator->trans('notification.Notification updated'));
+
+            if ($request->query->has('returnPath')) {
+                return new RedirectResponse($request->query->get('returnPath'));
+            }
+
+            return $this->redirectToRoute('chill_main_notification_my');
+        }
+
+        return $this->render('@ChillMain/Notification/edit.html.twig', [
+            'form' => $form->createView(),
+            'handler' => $this->notificationHandlerManager->getHandler($notification),
+            'notification' => $notification,
+        ]);
+    }
+
+    /**
+     * @Route("/inbox", name="chill_main_notification_my")
+     */
+    public function inboxAction(): Response
+    {
+        $this->denyAccessUnlessGranted('IS_AUTHENTICATED_REMEMBERED');
         $currentUser = $this->security->getUser();
 
-        $notificationsNbr = $notificationRepository->countAllForAttendee(($currentUser));
-        $paginator = $paginatorFactory->create($notificationsNbr);
+        $notificationsNbr = $this->notificationRepository->countAllForAttendee(($currentUser));
+        $paginator = $this->paginatorFactory->create($notificationsNbr);
 
-        $notifications = $notificationRepository->findAllForAttendee(
+        $notifications = $this->notificationRepository->findAllForAttendee(
             $currentUser,
             $limit = $paginator->getItemsPerPage(),
             $offset = $paginator->getCurrentPage()->getFirstItemNumber()
         );
 
+        return $this->render('@ChillMain/Notification/list.html.twig', [
+            'datas' => $this->itemsForTemplate($notifications),
+            'notifications' => $notifications,
+            'paginator' => $paginator,
+            'step' => 'inbox',
+            'unreads' => $this->countUnread(),
+        ]);
+    }
+
+    /**
+     * @Route("/sent", name="chill_main_notification_sent")
+     */
+    public function sentAction(): Response
+    {
+        $this->denyAccessUnlessGranted('IS_AUTHENTICATED_REMEMBERED');
+        $currentUser = $this->security->getUser();
+
+        $notificationsNbr = $this->notificationRepository->countAllForSender($currentUser);
+        $paginator = $this->paginatorFactory->create($notificationsNbr);
+
+        $notifications = $this->notificationRepository->findAllForSender(
+            $currentUser,
+            $limit = $paginator->getItemsPerPage(),
+            $offset = $paginator->getCurrentPage()->getFirstItemNumber()
+        );
+
+        return $this->render('@ChillMain/Notification/list.html.twig', [
+            'datas' => $this->itemsForTemplate($notifications),
+            'notifications' => $notifications,
+            'paginator' => $paginator,
+            'step' => 'sent',
+            'unreads' => $this->countUnread(),
+        ]);
+    }
+
+    /**
+     * @Route("/{id}/show", name="chill_main_notification_show")
+     */
+    public function showAction(Notification $notification, Request $request): Response
+    {
+        $this->denyAccessUnlessGranted(NotificationVoter::NOTIFICATION_SEE, $notification);
+
+        if ($request->query->has('edit')) {
+            $commentId = $request->query->getInt('edit');
+            $editedComment = $notification->getComments()->filter(static function (NotificationComment $c) use ($commentId) {
+                return $c->getId() === $commentId;
+            })->first();
+
+            if (false === $editedComment) {
+                throw $this->createNotFoundException("Comment with id {$commentId} does not exists nor belong to this notification");
+            }
+
+            $this->denyAccessUnlessGranted(NotificationVoter::COMMENT_EDIT, $editedComment);
+
+            $editedCommentForm = $this->createForm(NotificationCommentType::class, $editedComment);
+
+            if (Request::METHOD_POST === $request->getMethod() && 'edit' === $request->request->get('form')) {
+                $editedCommentForm->handleRequest($request);
+
+                if ($editedCommentForm->isSubmitted() && $editedCommentForm->isValid()) {
+                    $this->em->flush();
+
+                    $this->addFlash('success', $this->translator->trans('notification.comment_updated'));
+
+                    return $this->redirectToRoute('chill_main_notification_show', [
+                        'id' => $notification->getId(),
+                        '_fragment' => 'comment-' . $commentId,
+                    ]);
+                }
+            }
+        }
+
+        if ($this->isGranted(NotificationVoter::COMMENT_ADD, $notification)) {
+            $appendComment = new NotificationComment();
+            $appendCommentForm = $this->createForm(NotificationCommentType::class, $appendComment);
+
+            if (Request::METHOD_POST === $request->getMethod() && 'append' === $request->request->get('form')) {
+                $appendCommentForm->handleRequest($request);
+
+                if ($appendCommentForm->isSubmitted() && $appendCommentForm->isValid()) {
+                    $notification->addComment($appendComment);
+                    $this->em->persist($appendComment);
+                    $this->em->flush();
+
+                    $this->addFlash('success', $this->translator->trans('notification.comment_appended'));
+
+                    return $this->redirectToRoute('chill_main_notification_show', [
+                        'id' => $notification->getId(),
+                    ]);
+                }
+            }
+        }
+
+        $response = $this->render('@ChillMain/Notification/show.html.twig', [
+            'notification' => $notification,
+            'handler' => $this->notificationHandlerManager->getHandler($notification),
+            'appendCommentForm' => isset($appendCommentForm) ? $appendCommentForm->createView() : null,
+            'editedCommentForm' => isset($editedCommentForm) ? $editedCommentForm->createView() : null,
+            'editedCommentId' => $commentId ?? null,
+        ]);
+
+        // we mark the notification as read after having computed the response
+        if ($this->getUser() instanceof User && !$notification->isReadBy($this->getUser())) {
+            $notification->markAsReadBy($this->getUser());
+            $this->em->flush();
+        }
+
+        return $response;
+    }
+
+    private function countUnread(): array
+    {
+        return [
+            'sent' => $this->notificationRepository->countUnreadByUserWhereSender($this->security->getUser()),
+            'inbox' => $this->notificationRepository->countUnreadByUserWhereAddressee($this->security->getUser()),
+        ];
+    }
+
+    private function itemsForTemplate(array $notifications): array
+    {
         $templateData = [];
 
         foreach ($notifications as $notification) {
-            $data = [
-                'template' => $notificationRenderer->getTemplate($notification),
-                'template_data' => $notificationRenderer->getTemplateData($notification),
+            $templateData[] = [
+                'template' => $this->notificationHandlerManager->getTemplate($notification),
+                'template_data' => $this->notificationHandlerManager->getTemplateData($notification),
                 'notification' => $notification,
             ];
-            $templateData[] = $data;
         }
 
-        return $this->render('@ChillMain/Notification/show.html.twig', [
-            'datas' => $templateData,
-            'notifications' => $notifications,
-            'paginator' => $paginator,
-        ]);
+        return $templateData;
     }
 }

src/Bundle/ChillMainBundle/Controller/WorkflowApiController.php

@@ -0,0 +1,118 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\MainBundle\Controller;
+
+use Chill\MainBundle\Entity\Workflow\EntityWorkflow;
+use Doctrine\ORM\EntityManagerInterface;
+use LogicException;
+use Symfony\Component\HttpFoundation\JsonResponse;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
+use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Security\Core\Exception\AccessDeniedException;
+use Symfony\Component\Security\Core\Security;
+
+class WorkflowApiController
+{
+    private EntityManagerInterface $entityManager;
+
+    private Security $security;
+
+    public function __construct(Security $security, EntityManagerInterface $entityManager)
+    {
+        $this->entityManager = $entityManager;
+        $this->security = $security;
+    }
+
+    /**
+     * @Route("/api/1.0/main/workflow/{id}/subscribe", methods={"POST"})
+     */
+    public function subscribe(EntityWorkflow $entityWorkflow, Request $request): Response
+    {
+        return $this->handleSubscription($entityWorkflow, $request, 'subscribe');
+    }
+
+    /**
+     * @Route("/api/1.0/main/workflow/{id}/unsubscribe", methods={"POST"})
+     */
+    public function unsubscribe(EntityWorkflow $entityWorkflow, Request $request): Response
+    {
+        return $this->handleSubscription($entityWorkflow, $request, 'unsubscribe');
+    }
+
+    private function handleSubscription(EntityWorkflow $entityWorkflow, Request $request, string $action): JsonResponse
+    {
+        if (!$this->security->isGranted('IS_AUTHENTICATED_REMEMBERED')) {
+            throw new AccessDeniedException();
+        }
+
+        if (!$request->query->has('subscribe')) {
+            throw new BadRequestHttpException('missing subscribe parameter');
+        }
+
+        $user = $this->security->getUser();
+
+        switch ($request->query->get('subscribe')) {
+            case 'final':
+                switch ($action) {
+                    case 'subscribe':
+                        $entityWorkflow->addSubscriberToFinal($user);
+
+                        break;
+
+                    case 'unsubscribe':
+                        $entityWorkflow->removeSubscriberToFinal($user);
+
+                        break;
+
+                    default:
+                        throw new LogicException();
+                }
+
+                break;
+
+            case 'step':
+                switch ($action) {
+                    case 'subscribe':
+                        $entityWorkflow->addSubscriberToStep($user);
+
+                        break;
+
+                    case 'unsubscribe':
+                        $entityWorkflow->removeSubscriberToStep($user);
+
+                        break;
+
+                    default:
+                        throw new LogicException();
+                }
+
+                break;
+
+            default:
+                throw new BadRequestHttpException('subscribe parameter must be equal to "step" or "final"');
+        }
+
+        $this->entityManager->flush();
+
+        return new JsonResponse(
+            [
+                'step' => $entityWorkflow->isUserSubscribedToStep($user),
+                'final' => $entityWorkflow->isUserSubscribedToFinal($user),
+            ],
+            JsonResponse::HTTP_OK,
+            [],
+            false
+        );
+    }
+}

src/Bundle/ChillMainBundle/Controller/WorkflowController.php

@@ -0,0 +1,257 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\MainBundle\Controller;
+
+use Chill\MainBundle\Entity\Workflow\EntityWorkflow;
+use Chill\MainBundle\Entity\Workflow\EntityWorkflowComment;
+use Chill\MainBundle\Form\EntityWorkflowCommentType;
+use Chill\MainBundle\Form\WorkflowStepType;
+use Chill\MainBundle\Pagination\PaginatorFactory;
+use Chill\MainBundle\Repository\Workflow\EntityWorkflowRepository;
+use Chill\MainBundle\Security\Authorization\EntityWorkflowVoter;
+use Chill\MainBundle\Workflow\EntityWorkflowManager;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
+use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Validator\Validator\ValidatorInterface;
+use Symfony\Component\Workflow\Registry;
+use Symfony\Component\Workflow\TransitionBlocker;
+use Symfony\Contracts\Translation\TranslatorInterface;
+use function count;
+
+class WorkflowController extends AbstractController
+{
+    private EntityManagerInterface $entityManager;
+
+    private EntityWorkflowManager $entityWorkflowManager;
+
+    private EntityWorkflowRepository $entityWorkflowRepository;
+
+    private PaginatorFactory $paginatorFactory;
+
+    private Registry $registry;
+
+    private TranslatorInterface $translator;
+
+    private ValidatorInterface $validator;
+
+    public function __construct(EntityWorkflowManager $entityWorkflowManager, EntityWorkflowRepository $entityWorkflowRepository, ValidatorInterface $validator, PaginatorFactory $paginatorFactory, Registry $registry, EntityManagerInterface $entityManager, TranslatorInterface $translator)
+    {
+        $this->entityWorkflowManager = $entityWorkflowManager;
+        $this->entityWorkflowRepository = $entityWorkflowRepository;
+        $this->validator = $validator;
+        $this->paginatorFactory = $paginatorFactory;
+        $this->registry = $registry;
+        $this->entityManager = $entityManager;
+        $this->translator = $translator;
+    }
+
+    /**
+     * @Route("/{_locale}/main/workflow/create", name="chill_main_workflow_create")
+     */
+    public function create(Request $request): Response
+    {
+        if (!$request->query->has('entityClass')) {
+            throw new BadRequestHttpException('Missing entityClass parameter');
+        }
+
+        if (!$request->query->has('entityId')) {
+            throw new BadRequestHttpException('missing entityId parameter');
+        }
+
+        if (!$request->query->has('workflow')) {
+            throw new BadRequestHttpException('missing workflow parameter');
+        }
+
+        $entityWorkflow = new EntityWorkflow();
+        $entityWorkflow
+            ->setRelatedEntityClass($request->query->get('entityClass'))
+            ->setRelatedEntityId($request->query->getInt('entityId'))
+            ->setWorkflowName($request->query->get('workflow'));
+
+        $errors = $this->validator->validate($entityWorkflow, null, ['creation']);
+
+        if (count($errors) > 0) {
+            $msg = [];
+
+            foreach ($errors as $error) {
+                /** @var \Symfony\Component\Validator\ConstraintViolationInterface $error */
+                $msg[] = $error->getMessage();
+            }
+
+            return new Response(implode("\n", $msg), Response::HTTP_UNPROCESSABLE_ENTITY);
+        }
+
+        $this->denyAccessUnlessGranted(EntityWorkflowVoter::CREATE, $entityWorkflow);
+
+        $em = $this->getDoctrine()->getManager();
+        $em->persist($entityWorkflow);
+        $em->flush();
+
+        return $this->redirectToRoute('chill_main_workflow_show', ['id' => $entityWorkflow->getId()]);
+    }
+
+    /**
+     * @Route("/{_locale}/main/workflow/list/dest", name="chill_main_workflow_list_dest")
+     */
+    public function myWorkflowsDest(Request $request): Response
+    {
+        $this->denyAccessUnlessGranted('IS_AUTHENTICATED_REMEMBERED');
+
+        $total = $this->entityWorkflowRepository->countByDest($this->getUser());
+        $paginator = $this->paginatorFactory->create($total);
+
+        $workflows = $this->entityWorkflowRepository->findByDest(
+            $this->getUser(),
+            ['createdAt' => 'DESC'],
+            $paginator->getItemsPerPage(),
+            $paginator->getCurrentPageFirstItemNumber()
+        );
+
+        return $this->render(
+            '@ChillMain/Workflow/list.html.twig',
+            [
+                'workflows' => $this->buildHandler($workflows),
+                'paginator' => $paginator,
+                'step' => 'dest',
+            ]
+        );
+    }
+
+    /**
+     * @Route("/{_locale}/main/workflow/list/subscribed", name="chill_main_workflow_list_subscribed")
+     */
+    public function myWorkflowsSubscribed(Request $request): Response
+    {
+        $this->denyAccessUnlessGranted('IS_AUTHENTICATED_REMEMBERED');
+
+        $total = $this->entityWorkflowRepository->countBySubscriber($this->getUser());
+        $paginator = $this->paginatorFactory->create($total);
+
+        $workflows = $this->entityWorkflowRepository->findBySubscriber(
+            $this->getUser(),
+            ['createdAt' => 'DESC'],
+            $paginator->getItemsPerPage(),
+            $paginator->getCurrentPageFirstItemNumber()
+        );
+
+        return $this->render(
+            '@ChillMain/Workflow/list.html.twig',
+            [
+                'workflows' => $this->buildHandler($workflows),
+                'paginator' => $paginator,
+                'step' => 'subscribed',
+            ]
+        );
+    }
+
+    /**
+     * @Route("/{_locale}/main/workflow/{id}/show", name="chill_main_workflow_show")
+     */
+    public function show(EntityWorkflow $entityWorkflow, Request $request): Response
+    {
+        $this->denyAccessUnlessGranted(EntityWorkflowVoter::SEE, $entityWorkflow);
+
+        $handler = $this->entityWorkflowManager->getHandler($entityWorkflow);
+        $workflow = $this->registry->get($entityWorkflow, $entityWorkflow->getWorkflowName());
+
+        if (count($workflow->getEnabledTransitions($entityWorkflow)) > 0) {
+            // possible transition
+            $transitionForm = $this->createForm(
+                WorkflowStepType::class,
+                $entityWorkflow->getCurrentStep(),
+                ['transition' => true, 'entity_workflow' => $entityWorkflow]
+            );
+
+            $transitionForm->handleRequest($request);
+
+            if ($transitionForm->isSubmitted() && $transitionForm->isValid()) {
+                if (!$workflow->can($entityWorkflow, $transition = $transitionForm['transition']->getData()->getName())) {
+                    $blockers = $workflow->buildTransitionBlockerList($entityWorkflow, $transition);
+                    $msgs = array_map(function (TransitionBlocker $tb) {
+                        return $this->translator->trans(
+                            $tb->getMessage(),
+                            $tb->getParameters()
+                        );
+                    }, iterator_to_array($blockers));
+
+                    throw $this->createAccessDeniedException(
+                        sprintf(
+                            "not allowed to apply transition {$transition}: %s",
+                            implode(', ', $msgs)
+                        )
+                    );
+                }
+
+                $workflow->apply($entityWorkflow, $transition);
+
+                foreach ($transitionForm['future_dest_users']->getData() as $user) {
+                    $entityWorkflow->getCurrentStep()->addDestUser($user);
+                }
+
+                $this->entityManager->flush();
+
+                return $this->redirectToRoute('chill_main_workflow_show', ['id' => $entityWorkflow->getId()]);
+            }
+
+            if ($transitionForm->isSubmitted() && !$transitionForm->isValid()) {
+                $this->addFlash('error', $this->translator->trans('This form contains errors'));
+            }
+        }
+
+        /*
+        $commentForm = $this->createForm(EntityWorkflowCommentType::class, $newComment = new EntityWorkflowComment());
+        $commentForm->handleRequest($request);
+
+        if ($commentForm->isSubmitted() && $commentForm->isValid()) {
+            $this->entityManager->persist($newComment);
+            $this->entityManager->flush();
+
+            $this->addFlash('success', $this->translator->trans('workflow.Comment added'));
+
+            return $this->redirectToRoute('chill_main_workflow_show', ['id' => $entityWorkflow->getId()]);
+        } elseif ($commentForm->isSubmitted() && !$commentForm->isValid()) {
+            $this->addFlash('error', $this->translator->trans('This form contains errors'));
+        }
+         */
+
+        return $this->render(
+            '@ChillMain/Workflow/index.html.twig',
+            [
+                'handler_template' => $handler->getTemplate($entityWorkflow),
+                'handler_template_title' => $handler->getTemplateTitle($entityWorkflow),
+                'handler_template_data' => $handler->getTemplateData($entityWorkflow),
+                'transition_form' => isset($transitionForm) ? $transitionForm->createView() : null,
+                'entity_workflow' => $entityWorkflow,
+                //'comment_form' => $commentForm->createView(),
+            ]
+        );
+    }
+
+    private function buildHandler(array $workflows): array
+    {
+        $lines = [];
+
+        foreach ($workflows as $workflow) {
+            $handler = $this->entityWorkflowManager->getHandler($workflow);
+            $lines[] = [
+                'handler' => $handler,
+                'entity_workflow' => $workflow,
+            ];
+        }
+
+        return $lines;
+    }
+}

src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php

@@ -168,6 +168,7 @@ class ChillMainExtension extends Extension implements
         $loader->load('services/timeline.yaml');
         $loader->load('services/search.yaml');
         $loader->load('services/serializer.yaml');
+        $loader->load('services/mailer.yaml');
 
         $this->configureCruds($container, $config['cruds'], $config['apis'], $loader);
     }
@@ -391,6 +392,26 @@ class ChillMainExtension extends Extension implements
                         ],
                     ],
                 ],
+                [
+                    'class' => \Chill\MainBundle\Entity\UserJob::class,
+                    'name' => 'user_job',
+                    'base_path' => '/api/1.0/main/user-job',
+                    'base_role' => 'ROLE_USER',
+                    'actions' => [
+                        '_index' => [
+                            'methods' => [
+                                Request::METHOD_GET => true,
+                                Request::METHOD_HEAD => true,
+                            ],
+                        ],
+                        '_entity' => [
+                            'methods' => [
+                                Request::METHOD_GET => true,
+                                Request::METHOD_HEAD => true,
+                            ],
+                        ],
+                    ],
+                ],
                 [
                     'controller' => \Chill\MainBundle\Controller\AddressReferenceAPIController::class,
                     'class' => \Chill\MainBundle\Entity\AddressReference::class,

src/Bundle/ChillMainBundle/Doctrine/Model/TrackCreationTrait.php

@@ -0,0 +1,56 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\MainBundle\Doctrine\Model;
+
+use Chill\MainBundle\Entity\User;
+use DateTime;
+use DateTimeImmutable;
+use DateTimeInterface;
+use Doctrine\ORM\Mapping as ORM;
+
+trait TrackCreationTrait
+{
+    /**
+     * @ORM\Column(type="datetime_immutable", nullable=true, options={"default": NULL})
+     */
+    private ?DateTimeImmutable $createdAt = null;
+
+    /**
+     * @ORM\ManyToOne(targetEntity=User::class)
+     * @ORM\JoinColumn(nullable=true)
+     */
+    private ?User $createdBy = null;
+
+    public function getCreatedAt(): ?DateTimeInterface
+    {
+        return $this->createdAt;
+    }
+
+    public function getCreatedBy(): ?User
+    {
+        return $this->createdBy;
+    }
+
+    public function setCreatedAt(DateTimeInterface $datetime): self
+    {
+        $this->createdAt = $datetime instanceof DateTime ? DateTimeImmutable::createFromMutable($datetime) : $datetime;
+
+        return $this;
+    }
+
+    public function setCreatedBy(User $user): self
+    {
+        $this->createdBy = $user;
+
+        return $this;
+    }
+}

src/Bundle/ChillMainBundle/Doctrine/Model/TrackUpdateTrait.php

@@ -0,0 +1,56 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\MainBundle\Doctrine\Model;
+
+use Chill\MainBundle\Entity\User;
+use DateTime;
+use DateTimeImmutable;
+use DateTimeInterface;
+use Doctrine\ORM\Mapping as ORM;
+
+trait TrackUpdateTrait
+{
+    /**
+     * @ORM\Column(type="datetime_immutable", nullable=true, options={"default": NULL})
+     */
+    private ?DateTimeImmutable $updatedAt = null;
+
+    /**
+     * @ORM\ManyToOne(targetEntity=User::class)
+     * @ORM\JoinColumn(nullable=true)
+     */
+    private ?User $updatedBy = null;
+
+    public function getUpdatedAt(): ?DateTimeInterface
+    {
+        return $this->updatedAt;
+    }
+
+    public function getUpdatedBy(): ?User
+    {
+        return $this->updatedBy;
+    }
+
+    public function setUpdatedAt(DateTimeInterface $datetime): self
+    {
+        $this->updatedAt = $datetime instanceof DateTime ? DateTimeImmutable::createFromMutable($datetime) : $datetime;
+
+        return $this;
+    }
+
+    public function setUpdatedBy(User $user): self
+    {
+        $this->updatedBy = $user;
+
+        return $this;
+    }
+}

src/Bundle/ChillMainBundle/Entity/Address.php

@@ -42,10 +42,16 @@ class Address
      */
     private $buildingName;
 
+    /**
+     * @ORM\Column(type="boolean")
+     * @Groups({"write"})
+     */
+    private bool $confidential = false;
+
     /**
      * @var string|null
      *
-     * @ORM\Column(type="string", length=16, nullable=true)
+     * @ORM\Column(type="string", length=255, nullable=true)
      * @Groups({"write"})
      */
     private $corridor;
@@ -60,6 +66,8 @@ class Address
     /**
      * @var string|null
      *
+     * used for the CEDEX information
+     *
      * @ORM\Column(type="string", length=255, nullable=true)
      * @Groups({"write"})
      */
@@ -76,7 +84,7 @@ class Address
     /**
      * @var string|null
      *
-     * @ORM\Column(type="string", length=16, nullable=true)
+     * @ORM\Column(type="string", length=255, nullable=true)
      * @Groups({"write"})
      */
     private $flat;
@@ -84,7 +92,7 @@ class Address
     /**
      * @var string|null
      *
-     * @ORM\Column(type="string", length=16, nullable=true)
+     * @ORM\Column(type="string", length=255, nullable=true)
      * @Groups({"write"})
      */
     private $floor;
@@ -141,7 +149,7 @@ class Address
     /**
      * @var string|null
      *
-     * @ORM\Column(type="string", length=16, nullable=true)
+     * @ORM\Column(type="string", length=255, nullable=true)
      * @Groups({"write"})
      */
     private $steps;
@@ -190,6 +198,7 @@ class Address
         return (new Address())
             ->setAddressReference($original->getAddressReference())
             ->setBuildingName($original->getBuildingName())
+            ->setConfidential($original->getConfidential())
             ->setCorridor($original->getCorridor())
             ->setCustoms($original->getCustoms())
             ->setDistribution($original->getDistribution())
@@ -227,6 +236,11 @@ class Address
         return $this->buildingName;
     }
 
+    public function getConfidential(): bool
+    {
+        return $this->confidential;
+    }
+
     public function getCorridor(): ?string
     {
         return $this->corridor;
@@ -367,6 +381,13 @@ class Address
         return $this;
     }
 
+    public function setConfidential(bool $confidential): self
+    {
+        $this->confidential = $confidential;
+
+        return $this;
+    }
+
     public function setCorridor(?string $corridor): self
     {
         $this->corridor = $corridor;

src/Bundle/ChillMainBundle/Entity/Embeddable/CommentEmbeddable.php

@@ -20,10 +20,9 @@ use Doctrine\ORM\Mapping as ORM;
 class CommentEmbeddable
 {
     /**
-     * @var string
      * @ORM\Column(type="text", nullable=true)
      */
-    private $comment;
+    private ?string $comment = null;
 
     /**
      * @var DateTime
@@ -39,10 +38,7 @@ class CommentEmbeddable
      */
     private $userId;
 
-    /**
-     * @return string
-     */
-    public function getComment()
+    public function getComment(): ?string
     {
         return $this->comment;
     }
@@ -68,9 +64,6 @@ class CommentEmbeddable
         return empty($this->getComment());
     }
 
-    /**
-     * @param string $comment
-     */
     public function setComment(?string $comment)
     {
         $this->comment = $comment;

src/Bundle/ChillMainBundle/Entity/Location.php

@@ -64,7 +64,7 @@ class Location implements TrackCreationInterface, TrackUpdateInterface
 
     /**
      * @ORM\Column(type="string", length=255, nullable=true)
-     * @Serializer\Groups({"read", "write"})
+     * @Serializer\Groups({"read", "write", "docgen:read"})
      */
     private ?string $email = null;
 

src/Bundle/ChillMainBundle/Entity/LocationType.php

@@ -67,6 +67,12 @@ class LocationType
      */
     private ?string $defaultFor = null;
 
+    /**
+     * @ORM\Column(type="boolean")
+     * @Serializer\Groups({"read"})
+     */
+    private bool $editableByUsers = true;
+
     /**
      * @ORM\Id
      * @ORM\GeneratedValue
@@ -107,6 +113,11 @@ class LocationType
         return $this->defaultFor;
     }
 
+    public function getEditableByUsers(): ?bool
+    {
+        return $this->editableByUsers;
+    }
+
     public function getId(): ?int
     {
         return $this->id;
@@ -152,6 +163,13 @@ class LocationType
         return $this;
     }
 
+    public function setEditableByUsers(bool $editableByUsers): self
+    {
+        $this->editableByUsers = $editableByUsers;
+
+        return $this;
+    }
+
     public function setTitle(array $title): self
     {
         $this->title = $title;

src/Bundle/ChillMainBundle/Entity/Notification.php

@@ -11,28 +11,43 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Entity;
 
+use Chill\MainBundle\Doctrine\Model\TrackUpdateInterface;
 use DateTimeImmutable;
+use DateTimeInterface;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
+use Symfony\Component\Validator\Constraints as Assert;
 
 /**
  * @ORM\Entity
  * @ORM\Table(
  *     name="chill_main_notification",
- *     uniqueConstraints={
- *         @ORM\UniqueConstraint(columns={"relatedEntityClass", "relatedEntityId"})
+ *     indexes={
+ *         @ORM\Index(name="chill_main_notification_related_entity_idx", columns={"relatedentityclass", "relatedentityid"})
  *     }
  * )
+ * @ORM\HasLifecycleCallbacks
  */
-class Notification
+class Notification implements TrackUpdateInterface
 {
+    private array $addedAddresses = [];
+
     /**
      * @ORM\ManyToMany(targetEntity=User::class)
      * @ORM\JoinTable(name="chill_main_notification_addresses_user")
+     * @Assert\Count(min="1", minMessage="notification.At least one addressee")
      */
     private Collection $addressees;
 
+    private ?ArrayCollection $addressesOnLoad = null;
+
+    /**
+     * @ORM\OneToMany(targetEntity=NotificationComment::class, mappedBy="notification", orphanRemoval=true)
+     * @ORM\OrderBy({"createdAt": "ASC"})
+     */
+    private Collection $comments;
+
     /**
      * @ORM\Column(type="datetime_immutable")
      */
@@ -43,43 +58,85 @@ class Notification
      * @ORM\GeneratedValue
      * @ORM\Column(type="integer")
      */
-    private int $id;
+    private ?int $id = null;
 
     /**
      * @ORM\Column(type="text")
      */
-    private string $message;
-
-    /**
-     * @ORM\Column(type="json")
-     */
-    private array $read;
+    private string $message = '';
 
     /**
      * @ORM\Column(type="string", length=255)
      */
-    private string $relatedEntityClass;
+    private string $relatedEntityClass = '';
 
     /**
      * @ORM\Column(type="integer")
      */
     private int $relatedEntityId;
 
+    private array $removedAddresses = [];
+
     /**
      * @ORM\ManyToOne(targetEntity=User::class)
-     * @ORM\JoinColumn(nullable=false)
+     * @ORM\JoinColumn(nullable=true)
      */
-    private User $sender;
+    private ?User $sender = null;
+
+    /**
+     * @ORM\Column(type="text", options={"default": ""})
+     * @Assert\NotBlank(message="notification.Title must be defined")
+     */
+    private string $title = '';
+
+    /**
+     * @ORM\ManyToMany(targetEntity=User::class)
+     * @ORM\JoinTable(name="chill_main_notification_addresses_unread")
+     */
+    private Collection $unreadBy;
+
+    /**
+     * @ORM\Column(type="datetime_immutable")
+     */
+    private ?DateTimeImmutable $updatedAt;
+
+    /**
+     * @ORM\ManyToOne(targetEntity=User::class)
+     */
+    private ?User $updatedBy;
 
     public function __construct()
     {
         $this->addressees = new ArrayCollection();
+        $this->unreadBy = new ArrayCollection();
+        $this->comments = new ArrayCollection();
+        $this->setDate(new DateTimeImmutable());
     }
 
     public function addAddressee(User $addressee): self
     {
         if (!$this->addressees->contains($addressee)) {
             $this->addressees[] = $addressee;
+            $this->addedAddresses[] = $addressee;
+        }
+
+        return $this;
+    }
+
+    public function addComment(NotificationComment $comment): self
+    {
+        if (!$this->comments->contains($comment)) {
+            $this->comments[] = $comment;
+            $comment->setNotification($this);
+        }
+
+        return $this;
+    }
+
+    public function addUnreadBy(User $user): self
+    {
+        if (!$this->unreadBy->contains($user)) {
+            $this->unreadBy[] = $user;
         }
 
         return $this;
@@ -90,9 +147,19 @@ class Notification
      */
     public function getAddressees(): Collection
     {
+        // keep a copy to compute changes later
+        if (null === $this->addressesOnLoad) {
+            $this->addressesOnLoad = new ArrayCollection($this->addressees->toArray());
+        }
+
         return $this->addressees;
     }
 
+    public function getComments(): Collection
+    {
+        return $this->comments;
+    }
+
     public function getDate(): ?DateTimeImmutable
     {
         return $this->date;
@@ -108,11 +175,6 @@ class Notification
         return $this->message;
     }
 
-    public function getRead(): array
-    {
-        return $this->read;
-    }
-
     public function getRelatedEntityClass(): ?string
     {
         return $this->relatedEntityClass;
@@ -128,9 +190,97 @@ class Notification
         return $this->sender;
     }
 
+    public function getTitle(): string
+    {
+        return $this->title;
+    }
+
+    public function getUnreadBy(): Collection
+    {
+        return $this->unreadBy;
+    }
+
+    public function getUpdatedAt(): ?DateTimeImmutable
+    {
+        return $this->updatedAt;
+    }
+
+    public function getUpdatedBy(): ?User
+    {
+        return $this->updatedBy;
+    }
+
+    public function isReadBy(User $user): bool
+    {
+        return !$this->unreadBy->contains($user);
+    }
+
+    public function isSystem(): bool
+    {
+        return null === $this->sender;
+    }
+
+    public function markAsReadBy(User $user): self
+    {
+        return $this->removeUnreadBy($user);
+    }
+
+    public function markAsUnreadBy(User $user): self
+    {
+        return $this->addUnreadBy($user);
+    }
+
+    /**
+     * @ORM\PreFlush
+     */
+    public function registerUnread()
+    {
+        foreach ($this->addedAddresses as $addressee) {
+            $this->addUnreadBy($addressee);
+        }
+
+        foreach ($this->removedAddresses as $addressee) {
+            $this->removeAddressee($addressee);
+        }
+
+        if (null !== $this->addressesOnLoad) {
+            foreach ($this->addressees as $existingAddresse) {
+                if (!$this->addressesOnLoad->contains($existingAddresse)) {
+                    $this->addUnreadBy($existingAddresse);
+                }
+            }
+
+            foreach ($this->addressesOnLoad as $onLoadAddressee) {
+                if (!$this->addressees->contains($onLoadAddressee)) {
+                    $this->removeUnreadBy($onLoadAddressee);
+                }
+            }
+        }
+
+        $this->removedAddresses = [];
+        $this->addedAddresses = [];
+        $this->addressesOnLoad = null;
+    }
+
     public function removeAddressee(User $addressee): self
     {
-        $this->addressees->removeElement($addressee);
+        if ($this->addressees->removeElement($addressee)) {
+            $this->removedAddresses[] = $addressee;
+        }
+
+        return $this;
+    }
+
+    public function removeComment(NotificationComment $comment): self
+    {
+        $this->comments->removeElement($comment);
+
+        return $this;
+    }
+
+    public function removeUnreadBy(User $user): self
+    {
+        $this->unreadBy->removeElement($user);
 
         return $this;
     }
@@ -142,16 +292,9 @@ class Notification
         return $this;
     }
 
-    public function setMessage(string $message): self
+    public function setMessage(?string $message): self
     {
-        $this->message = $message;
-
-        return $this;
-    }
-
-    public function setRead(array $read): self
-    {
-        $this->read = $read;
+        $this->message = (string) $message;
 
         return $this;
     }
@@ -176,4 +319,25 @@ class Notification
 
         return $this;
     }
+
+    public function setTitle(?string $title): Notification
+    {
+        $this->title = (string) $title;
+
+        return $this;
+    }
+
+    public function setUpdatedAt(DateTimeInterface $datetime): self
+    {
+        $this->updatedAt = $datetime;
+
+        return $this;
+    }
+
+    public function setUpdatedBy(User $user): self
+    {
+        $this->updatedBy = $user;
+
+        return $this;
+    }
 }

src/Bundle/ChillMainBundle/Entity/NotificationComment.php

@@ -0,0 +1,191 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\MainBundle\Entity;
+
+use Chill\MainBundle\Doctrine\Model\TrackCreationInterface;
+use Chill\MainBundle\Doctrine\Model\TrackUpdateInterface;
+use DateTimeImmutable;
+use DateTimeInterface;
+use Doctrine\ORM\Event\LifecycleEventArgs;
+use Doctrine\ORM\Event\PreFlushEventArgs;
+use Doctrine\ORM\Mapping as ORM;
+
+/**
+ * @ORM\Entity
+ * @ORM\Table("chill_main_notification_comment")
+ * @ORM\HasLifecycleCallbacks
+ */
+class NotificationComment implements TrackCreationInterface, TrackUpdateInterface
+{
+    /**
+     * @ORM\Column(type="text")
+     */
+    private string $content = '';
+
+    /**
+     * @ORM\Column(type="datetime_immutable", nullable=true)
+     */
+    private ?DateTimeImmutable $createdAt = null;
+
+    /**
+     * @ORM\ManyToOne(targetEntity=User::class)
+     * @ORM\JoinColumn(nullable=true)
+     */
+    private ?User $createdBy = null;
+
+    /**
+     * @ORM\Id
+     * @ORM\GeneratedValue
+     * @ORM\Column(type="integer")
+     */
+    private ?int $id = null;
+
+    /**
+     * @ORM\ManyToOne(targetEntity=Notification::class, inversedBy="comments")
+     * @ORM\JoinColumn(nullable=false)
+     */
+    private ?Notification $notification = null;
+
+    /**
+     * Internal variable which detect if the comment is just persisted.
+     *
+     * @internal
+     */
+    private bool $recentlyPersisted = false;
+
+    /**
+     * TODO typo in property (hotfixed).
+     *
+     * @ORM\Column(type="datetime_immutable", nullable=true)
+     */
+    private ?DateTimeImmutable $updateAt = null;
+
+    /**
+     * @ORM\ManyToOne(targetEntity=User::class)
+     * @ORM\JoinColumn(nullable=true)
+     */
+    private ?User $updatedBy = null;
+
+    public function getContent(): string
+    {
+        return $this->content;
+    }
+
+    public function getCreatedAt(): ?DateTimeImmutable
+    {
+        return $this->createdAt;
+    }
+
+    public function getCreatedBy(): ?User
+    {
+        return $this->createdBy;
+    }
+
+    public function getId(): ?int
+    {
+        return $this->id;
+    }
+
+    public function getNotification(): ?Notification
+    {
+        return $this->notification;
+    }
+
+    public function getUpdatedAt(): ?DateTimeImmutable
+    {
+        return $this->updateAt;
+    }
+
+    public function getUpdatedBy(): ?User
+    {
+        return $this->updatedBy;
+    }
+
+    /**
+     * @ORM\PreFlush
+     */
+    public function onFlushMarkNotificationAsUnread(PreFlushEventArgs $eventArgs): void
+    {
+        if ($this->recentlyPersisted) {
+            foreach ($this->getNotification()->getAddressees() as $addressee) {
+                if ($this->getCreatedBy() !== $addressee) {
+                    $this->getNotification()->markAsUnreadBy($addressee);
+                }
+            }
+
+            if ($this->getNotification()->getSender() !== $this->getCreatedBy()) {
+                $this->getNotification()->markAsUnreadBy($this->getNotification()->getSender());
+            }
+        }
+    }
+
+    /**
+     * @ORM\PrePersist
+     */
+    public function onPrePersist(LifecycleEventArgs $eventArgs): void
+    {
+        $this->recentlyPersisted = true;
+    }
+
+    public function setContent(string $content): self
+    {
+        $this->content = $content;
+
+        return $this;
+    }
+
+    public function setCreatedAt(DateTimeInterface $datetime): self
+    {
+        $this->createdAt = $datetime;
+
+        return $this;
+    }
+
+    public function setCreatedBy(User $user): self
+    {
+        $this->createdBy = $user;
+
+        return $this;
+    }
+
+    /**
+     * @internal use Notification::addComment
+     */
+    public function setNotification(?Notification $notification): self
+    {
+        $this->notification = $notification;
+
+        return $this;
+    }
+
+    /**
+     * @deprecated use @see{self::setUpdatedAt} instead
+     */
+    public function setUpdateAt(?DateTimeImmutable $updateAt): self
+    {
+        return $this->setUpdatedAt($updateAt);
+    }
+
+    public function setUpdatedAt(DateTimeInterface $datetime): self
+    {
+        $this->updateAt = $datetime;
+
+        return $this;
+    }
+
+    public function setUpdatedBy(User $user): self
+    {
+        $this->updatedBy = $user;
+
+        return $this;
+    }
+}

src/Bundle/ChillMainBundle/Entity/ResidentialAddress.php

@@ -0,0 +1,166 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\MainBundle\Entity;
+
+use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable;
+use Chill\MainBundle\Repository\ResidentialAddressRepository;
+use Chill\PersonBundle\Entity\Person;
+use Chill\ThirdPartyBundle\Entity\ThirdParty;
+use DateTimeImmutable;
+use Doctrine\ORM\Mapping as ORM;
+
+/**
+ * @ORM\Entity(repositoryClass=ResidentialAddressRepository::class)
+ * @ORM\Table(name="chill_main_residential_address")
+ */
+class ResidentialAddress
+{
+    /**
+     * @ORM\ManyToOne(targetEntity=Address::class)
+     * @ORM\JoinColumn(nullable=true)
+     */
+    private ?Address $address = null;
+
+    /**
+     * @ORM\Embedded(class="Chill\MainBundle\Entity\Embeddable\CommentEmbeddable", columnPrefix="residentialAddressComment_")
+     */
+    private CommentEmbeddable $comment;
+
+    /**
+     * @ORM\Column(type="datetime_immutable", nullable=true)
+     */
+    private ?DateTimeImmutable $endDate = null;
+
+    /**
+     * @ORM\ManyToOne(targetEntity=Person::class)
+     * @ORM\JoinColumn(nullable=true)
+     */
+    private ?Person $hostPerson = null;
+
+    /**
+     * @ORM\ManyToOne(targetEntity=ThirdParty::class)
+     * @ORM\JoinColumn(nullable=true)
+     */
+    private ?ThirdParty $hostThirdParty = null;
+
+    /**
+     * @ORM\Id
+     * @ORM\GeneratedValue
+     * @ORM\Column(type="integer")
+     */
+    private $id;
+
+    /**
+     * @ORM\ManyToOne(targetEntity=Person::class)
+     * @ORM\JoinColumn(nullable=false)
+     */
+    private Person $person;
+
+    /**
+     * @ORM\Column(type="datetime_immutable")
+     */
+    private ?DateTimeImmutable $startDate = null;
+
+    public function __construct()
+    {
+        $this->comment = new CommentEmbeddable();
+    }
+
+    public function getAddress(): ?Address
+    {
+        return $this->address;
+    }
+
+    public function getComment(): CommentEmbeddable
+    {
+        return $this->comment;
+    }
+
+    public function getEndDate(): ?DateTimeImmutable
+    {
+        return $this->endDate;
+    }
+
+    public function getHostPerson(): ?Person
+    {
+        return $this->hostPerson;
+    }
+
+    public function getHostThirdParty(): ?ThirdParty
+    {
+        return $this->hostThirdParty;
+    }
+
+    public function getId(): ?int
+    {
+        return $this->id;
+    }
+
+    public function getPerson(): ?Person
+    {
+        return $this->person;
+    }
+
+    public function getStartDate(): ?DateTimeImmutable
+    {
+        return $this->startDate;
+    }
+
+    public function setAddress(?Address $address): self
+    {
+        $this->address = $address;
+
+        return $this;
+    }
+
+    public function setComment(CommentEmbeddable $comment): self
+    {
+        $this->comment = $comment;
+
+        return $this;
+    }
+
+    public function setEndDate(?DateTimeImmutable $endDate): self
+    {
+        $this->endDate = $endDate;
+
+        return $this;
+    }
+
+    public function setHostPerson(?Person $hostPerson): self
+    {
+        $this->hostPerson = $hostPerson;
+
+        return $this;
+    }
+
+    public function setHostThirdParty(?ThirdParty $hostThirdParty): self
+    {
+        $this->hostThirdParty = $hostThirdParty;
+
+        return $this;
+    }
+
+    public function setPerson(?Person $person): self
+    {
+        $this->person = $person;
+
+        return $this;
+    }
+
+    public function setStartDate(DateTimeImmutable $startDate): self
+    {
+        $this->startDate = $startDate;
+
+        return $this;
+    }
+}

src/Bundle/ChillMainBundle/Entity/User.php

@@ -97,6 +97,11 @@ class User implements AdvancedUserInterface
      */
     private ?Center $mainCenter = null;
 
+    /**
+     * @ORM\ManyToOne(targetEntity=Location::class)
+     */
+    private ?Location $mainLocation = null;
+
     /**
      * @ORM\ManyToOne(targetEntity=Scope::class)
      */
@@ -228,6 +233,11 @@ class User implements AdvancedUserInterface
         return $this->mainCenter;
     }
 
+    public function getMainLocation(): ?Location
+    {
+        return $this->mainLocation;
+    }
+
     public function getMainScope(): ?Scope
     {
         return $this->mainScope;
@@ -405,6 +415,13 @@ class User implements AdvancedUserInterface
         return $this;
     }
 
+    public function setMainLocation(?Location $mainLocation): User
+    {
+        $this->mainLocation = $mainLocation;
+
+        return $this;
+    }
+
     public function setMainScope(?Scope $mainScope): User
     {
         $this->mainScope = $mainScope;

src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflow.php

@@ -0,0 +1,461 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\MainBundle\Entity\Workflow;
+
+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\User;
+use Chill\MainBundle\Workflow\Validator\EntityWorkflowCreation;
+use DateTimeInterface;
+use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\Common\Collections\Collection;
+use Doctrine\ORM\Mapping as ORM;
+use Iterator;
+use RuntimeException;
+use Symfony\Component\Serializer\Annotation as Serializer;
+use function count;
+use function is_array;
+
+/**
+ * @ORM\Entity
+ * @ORM\Table("chill_main_workflow_entity")
+ * @EntityWorkflowCreation(groups={"creation"})
+ * @Serializer\DiscriminatorMap(typeProperty="type", mapping={
+ *     "entity_workflow": EntityWorkflow::class
+ * })
+ */
+class EntityWorkflow implements TrackCreationInterface, TrackUpdateInterface
+{
+    use TrackCreationTrait;
+
+    use TrackUpdateTrait;
+
+    /**
+     * @ORM\OneToMany(targetEntity=EntityWorkflowComment::class, mappedBy="entityWorkflow", orphanRemoval=true)
+     *
+     * @var Collection|EntityWorkflowComment[]
+     */
+    private Collection $comments;
+
+    /**
+     * @ORM\Id
+     * @ORM\GeneratedValue
+     * @ORM\Column(type="integer")
+     */
+    private ?int $id = null;
+
+    /**
+     * @ORM\Column(type="string", length=255)
+     */
+    private string $relatedEntityClass = '';
+
+    /**
+     * @ORM\Column(type="integer")
+     */
+    private int $relatedEntityId;
+
+    /**
+     * @ORM\OneToMany(targetEntity=EntityWorkflowStep::class, mappedBy="entityWorkflow", orphanRemoval=true, cascade={"persist"})
+     * @ORM\OrderBy({"transitionAt": "ASC", "id": "ASC"})
+     *
+     * @var Collection|EntityWorkflowStep[]
+     */
+    private Collection $steps;
+
+    /**
+     * @var null|array|EntityWorkflowStep[]
+     */
+    private ?array $stepsChainedCache = null;
+
+    /**
+     * @ORM\ManyToMany(targetEntity=User::class)
+     * @ORM\JoinTable(name="chill_main_workflow_entity_subscriber_to_final")
+     *
+     * @var Collection|User[]
+     */
+    private Collection $subscriberToFinal;
+
+    /**
+     * @ORM\ManyToMany(targetEntity=User::class)
+     * @ORM\JoinTable(name="chill_main_workflow_entity_subscriber_to_step")
+     *
+     * @var Collection|User[]
+     */
+    private Collection $subscriberToStep;
+
+    /**
+     * a step which will store all the transition data.
+     */
+    private ?EntityWorkflowStep $transitionningStep = null;
+
+    /**
+     * @ORM\Column(type="text")
+     */
+    private string $workflowName;
+
+    public function __construct()
+    {
+        $this->subscriberToFinal = new ArrayCollection();
+        $this->subscriberToStep = new ArrayCollection();
+        $this->comments = new ArrayCollection();
+        $this->steps = new ArrayCollection();
+
+        $initialStep = new EntityWorkflowStep();
+        $initialStep
+            ->setCurrentStep('initial');
+        $this->addStep($initialStep);
+    }
+
+    public function addComment(EntityWorkflowComment $comment): self
+    {
+        if (!$this->comments->contains($comment)) {
+            $this->comments[] = $comment;
+            $comment->setEntityWorkflow($this);
+        }
+
+        return $this;
+    }
+
+    /**
+     * @internal You should prepare a step and run a workflow transition instead of manually adding a step
+     */
+    public function addStep(EntityWorkflowStep $step): self
+    {
+        if (!$this->steps->contains($step)) {
+            $this->steps[] = $step;
+            $step->setEntityWorkflow($this);
+        }
+
+        return $this;
+    }
+
+    public function addSubscriberToFinal(User $user): self
+    {
+        if (!$this->subscriberToFinal->contains($user)) {
+            $this->subscriberToFinal[] = $user;
+        }
+
+        return $this;
+    }
+
+    public function addSubscriberToStep(User $user): self
+    {
+        if (!$this->subscriberToStep->contains($user)) {
+            $this->subscriberToStep[] = $user;
+        }
+
+        return $this;
+    }
+
+    public function getComments(): Collection
+    {
+        return $this->comments;
+    }
+
+    public function getCurrentStep(): ?EntityWorkflowStep
+    {
+        $step = $this->steps->last();
+
+        if (false !== $step) {
+            return $step;
+        }
+
+        return null;
+    }
+
+    public function getCurrentStepChained(): ?EntityWorkflowStep
+    {
+        $steps = $this->getStepsChained();
+        $currentStep = $this->getCurrentStep();
+
+        foreach ($steps as $step) {
+            if ($step === $currentStep) {
+                return $step;
+            }
+        }
+
+        return null;
+    }
+
+    public function getCurrentStepCreatedAt(): ?DateTimeInterface
+    {
+        if (null !== $previous = $this->getPreviousStepIfAny()) {
+            return $previous->getTransitionAt();
+        }
+
+        return null;
+    }
+
+    public function getCurrentStepCreatedBy(): ?User
+    {
+        if (null !== $previous = $this->getPreviousStepIfAny()) {
+            return $previous->getTransitionBy();
+        }
+
+        return null;
+    }
+
+    public function getId(): ?int
+    {
+        return $this->id;
+    }
+
+    public function getRelatedEntityClass(): string
+    {
+        return $this->relatedEntityClass;
+    }
+
+    public function getRelatedEntityId(): int
+    {
+        return $this->relatedEntityId;
+    }
+
+    /**
+     * Method used by MarkingStore.
+     *
+     * get a string representation of the step
+     */
+    public function getStep(): string
+    {
+        return $this->getCurrentStep()->getCurrentStep();
+    }
+
+    public function getStepAfter(EntityWorkflowStep $step): ?EntityWorkflowStep
+    {
+        $iterator = $this->steps->getIterator();
+
+        if ($iterator instanceof Iterator) {
+            $iterator->rewind();
+
+            while ($iterator->valid()) {
+                $curStep = $iterator->current();
+
+                if ($curStep === $step) {
+                    $iterator->next();
+
+                    if ($iterator->valid()) {
+                        return $iterator->current();
+                    }
+
+                    return null;
+                }
+                $iterator->next();
+            }
+
+            return null;
+        }
+
+        throw new RuntimeException();
+    }
+
+    /**
+     * @return ArrayCollection|Collection
+     */
+    public function getSteps()
+    {
+        return $this->steps;
+    }
+
+    public function getStepsChained(): array
+    {
+        if (is_array($this->stepsChainedCache)) {
+            return $this->stepsChainedCache;
+        }
+
+        $iterator = $this->steps->getIterator();
+        $current = null;
+        $steps = [];
+
+        $iterator->rewind();
+
+        do {
+            $previous = $current;
+            $current = $iterator->current();
+            $steps[] = $current;
+
+            $current->setPrevious($previous);
+
+            $iterator->next();
+
+            if ($iterator->valid()) {
+                $current->setNext($iterator->current());
+            } else {
+                $current->setNext(null);
+            }
+        } while ($iterator->valid());
+
+        $this->stepsChainedCache = $steps;
+
+        return $steps;
+    }
+
+    /**
+     * @return ArrayCollection|Collection
+     */
+    public function getSubscriberToFinal()
+    {
+        return $this->subscriberToFinal;
+    }
+
+    /**
+     * @return ArrayCollection|Collection
+     */
+    public function getSubscriberToStep()
+    {
+        return $this->subscriberToStep;
+    }
+
+    /**
+     * get the step which is transitionning. Should be called only by event which will
+     * concern the transition.
+     */
+    public function getTransitionningStep(): ?EntityWorkflowStep
+    {
+        return $this->transitionningStep;
+    }
+
+    public function getWorkflowName(): string
+    {
+        return $this->workflowName;
+    }
+
+    public function isFinal(): bool
+    {
+        $steps = $this->getStepsChained();
+
+        if (1 === count($steps)) {
+            // the initial step cannot be finalized
+            return false;
+        }
+
+        /** @var EntityWorkflowStep $last */
+        $last = end($steps);
+
+        return $last->isFinal();
+    }
+
+    public function isFreeze(): bool
+    {
+        $steps = $this->getStepsChained();
+
+        if (1 === count($steps)) {
+            // the initial step cannot be finalized
+            return false;
+        }
+
+        /** @var EntityWorkflowStep $last */
+        $last = end($steps);
+
+        return $last->getPrevious()->isFreezeAfter();
+    }
+
+    public function isUserSubscribedToFinal(User $user): bool
+    {
+        return $this->subscriberToFinal->contains($user);
+    }
+
+    public function isUserSubscribedToStep(User $user): bool
+    {
+        return $this->subscriberToStep->contains($user);
+    }
+
+    public function prepareStepBeforeTransition(EntityWorkflowStep $step): self
+    {
+        $this->transitionningStep = $step;
+
+        return $this;
+    }
+
+    public function removeComment(EntityWorkflowComment $comment): self
+    {
+        if ($this->comments->removeElement($comment)) {
+            $comment->setEntityWorkflow(null);
+        }
+
+        return $this;
+    }
+
+    public function removeStep(EntityWorkflowStep $step): self
+    {
+        if ($this->steps->removeElement($step)) {
+            $step->setEntityWorkflow(null);
+        }
+
+        return $this;
+    }
+
+    public function removeSubscriberToFinal(User $user): self
+    {
+        $this->subscriberToFinal->removeElement($user);
+
+        return $this;
+    }
+
+    public function removeSubscriberToStep(User $user): self
+    {
+        $this->subscriberToStep->removeElement($user);
+
+        return $this;
+    }
+
+    public function setRelatedEntityClass(string $relatedEntityClass): EntityWorkflow
+    {
+        $this->relatedEntityClass = $relatedEntityClass;
+
+        return $this;
+    }
+
+    public function setRelatedEntityId(int $relatedEntityId): EntityWorkflow
+    {
+        $this->relatedEntityId = $relatedEntityId;
+
+        return $this;
+    }
+
+    /**
+     * Method use by marking store.
+     *
+     * @return $this
+     */
+    public function setStep(string $step): self
+    {
+        $newStep = new EntityWorkflowStep();
+        $newStep->setCurrentStep($step);
+
+        // copy the freeze
+        if ($this->getCurrentStep()->isFreezeAfter()) {
+            $newStep->setFreezeAfter(true);
+        }
+
+        $this->addStep($newStep);
+
+        return $this;
+    }
+
+    public function setWorkflowName(string $workflowName): EntityWorkflow
+    {
+        $this->workflowName = $workflowName;
+
+        return $this;
+    }
+
+    private function getPreviousStepIfAny(): ?EntityWorkflowStep
+    {
+        if (1 === count($this->steps)) {
+            return null;
+        }
+
+        return $this->steps->get($this->steps->count() - 2);
+    }
+}

src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflowComment.php

@@ -0,0 +1,78 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\MainBundle\Entity\Workflow;
+
+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 Doctrine\ORM\Mapping as ORM;
+
+/**
+ * @ORM\Entity
+ * @ORM\Table("chill_main_workflow_entity_comment")
+ */
+class EntityWorkflowComment implements TrackCreationInterface, TrackUpdateInterface
+{
+    use TrackCreationTrait;
+
+    use TrackUpdateTrait;
+
+    /**
+     * @ORM\Column(type="text", options={"default": ""})
+     */
+    private string $comment = '';
+
+    /**
+     * @ORM\ManyToOne(targetEntity=EntityWorkflow::class, inversedBy="comments")
+     */
+    private ?EntityWorkflow $entityWorkflow = null;
+
+    /**
+     * @ORM\Id
+     * @ORM\GeneratedValue
+     * @ORM\Column(type="integer")
+     */
+    private ?int $id = null;
+
+    public function getComment(): string
+    {
+        return $this->comment;
+    }
+
+    public function getEntityWorkflow(): ?EntityWorkflow
+    {
+        return $this->entityWorkflow;
+    }
+
+    public function getId(): ?int
+    {
+        return $this->id;
+    }
+
+    public function setComment(string $comment): self
+    {
+        $this->comment = $comment;
+
+        return $this;
+    }
+
+    /**
+     * @internal use @see{EntityWorkflow::addComment}
+     */
+    public function setEntityWorkflow(?EntityWorkflow $entityWorkflow): self
+    {
+        $this->entityWorkflow = $entityWorkflow;
+
+        return $this;
+    }
+}

src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflowStep.php

@@ -0,0 +1,336 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\MainBundle\Entity\Workflow;
+
+use Chill\MainBundle\Entity\User;
+use DateTimeImmutable;
+use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\Common\Collections\Collection;
+use Doctrine\ORM\Mapping as ORM;
+use Symfony\Component\Validator\Constraints as Assert;
+use Symfony\Component\Validator\Context\ExecutionContextInterface;
+use function count;
+use function in_array;
+
+/**
+ * @ORM\Entity
+ * @ORM\Table("chill_main_workflow_entity_step")
+ */
+class EntityWorkflowStep
+{
+    /**
+     * @ORM\Column(type="text", options={"default": ""})
+     */
+    private string $comment = '';
+
+    /**
+     * @ORM\Column(type="text")
+     */
+    private ?string $currentStep = '';
+
+    /**
+     * @ORM\Column(type="json")
+     */
+    private array $destEmail = [];
+
+    /**
+     * @ORM\ManyToMany(targetEntity=User::class)
+     * @ORM\JoinTable(name="chill_main_workflow_entity_step_user")
+     */
+    private Collection $destUser;
+
+    /**
+     * @ORM\ManyToOne(targetEntity=EntityWorkflow::class, inversedBy="steps")
+     */
+    private ?EntityWorkflow $entityWorkflow = null;
+
+    /**
+     * @ORM\Column(type="boolean", options={"default": false})
+     */
+    private bool $freezeAfter = false;
+
+    /**
+     * @ORM\Id
+     * @ORM\GeneratedValue
+     * @ORM\Column(type="integer")
+     */
+    private ?int $id = null;
+
+    /**
+     * @ORM\Column(type="boolean", options={"default": false})
+     */
+    private bool $isFinal = false;
+
+    /**
+     * filled by @see{EntityWorkflow::getStepsChained}.
+     */
+    private ?EntityWorkflowStep $next = null;
+
+    /**
+     * filled by @see{EntityWorkflow::getStepsChained}.
+     */
+    private ?EntityWorkflowStep $previous = null;
+
+    /**
+     * @ORM\Column(type="text", nullable=true, options={"default": null})
+     */
+    private ?string $transitionAfter = null;
+
+    /**
+     * @ORM\Column(type="datetime_immutable")
+     */
+    private ?DateTimeImmutable $transitionAt = null;
+
+    /**
+     * @ORM\ManyToOne(targetEntity=User::class)
+     * @ORM\JoinColumn(nullable=true)
+     */
+    private ?User $transitionBy = null;
+
+    /**
+     * @ORM\Column(type="text", nullable=true)
+     */
+    private ?string $transitionByEmail = null;
+
+    public function __construct()
+    {
+        $this->destUser = new ArrayCollection();
+    }
+
+    public function addDestEmail(string $email): self
+    {
+        if (!in_array($email, $this->destEmail, true)) {
+            $this->destEmail[] = $email;
+        }
+
+        return $this;
+    }
+
+    public function addDestUser(User $user): self
+    {
+        if (!$this->destUser->contains($user)) {
+            $this->destUser[] = $user;
+        }
+
+        return $this;
+    }
+
+    public function getComment(): string
+    {
+        return $this->comment;
+    }
+
+    public function getCurrentStep(): ?string
+    {
+        return $this->currentStep;
+    }
+
+    public function getDestEmail(): array
+    {
+        return $this->destEmail;
+    }
+
+    /**
+     * @return ArrayCollection|Collection
+     */
+    public function getDestUser()
+    {
+        return $this->destUser;
+    }
+
+    public function getEntityWorkflow(): ?EntityWorkflow
+    {
+        return $this->entityWorkflow;
+    }
+
+    public function getId(): ?int
+    {
+        return $this->id;
+    }
+
+    public function getNext(): ?EntityWorkflowStep
+    {
+        return $this->next;
+    }
+
+    public function getPrevious(): ?EntityWorkflowStep
+    {
+        return $this->previous;
+    }
+
+    public function getTransitionAfter(): ?string
+    {
+        return $this->transitionAfter;
+    }
+
+    public function getTransitionAt(): ?DateTimeImmutable
+    {
+        return $this->transitionAt;
+    }
+
+    public function getTransitionBy(): ?User
+    {
+        return $this->transitionBy;
+    }
+
+    public function getTransitionByEmail(): ?string
+    {
+        return $this->transitionByEmail;
+    }
+
+    public function isFinal(): bool
+    {
+        return $this->isFinal;
+    }
+
+    public function isFreezeAfter(): bool
+    {
+        return $this->freezeAfter;
+    }
+
+    public function removeDestEmail(string $email): self
+    {
+        $this->destEmail = array_filter($this->destEmail, static function (string $existing) use ($email) {
+            return $email !== $existing;
+        });
+
+        return $this;
+    }
+
+    public function removeDestUser(User $user): self
+    {
+        $this->destUser->removeElement($user);
+
+        return $this;
+    }
+
+    public function setComment(?string $comment): EntityWorkflowStep
+    {
+        $this->comment = (string) $comment;
+
+        return $this;
+    }
+
+    public function setCurrentStep(?string $currentStep): EntityWorkflowStep
+    {
+        $this->currentStep = $currentStep;
+
+        return $this;
+    }
+
+    public function setDestEmail(array $destEmail): EntityWorkflowStep
+    {
+        $this->destEmail = $destEmail;
+
+        return $this;
+    }
+
+    /**
+     * @internal use @see(EntityWorkflow::addStep} instead
+     */
+    public function setEntityWorkflow(?EntityWorkflow $entityWorkflow): EntityWorkflowStep
+    {
+        $this->entityWorkflow = $entityWorkflow;
+
+        return $this;
+    }
+
+    public function setFreezeAfter(bool $freezeAfter): EntityWorkflowStep
+    {
+        $this->freezeAfter = $freezeAfter;
+
+        return $this;
+    }
+
+    public function setIsFinal(bool $isFinal): EntityWorkflowStep
+    {
+        $this->isFinal = $isFinal;
+
+        return $this;
+    }
+
+    /**
+     * @return EntityWorkflowStep
+     *
+     * @internal
+     */
+    public function setNext(?EntityWorkflowStep $next): self
+    {
+        $this->next = $next;
+
+        return $this;
+    }
+
+    /**
+     * @return EntityWorkflowStep
+     *
+     * @internal
+     */
+    public function setPrevious(?EntityWorkflowStep $previous): self
+    {
+        $this->previous = $previous;
+
+        return $this;
+    }
+
+    public function setTransitionAfter(?string $transitionAfter): EntityWorkflowStep
+    {
+        $this->transitionAfter = $transitionAfter;
+
+        return $this;
+    }
+
+    public function setTransitionAt(?DateTimeImmutable $transitionAt): EntityWorkflowStep
+    {
+        $this->transitionAt = $transitionAt;
+
+        return $this;
+    }
+
+    public function setTransitionBy(?User $transitionBy): EntityWorkflowStep
+    {
+        $this->transitionBy = $transitionBy;
+
+        return $this;
+    }
+
+    public function setTransitionByEmail(?string $transitionByEmail): EntityWorkflowStep
+    {
+        $this->transitionByEmail = $transitionByEmail;
+
+        return $this;
+    }
+
+    /**
+     * @Assert\Callback
+     *
+     * @param mixed $payload
+     */
+    public function validateOnCreation(ExecutionContextInterface $context, $payload): void
+    {
+        return;
+
+        if ($this->isFinalizeAfter()) {
+            if (0 !== count($this->getDestUser())) {
+                $context->buildViolation('workflow.No dest users when the workflow is finalized')
+                    ->atPath('finalizeAfter')
+                    ->addViolation();
+            }
+        } else {
+            if (0 === count($this->getDestUser())) {
+                $context->buildViolation('workflow.The next step must count at least one dest')
+                    ->atPath('finalizeAfter')
+                    ->addViolation();
+            }
+        }
+    }
+}

src/Bundle/ChillMainBundle/Form/EntityWorkflowCommentType.php

@@ -0,0 +1,27 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\MainBundle\Form;
+
+use Chill\MainBundle\Form\Type\ChillTextareaType;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\FormBuilderInterface;
+
+class EntityWorkflowCommentType extends AbstractType
+{
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+        $builder
+            ->add('comment', ChillTextareaType::class, [
+                'required' => false,
+            ]);
+    }
+}

src/Bundle/ChillMainBundle/Form/LocationFormType.php

@@ -54,7 +54,6 @@ final class LocationFormType extends AbstractType
                 'label' => 'Address',
                 'use_valid_from' => false,
                 'use_valid_to' => false,
-                'mapped' => false,
             ])
             ->add(
                 'active',

src/Bundle/ChillMainBundle/Form/LocationTypeType.php

@@ -39,6 +39,17 @@ final class LocationTypeType extends AbstractType
                     'expanded' => true,
                 ]
             )
+            ->add(
+                'editableByUsers',
+                ChoiceType::class,
+                [
+                    'choices' => [
+                        'Yes' => true,
+                        'No' => false,
+                    ],
+                    'expanded' => true,
+                ]
+            )
             ->add(
                 'addressRequired',
                 ChoiceType::class,

src/Bundle/ChillMainBundle/Form/NotificationCommentType.php

@@ -0,0 +1,26 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\MainBundle\Form;
+
+use Chill\MainBundle\Form\Type\ChillTextareaType;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\FormBuilderInterface;
+
+class NotificationCommentType extends AbstractType
+{
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+        $builder->add('content', ChillTextareaType::class, [
+            'required' => false,
+        ]);
+    }
+}

src/Bundle/ChillMainBundle/Form/NotificationType.php

@@ -0,0 +1,43 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\MainBundle\Form;
+
+use Chill\MainBundle\Entity\Notification;
+use Chill\MainBundle\Form\Type\ChillTextareaType;
+use Chill\MainBundle\Form\Type\PickUserDynamicType;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+
+class NotificationType extends AbstractType
+{
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+        $builder
+            ->add('title', TextType::class, [
+                'label' => 'Title',
+                'required' => true,
+            ])
+            ->add('addressees', PickUserDynamicType::class, [
+                'multiple' => true,
+            ])
+            ->add('message', ChillTextareaType::class, [
+                'required' => false,
+            ]);
+    }
+
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $resolver->setDefault('class', Notification::class);
+    }
+}

src/Bundle/ChillMainBundle/Form/Type/DataTransformer/EntityToJsonTransformer.php

@@ -0,0 +1,118 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\MainBundle\Form\Type\DataTransformer;
+
+use Chill\MainBundle\Entity\User;
+use Chill\PersonBundle\Entity\Person;
+use Chill\ThirdPartyBundle\Entity\ThirdParty;
+use Symfony\Component\Form\DataTransformerInterface;
+use Symfony\Component\Form\Exception\TransformationFailedException;
+use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
+use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
+use Symfony\Component\Serializer\SerializerInterface;
+use UnexpectedValueException;
+
+use function array_key_exists;
+
+class EntityToJsonTransformer implements DataTransformerInterface
+{
+    private DenormalizerInterface $denormalizer;
+
+    private bool $multiple;
+
+    private SerializerInterface $serializer;
+
+    private string $type;
+
+    public function __construct(DenormalizerInterface $denormalizer, SerializerInterface $serializer, bool $multiple, string $type)
+    {
+        $this->denormalizer = $denormalizer;
+        $this->serializer = $serializer;
+        $this->multiple = $multiple;
+        $this->type = $type;
+    }
+
+    public function reverseTransform($value)
+    {
+        $denormalized = json_decode($value, true);
+
+        if ($this->multiple) {
+            if (null === $denormalized) {
+                return [];
+            }
+
+            return array_map(
+                function ($item) { return $this->denormalizeOne($item); },
+                $denormalized
+            );
+        }
+
+        if ('' === $value) {
+            return null;
+        }
+
+        return $this->denormalizeOne($denormalized);
+    }
+
+    /**
+     * @param User|User[] $value
+     */
+    public function transform($value): string
+    {
+        if (null === $value) {
+            return $this->multiple ? 'null' : '[]';
+        }
+
+        return $this->serializer->serialize($value, 'json', [
+            AbstractNormalizer::GROUPS => ['read'],
+        ]);
+    }
+
+    private function denormalizeOne(array $item)
+    {
+        if (!array_key_exists('type', $item)) {
+            throw new TransformationFailedException('the key "type" is missing on element');
+        }
+
+        if (!array_key_exists('id', $item)) {
+            throw new TransformationFailedException('the key "id" is missing on element');
+        }
+
+        switch ($this->type) {
+            case 'user':
+                $class = User::class;
+
+                break;
+
+            case 'person':
+                $class = Person::class;
+
+                break;
+
+            case 'thirdparty':
+                $class = ThirdParty::class;
+
+                break;
+
+            default:
+                throw new UnexpectedValueException('This type is not supported');
+        }
+
+        return
+            $this->denormalizer->denormalize(
+                ['type' => $item['type'], 'id' => $item['id']],
+                $class,
+                'json',
+                [AbstractNormalizer::GROUPS => ['read']],
+            );
+    }
+}

src/Bundle/ChillMainBundle/Form/Type/PickUserDynamicType.php

@@ -0,0 +1,63 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\MainBundle\Form\Type;
+
+use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Form\Type\DataTransformer\EntityToJsonTransformer;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\Form\FormInterface;
+use Symfony\Component\Form\FormView;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
+use Symfony\Component\Serializer\SerializerInterface;
+
+/**
+ * Pick user dymically, using vuejs module "AddPerson".
+ */
+class PickUserDynamicType extends AbstractType
+{
+    private DenormalizerInterface $denormalizer;
+
+    private SerializerInterface $serializer;
+
+    public function __construct(DenormalizerInterface $denormalizer, SerializerInterface $serializer)
+    {
+        $this->denormalizer = $denormalizer;
+        $this->serializer = $serializer;
+    }
+
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+        $builder->addViewTransformer(new EntityToJsonTransformer($this->denormalizer, $this->serializer, $options['multiple'], 'user'));
+    }
+
+    public function buildView(FormView $view, FormInterface $form, array $options)
+    {
+        $view->vars['multiple'] = $options['multiple'];
+        $view->vars['types'] = ['user'];
+        $view->vars['uniqid'] = uniqid('pick_user_dyn');
+    }
+
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $resolver
+            ->setDefault('multiple', false)
+            ->setAllowedTypes('multiple', ['bool'])
+            ->setDefault('compound', false);
+    }
+
+    public function getBlockPrefix()
+    {
+        return 'pick_entity_dynamic';
+    }
+}

src/Bundle/ChillMainBundle/Form/Type/ResidentialAddressType.php

@@ -0,0 +1,73 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\MainBundle\Form\Type;
+
+use Chill\MainBundle\Entity\ResidentialAddress;
+use Chill\PersonBundle\Form\Type\PickPersonDynamicType;
+use Chill\ThirdPartyBundle\Form\Type\PickThirdpartyDynamicType;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\DateType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+
+final class ResidentialAddressType extends AbstractType
+{
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+        $builder
+            ->add('startDate', DateType::class, [
+                'required' => true,
+                'input' => 'datetime_immutable',
+                'widget' => 'single_text',
+            ])
+            ->add('endDate', DateType::class, [
+                'required' => false,
+                'input' => 'datetime_immutable',
+                'widget' => 'single_text',
+            ])
+            ->add('comment', CommentType::class, [
+                'required' => false,
+            ]);
+
+        if ('person' === $options['kind']) {
+            $builder
+                ->add('hostPerson', PickPersonDynamicType::class, [
+                    'label' => 'Person',
+                ]);
+        }
+
+        if ('thirdparty' === $options['kind']) {
+            $builder
+                ->add('hostThirdParty', PickThirdpartyDynamicType::class, [
+                    'label' => 'Third party',
+                ]);
+        }
+
+        if ('address' === $options['kind']) {
+            $builder
+                ->add('address', PickAddressType::class, [
+                    'required' => false,
+                    'label' => 'Address',
+                    'use_valid_from' => false,
+                    'use_valid_to' => false,
+                ]);
+        }
+    }
+
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $resolver->setDefaults([
+            'data_class' => ResidentialAddress::class,
+            'kind' => null,
+        ]);
+    }
+}

src/Bundle/ChillMainBundle/Form/UserType.php

@@ -12,6 +12,7 @@ declare(strict_types=1);
 namespace Chill\MainBundle\Form;
 
 use Chill\MainBundle\Entity\Center;
+use Chill\MainBundle\Entity\Location;
 use Chill\MainBundle\Entity\Scope;
 use Chill\MainBundle\Entity\UserJob;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
@@ -75,6 +76,22 @@ class UserType extends AbstractType
                 'choice_label' => function (UserJob $c) {
                     return $this->translatableStringHelper->localize($c->getLabel());
                 },
+            ])
+            ->add('mainLocation', EntityType::class, [
+                'label' => 'Main location',
+                'required' => false,
+                'placeholder' => 'choose a location',
+                'class' => Location::class,
+                'choice_label' => function (Location $l) {
+                    return $this->translatableStringHelper->localize($l->getLocationType()->getTitle()) . ' - ' . $l->getName();
+                },
+                'query_builder' => static function (EntityRepository $er) {
+                    $qb = $er->createQueryBuilder('l');
+                    $qb->orderBy('l.locationType');
+                    $qb->where('l.availableForUsers = TRUE');
+
+                    return $qb;
+                },
             ]);
 
         if ($options['is_creation']) {

src/Bundle/ChillMainBundle/Form/WorkflowStepType.php

@@ -0,0 +1,180 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\MainBundle\Form;
+
+use Chill\MainBundle\Entity\Workflow\EntityWorkflow;
+use Chill\MainBundle\Entity\Workflow\EntityWorkflowStep;
+use Chill\MainBundle\Form\Type\ChillTextareaType;
+use Chill\MainBundle\Form\Type\PickUserDynamicType;
+use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
+use Chill\MainBundle\Workflow\EntityWorkflowManager;
+use LogicException;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+use Symfony\Component\Workflow\Registry;
+use Symfony\Component\Workflow\Transition;
+use function array_key_exists;
+
+class WorkflowStepType extends AbstractType
+{
+    private EntityWorkflowManager $entityWorkflowManager;
+
+    private Registry $registry;
+
+    private TranslatableStringHelperInterface $translatableStringHelper;
+
+    public function __construct(EntityWorkflowManager $entityWorkflowManager, Registry $registry, TranslatableStringHelperInterface $translatableStringHelper)
+    {
+        $this->entityWorkflowManager = $entityWorkflowManager;
+        $this->registry = $registry;
+        $this->translatableStringHelper = $translatableStringHelper;
+    }
+
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+        /** @var \Chill\MainBundle\Entity\Workflow\EntityWorkflow $entityWorkflow */
+        $entityWorkflow = $options['entity_workflow'];
+        $handler = $this->entityWorkflowManager->getHandler($entityWorkflow);
+        $workflow = $this->registry->get($entityWorkflow, $entityWorkflow->getWorkflowName());
+        $place = $workflow->getMarking($entityWorkflow);
+        $placeMetadata = $workflow->getMetadataStore()->getPlaceMetadata(array_keys($place->getPlaces())[0]);
+
+        if (true === $options['transition']) {
+            if (null === $options['entity_workflow']) {
+                throw new LogicException('if transition is true, entity_workflow should be defined');
+            }
+
+            $transitions = $this->registry
+                ->get($options['entity_workflow'], $entityWorkflow->getWorkflowName())
+                ->getEnabledTransitions($entityWorkflow);
+
+            $choices = array_combine(
+                array_map(
+                    static function (Transition $transition) {
+                        return $transition->getName();
+                    },
+                    $transitions
+                ),
+                $transitions
+            );
+
+            if (array_key_exists('validationFilterInputLabels', $placeMetadata)) {
+                $inputLabels = $placeMetadata['validationFilterInputLabels'];
+
+                $builder->add('transitionFilter', ChoiceType::class, [
+                    'multiple' => false,
+                    'label' => 'workflow.My decision',
+                    'choices' => [
+                        'forward' => 'forward',
+                        'backward' => 'backward',
+                        'neutral' => 'neutral',
+                    ],
+                    'choice_label' => function (string $key) use ($inputLabels) {
+                        return $this->translatableStringHelper->localize($inputLabels[$key]);
+                    },
+                    'choice_attr' => static function (string $key) {
+                        return [
+                            $key => $key,
+                        ];
+                    },
+                    'mapped' => false,
+                    'expanded' => true,
+                    'data' => 'forward',
+                ]);
+            }
+
+            $builder
+                ->add('transition', ChoiceType::class, [
+                    'label' => 'workflow.Next step',
+                    'mapped' => false,
+                    'multiple' => false,
+                    'expanded' => true,
+                    'choices' => $choices,
+                    'choice_label' => function (Transition $transition) use ($workflow) {
+                        $meta = $workflow->getMetadataStore()->getTransitionMetadata($transition);
+
+                        if (array_key_exists('label', $meta)) {
+                            return $this->translatableStringHelper->localize($meta['label']);
+                        }
+
+                        return $transition->getName();
+                    },
+                    'choice_attr' => static function (Transition $transition) use ($workflow) {
+                        $toFinal = true;
+                        $isForward = 'neutral';
+
+                        $metadata = $workflow->getMetadataStore()->getTransitionMetadata($transition);
+
+                        if (array_key_exists('isForward', $metadata)) {
+                            if ($metadata['isForward']) {
+                                $isForward = 'forward';
+                            } else {
+                                $isForward = 'backward';
+                            }
+                        }
+
+                        foreach ($transition->getTos() as $to) {
+                            $meta = $workflow->getMetadataStore()->getPlaceMetadata($to);
+
+                            if (
+                                    !array_key_exists('isFinal', $meta) || false === $meta['isFinal']
+                                ) {
+                                $toFinal = false;
+                            }
+                        }
+
+                        return [
+                            'data-is-transition' => 'data-is-transition',
+                            'data-to-final' => $toFinal ? '1' : '0',
+                            'data-is-forward' => $isForward,
+                        ];
+                    },
+                ])
+                ->add('future_dest_users', PickUserDynamicType::class, [
+                    'label' => 'workflow.dest for next steps',
+                    'multiple' => true,
+                    'mapped' => false,
+                ]);
+        }
+
+        if (
+            $handler->supportsFreeze($entityWorkflow)
+            && !$entityWorkflow->isFreeze()
+        ) {
+            $builder
+                ->add('freezeAfter', CheckboxType::class, [
+                    'required' => false,
+                    'label' => 'workflow.Freeze',
+                    'help' => 'workflow.The associated element will be freezed',
+                ]);
+        }
+
+        $builder
+            ->add('comment', ChillTextareaType::class, [
+                'required' => false,
+                'label' => 'Comment',
+            ]);
+    }
+
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $resolver
+            ->setDefined('class', EntityWorkflowStep::class)
+            ->setRequired('transition')
+            ->setAllowedTypes('transition', 'bool')
+            ->setRequired('entity_workflow')
+            ->setAllowedTypes('entity_workflow', EntityWorkflow::class);
+    }
+}

src/Bundle/ChillMainBundle/Form/WorkflowTransitionType.php

@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\MainBundle\Form;
+
+use Chill\MainBundle\Entity\Workflow\EntityWorkflow;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+
+class WorkflowTransitionType extends AbstractType
+{
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+        $builder
+            ->add('current_step', WorkflowStepType::class, [
+                'transition' => true,
+                'entity_workflow' => $options['entity_workflow'],
+            ]);
+    }
+
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $resolver
+            ->setRequired('entity_workflow')
+            ->setAllowedTypes('entity_workflow', EntityWorkflow::class);
+    }
+}